give more meaningful error if presented with wrong certificate type by server

[openssl.git] / crypto / bio / bss_mem.c

diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index d4d956c619ab121fa5e7f770f0cabc2522e2d928..37d4194e4bba5232e054b6389e0ecf4a1a5d9870 100644 (file)
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -94,16 +94,18 @@ BIO *BIO_new_mem_buf(void *buf, int len)
 {
        BIO *ret;
        BUF_MEM *b;
+       size_t sz;
+
        if (!buf) {
                BIOerr(BIO_F_BIO_NEW_MEM_BUF,BIO_R_NULL_PARAMETER);
                return NULL;
        }
-       if(len == -1) len = strlen(buf);
+       sz = (len<0) ? strlen(buf) : (size_t)len;
        if(!(ret = BIO_new(BIO_s_mem())) ) return NULL;
        b = (BUF_MEM *)ret->ptr;
        b->data = buf;
-       b->length = len;
-       b->max = len;
+       b->length = sz;
+       b->max = sz;
        ret->flags |= BIO_FLAGS_MEM_RDONLY;
        /* Since this is static data retrying wont help */
        ret->num = 0;
@@ -144,30 +146,22 @@ static int mem_read(BIO *b, char *out, int outl)
        {
        int ret= -1;
        BUF_MEM *bm;
-       int i;
-       char *from,*to;
 
        bm=(BUF_MEM *)b->ptr;
        BIO_clear_retry_flags(b);
-       ret=(outl > bm->length)?bm->length:outl;
+       ret=(outl >=0 && (size_t)outl > bm->length)?(int)bm->length:outl;
        if ((out != NULL) && (ret > 0)) {
                memcpy(out,bm->data,ret);
                bm->length-=ret;
-               /* memmove(&(bm->data[0]),&(bm->data[ret]), bm->length); */
                if(b->flags & BIO_FLAGS_MEM_RDONLY) bm->data += ret;
                else {
-                       from=(char *)&(bm->data[ret]);
-                       to=(char *)&(bm->data[0]);
-                       for (i=0; i<bm->length; i++)
-                               to[i]=from[i];
+                       memmove(&(bm->data[0]),&(bm->data[ret]),bm->length);
                }
        } else if (bm->length == 0)
                {
-               if (b->num != 0)
+               ret = b->num;
+               if (ret != 0)
                        BIO_set_retry_read(b);
-               ret= b->num;
-               if(ret < 0)
-                   BIOerr(BIO_F_MEM_READ,BIO_R_EOF_ON_MEMORY_BIO);
                }
        return(ret);
        }
@@ -192,7 +186,7 @@ static int mem_write(BIO *b, const char *in, int inl)
 
        BIO_clear_retry_flags(b);
        blen=bm->length;
-       if (BUF_MEM_grow(bm,blen+inl) != (blen+inl))
+       if (BUF_MEM_grow_clean(bm,blen+inl) != (blen+inl))
                goto end;
        memcpy(&(bm->data[blen]),in,inl);
        ret=inl;
@@ -286,21 +280,27 @@ static int mem_gets(BIO *bp, char *buf, int size)
 
        BIO_clear_retry_flags(bp);
        j=bm->length;
-       if (j <= 0) return(0);
-       p=bm->data;
-       for (i=0; i<j; i++)
+       if ((size-1) < j) j=size-1;
+       if (j <= 0)
                {
-               if (p[i] == '\n') break;
+               *buf='\0';
+               return 0;
                }
-       if (i == j)
+       p=bm->data;
+       for (i=0; i<j; i++)
                {
-               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;