Upgrade chrome's OpenSSL to same version Android ships with.

openssl/crypto/bio/bf_buff.c

 /* crypto/bio/bf_buff.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 191 matching lines @@
         if ((in == NULL) || (inl <= 0)) return(0);
         ctx=(BIO_F_BUFFER_CTX *)b->ptr;
         if ((ctx == NULL) || (b->next_bio == NULL)) return(0);
 
         BIO_clear_retry_flags(b);
 start:
         i=ctx->obuf_size-(ctx->obuf_len+ctx->obuf_off);
         /* add to buffer and return */
         if (i >= inl)
                 {
-                memcpy(&(ctx->obuf[ctx->obuf_len]),in,inl);
+                memcpy(&(ctx->obuf[ctx->obuf_off+ctx->obuf_len]),in,inl);
                 ctx->obuf_len+=inl;
                 return(num+inl);
                 }
         /* else */
         /* stuff already in buffer, so add to it first, then flush */
         if (ctx->obuf_len != 0)
                 {
                 if (i > 0) /* lets fill it up if we can */
                         {
-                        memcpy(&(ctx->obuf[ctx->obuf_len]),in,i);
+                        memcpy(&(ctx->obuf[ctx->obuf_off+ctx->obuf_len]),in,i);
                         in+=i;
                         inl-=i;
                         num+=i;
                         ctx->obuf_len+=i;
                         }
                 /* we now have a full buffer needing flushing */
                 for (;;)
                         {
                         i=BIO_write(b->next_bio,&(ctx->obuf[ctx->obuf_off]),
                                 ctx->obuf_len);
@@ skipping 54 matching lines @@
                 ctx->obuf_len=0;
                 if (b->next_bio == NULL) return(0);
                 ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
                 break;
         case BIO_CTRL_INFO:
                 ret=(long)ctx->obuf_len;
                 break;
         case BIO_C_GET_BUFF_NUM_LINES:
                 ret=0;
                 p1=ctx->ibuf;
-                for (i=ctx->ibuf_off; i<ctx->ibuf_len; i++)
+                for (i=0; i<ctx->ibuf_len; i++)
                         {
-                        if (p1[i] == '\n') ret++;
+                        if (p1[ctx->ibuf_off + i] == '\n') ret++;
                         }
                 break;
         case BIO_CTRL_WPENDING:
                 ret=(long)ctx->obuf_len;
                 if (ret == 0)
                         {
                         if (b->next_bio == NULL) return(0);
                         ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
                         }
                 break;
@@ skipping 82 matching lines @@
                 if (b->next_bio == NULL) return(0);
                 if (ctx->obuf_len <= 0)
                         {
                         ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
                         break;
                         }
 
                 for (;;)
                         {
                         BIO_clear_retry_flags(b);
-                        if (ctx->obuf_len > ctx->obuf_off)
+                        if (ctx->obuf_len > 0)
                                 {
                                 r=BIO_write(b->next_bio,
                                         &(ctx->obuf[ctx->obuf_off]),
-                                        ctx->obuf_len-ctx->obuf_off);
+                                        ctx->obuf_len);
 #if 0
-fprintf(stderr,"FLUSH [%3d] %3d -> %3d\n",ctx->obuf_off,ctx->obuf_len-ctx->obuf_off,r);
+fprintf(stderr,"FLUSH [%3d] %3d -> %3d\n",ctx->obuf_off,ctx->obuf_len,r);
 #endif
                                 BIO_copy_next_retry(b);
                                 if (r <= 0) return((long)r);
                                 ctx->obuf_off+=r;
+                                ctx->obuf_len-=r;
                                 }
                         else
                                 {
                                 ctx->obuf_len=0;
                                 ctx->obuf_off=0;
                                 ret=1;
                                 break;
                                 }
                         }
                 ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
@@ skipping 79 matching lines @@
                         ctx->ibuf_off=0;
                         }
                 }
         }
 
 static int buffer_puts(BIO *b, const char *str)
         {
         return(buffer_write(b,str,strlen(str)));
         }