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

openssl/apps/ciphers.c

 /* apps/ciphers.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 53 matching lines @@
 #endif
 #include "apps.h"
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
 #undef PROG
 #define PROG    ciphers_main
 
 static const char *ciphers_usage[]={
 "usage: ciphers args\n",
-" -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
+" -v          - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",
+" -V          - even more verbose\n",
 " -ssl2       - SSL2 mode\n",
 " -ssl3       - SSL3 mode\n",
 " -tls1       - TLS1 mode\n",
 NULL
 };
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
         int ret=1,i;
-        int verbose=0;
+        int verbose=0,Verbose=0;
         const char **pp;
         const char *p;
         int badops=0;
         SSL_CTX *ctx=NULL;
         SSL *ssl=NULL;
         char *ciphers=NULL;
-        SSL_METHOD *meth=NULL;
+        const SSL_METHOD *meth=NULL;
         STACK_OF(SSL_CIPHER) *sk;
         char buf[512];
         BIO *STDout=NULL;
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
         meth=SSLv23_server_method();
 #elif !defined(OPENSSL_NO_SSL3)
         meth=SSLv3_server_method();
 #elif !defined(OPENSSL_NO_SSL2)
         meth=SSLv2_server_method();
 #endif
 
         apps_startup();
 
         if (bio_err == NULL)
                 bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
         STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
         {
         BIO *tmpbio = BIO_new(BIO_f_linebuffer());
         STDout = BIO_push(tmpbio, STDout);
         }
 #endif
+        if (!load_config(bio_err, NULL))
+                goto end;
 
         argc--;
         argv++;
         while (argc >= 1)
                 {
                 if (strcmp(*argv,"-v") == 0)
                         verbose=1;
+                else if (strcmp(*argv,"-V") == 0)
+                        verbose=Verbose=1;
 #ifndef OPENSSL_NO_SSL2
                 else if (strcmp(*argv,"-ssl2") == 0)
                         meth=SSLv2_client_method();
 #endif
 #ifndef OPENSSL_NO_SSL3
                 else if (strcmp(*argv,"-ssl3") == 0)
                         meth=SSLv3_client_method();
 #endif
 #ifndef OPENSSL_NO_TLS1
                 else if (strcmp(*argv,"-tls1") == 0)
@@ skipping 38 matching lines @@
                 {
                 for (i=0; ; i++)
                         {
                         p=SSL_get_cipher_list(ssl,i);
                         if (p == NULL) break;
                         if (i != 0) BIO_printf(STDout,":");
                         BIO_printf(STDout,"%s",p);
                         }
                 BIO_printf(STDout,"\n");
                 }
-        else
+        else /* verbose */
                 {
                 sk=SSL_get_ciphers(ssl);
 
                 for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
                         {
-                        BIO_puts(STDout,SSL_CIPHER_description(
-                                sk_SSL_CIPHER_value(sk,i),
-                                buf,sizeof buf));
+                        SSL_CIPHER *c;
+
+                        c = sk_SSL_CIPHER_value(sk,i);
+                        
+                        if (Verbose)
+                                {
+                                unsigned long id = c->id;
+                                int id0 = (int)(id >> 24);
+                                int id1 = (int)((id >> 16) & 0xffL);
+                                int id2 = (int)((id >> 8) & 0xffL);
+                                int id3 = (int)(id & 0xffL);
+                                
+                                if ((id & 0xff000000L) == 0x02000000L)
+                                        BIO_printf(STDout, "     0x%02X,0x%02X,0x%02X - ", id1, id2, id3); /* SSL2 cipher */
+                                else if ((id & 0xff000000L) == 0x03000000L)
+                                        BIO_printf(STDout, "          0x%02X,0x%02X - ", id2, id3); /* SSL3 cipher */
+                                else
+                                        BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
+                                }
+
+                        BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf));
                         }
                 }
 
         ret=0;
         if (0)
                 {
 err:
                 SSL_load_error_strings();
                 ERR_print_errors(bio_err);
                 }
 end:
         if (ctx != NULL) SSL_CTX_free(ctx);
         if (ssl != NULL) SSL_free(ssl);
         if (STDout != NULL) BIO_free_all(STDout);
         apps_shutdown();
         OPENSSL_EXIT(ret);
         }