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

openssl/crypto/bio/bss_acpt.c

 /* crypto/bio/bss_acpt.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 82 matching lines @@
         } BIO_ACCEPT;
 
 static int acpt_write(BIO *h, const char *buf, int num);
 static int acpt_read(BIO *h, char *buf, int size);
 static int acpt_puts(BIO *h, const char *str);
 static long acpt_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int acpt_new(BIO *h);
 static int acpt_free(BIO *data);
 static int acpt_state(BIO *b, BIO_ACCEPT *c);
 static void acpt_close_socket(BIO *data);
-BIO_ACCEPT *BIO_ACCEPT_new(void );
-void BIO_ACCEPT_free(BIO_ACCEPT *a);
+static BIO_ACCEPT *BIO_ACCEPT_new(void );
+static void BIO_ACCEPT_free(BIO_ACCEPT *a);
 
 #define ACPT_S_BEFORE                   1
 #define ACPT_S_GET_ACCEPT_SOCKET        2
 #define ACPT_S_OK                       3
 
 static BIO_METHOD methods_acceptp=
         {
         BIO_TYPE_ACCEPT,
         "socket accept",
         acpt_write,
@@ skipping 19 matching lines @@
         bi->num=INVALID_SOCKET;
         bi->flags=0;
         if ((ba=BIO_ACCEPT_new()) == NULL)
                 return(0);
         bi->ptr=(char *)ba;
         ba->state=ACPT_S_BEFORE;
         bi->shutdown=1;
         return(1);
         }
 
-BIO_ACCEPT *BIO_ACCEPT_new(void)
+static BIO_ACCEPT *BIO_ACCEPT_new(void)
         {
         BIO_ACCEPT *ret;
 
         if ((ret=(BIO_ACCEPT *)OPENSSL_malloc(sizeof(BIO_ACCEPT))) == NULL)
                 return(NULL);
 
         memset(ret,0,sizeof(BIO_ACCEPT));
         ret->accept_sock=INVALID_SOCKET;
         ret->bind_mode=BIO_BIND_NORMAL;
         return(ret);
         }
 
-void BIO_ACCEPT_free(BIO_ACCEPT *a)
+static void BIO_ACCEPT_free(BIO_ACCEPT *a)
         {
         if(a == NULL)
             return;
 
         if (a->param_addr != NULL) OPENSSL_free(a->param_addr);
         if (a->addr != NULL) OPENSSL_free(a->addr);
         if (a->bio_chain != NULL) BIO_free(a->bio_chain);
         OPENSSL_free(a);
         }
 
@@ skipping 165 matching lines @@
                 if (ret <= 0) return(ret);
                 }
 
         ret=BIO_write(b->next_bio,in,inl);
         BIO_copy_next_retry(b);
         return(ret);
         }
 
 static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
         {
-        BIO *dbio;
         int *ip;
         long ret=1;
         BIO_ACCEPT *data;
         char **pp;
 
         data=(BIO_ACCEPT *)b->ptr;
 
         switch (cmd)
                 {
         case BIO_CTRL_RESET:
@@ skipping 76 matching lines @@
                 break;
         case BIO_CTRL_FLUSH:
                 break;
         case BIO_C_SET_BIND_MODE:
                 data->bind_mode=(int)num;
                 break;
         case BIO_C_GET_BIND_MODE:
                 ret=(long)data->bind_mode;
                 break;
         case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-/*              if (data->param_port) EAY EAY
+/*              dbio=(BIO *)ptr;
+                if (data->param_port) EAY EAY
                         BIO_set_port(dbio,data->param_port);
                 if (data->param_hostname)
                         BIO_set_hostname(dbio,data->param_hostname);
                 BIO_set_nbio(dbio,data->nbio); */
                 break;
 
         default:
                 ret=0;
                 break;
                 }
@@ skipping 18 matching lines @@
         if (BIO_set_accept_port(ret,str))
                 return(ret);
         else
                 {
                 BIO_free(ret);
                 return(NULL);
                 }
         }
 
 #endif