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

openssl/crypto/bio/bio_lib.c

 /* crypto/bio/bio_lib.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 92 matching lines @@
                         {
                         CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, bio,
                                         &bio->ex_data);
                         return(0);
                         }
         return(1);
         }
 
 int BIO_free(BIO *a)
         {
-        int ret=0,i;
+        int i;
 
         if (a == NULL) return(0);
 
         i=CRYPTO_add(&a->references,-1,CRYPTO_LOCK_BIO);
 #ifdef REF_PRINT
         REF_PRINT("BIO",a);
 #endif
         if (i > 0) return(1);
 #ifdef REF_CHECK
         if (i < 0)
                 {
                 fprintf(stderr,"BIO_free, bad reference count\n");
                 abort();
                 }
 #endif
         if ((a->callback != NULL) &&
                 ((i=(int)a->callback(a,BIO_CB_FREE,NULL,0,0L,1L)) <= 0))
                         return(i);
 
         CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data);
 
         if ((a->method == NULL) || (a->method->destroy == NULL)) return(1);
-        ret=a->method->destroy(a);
+        a->method->destroy(a);
         OPENSSL_free(a);
         return(1);
         }
 
 void BIO_vfree(BIO *a)
     { BIO_free(a); }
 
 void BIO_clear_flags(BIO *b, int flags)
         {
         b->flags &= ~flags;
@@ skipping 275 matching lines @@
         BIO *lb;
 
         if (b == NULL) return(bio);
         lb=b;
         while (lb->next_bio != NULL)
                 lb=lb->next_bio;
         lb->next_bio=bio;
         if (bio != NULL)
                 bio->prev_bio=lb;
         /* called to do internal processing */
-        BIO_ctrl(b,BIO_CTRL_PUSH,0,NULL);
+        BIO_ctrl(b,BIO_CTRL_PUSH,0,lb);
         return(b);
         }
 
 /* Remove the first and return the rest */
 BIO *BIO_pop(BIO *b)
         {
         BIO *ret;
 
         if (b == NULL) return(NULL);
         ret=b->next_bio;
 
-        BIO_ctrl(b,BIO_CTRL_POP,0,NULL);
+        BIO_ctrl(b,BIO_CTRL_POP,0,b);
 
         if (b->prev_bio != NULL)
                 b->prev_bio->next_bio=b->next_bio;
         if (b->next_bio != NULL)
                 b->next_bio->prev_bio=b->prev_bio;
 
         b->next_bio=NULL;
         b->prev_bio=NULL;
         return(ret);
         }
@@ skipping 138 matching lines @@
         return 0;
 }
 
 unsigned long BIO_number_written(BIO *bio)
 {
         if(bio) return bio->num_write;
         return 0;
 }
 
 IMPLEMENT_STACK_OF(BIO)