2 files changed, 17 insertions, 10 deletions

diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index a4edb711ae..e7ab9cb3a3 100644
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ b/src/lib/libcrypto/bio/bss_mem.c
@@ -284,6 +284,7 @@ static int mem_gets(BIO *bp, char *buf, int size)
 
         BIO_clear_retry_flags(bp);
         j=bm->length;
+        if ((size-1) < j) j=size-1;
         if (j <= 0)
                 {
                 *buf='\0';
@@ -292,17 +293,18 @@ static int mem_gets(BIO *bp, char *buf, int size)
         p=bm->data;
         for (i=0; i<j; i++)
                 {
-                if (p[i] == '\n') break;
-                }
-        if (i == j)
-                {
-                BIO_set_retry_read(bp);
-                /* return(-1);  change the semantics 0.6.6a */ 
+                if (p[i] == '\n')
+                        {
+                        i++;
+                        break;
+                        }
                 }
-        else
-                i++;
-        /* i is the max to copy */
-        if ((size-1) < i) i=size-1;
+
+        /*
+         * i is now the max num of bytes to copy, either j or up to
+         * and including the first newline
+         */ 
+
         i=mem_read(bp,buf,i);
         if (i > 0) buf[i]='\0';
         ret=i;
diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
index 472dd75821..30c3ceab46 100644
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ b/src/lib/libcrypto/bio/bss_sock.c
@@ -60,6 +60,9 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
+
+#ifndef OPENSSL_NO_SOCK
+
 #include <openssl/bio.h>
 
 #ifdef WATT32
@@ -300,3 +303,5 @@ int BIO_sock_non_fatal_error(int err)
                 }
         return(0);
         }
+
+#endif  /* #ifndef OPENSSL_NO_SOCK */