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

openssl/ssl/s23_lib.c

 /* ssl/s23_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 47 matching lines @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
 long ssl23_default_timeout(void)
         {
         return(300);
         }
 
-IMPLEMENT_ssl23_meth_func(sslv23_base_method,
-                        ssl_undefined_function,
-                        ssl_undefined_function,
-                        ssl_bad_method)
-
 int ssl23_num_ciphers(void)
         {
         return(ssl3_num_ciphers()
 #ifndef OPENSSL_NO_SSL2
                + ssl2_num_ciphers()
 #endif
             );
         }
 
-SSL_CIPHER *ssl23_get_cipher(unsigned int u)
+const SSL_CIPHER *ssl23_get_cipher(unsigned int u)
         {
         unsigned int uu=ssl3_num_ciphers();
 
         if (u < uu)
                 return(ssl3_get_cipher(u));
         else
 #ifndef OPENSSL_NO_SSL2
                 return(ssl2_get_cipher(u-uu));
 #else
                 return(NULL);
 #endif
         }
 
 /* This function needs to check if the ciphers required are actually
  * available */
-SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
+const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
         {
-        SSL_CIPHER c,*cp;
-        unsigned long id;
-        int n;
+        const SSL_CIPHER *cp;
 
-        n=ssl3_num_ciphers();
-        id=0x03000000|((unsigned long)p[0]<<16L)|
-                ((unsigned long)p[1]<<8L)|(unsigned long)p[2];
-        c.id=id;
         cp=ssl3_get_cipher_by_char(p);
 #ifndef OPENSSL_NO_SSL2
         if (cp == NULL)
                 cp=ssl2_get_cipher_by_char(p);
 #endif
         return(cp);
         }
 
 int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
         {
@@ skipping 71 matching lines @@
                         return(-1);
                         }
                 return(SSL_write(s,buf,len));
                 }
         else
                 {
                 ssl_undefined_function(s);
                 return(-1);
                 }
         }