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

openssl/apps/genrsa.c

 /* apps/genrsa.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 77 matching lines @@
 
 int MAIN(int argc, char **argv)
         {
         BN_GENCB cb;
 #ifndef OPENSSL_NO_ENGINE
         ENGINE *e = NULL;
 #endif
         int ret=1;
         int i,num=DEFBITS;
         long l;
-        int use_x931 = 0;
         const EVP_CIPHER *enc=NULL;
         unsigned long f4=RSA_F4;
         char *outfile=NULL;
         char *passargout = NULL, *passout = NULL;
 #ifndef OPENSSL_NO_ENGINE
         char *engine=NULL;
 #endif
         char *inrand=NULL;
         BIO *out=NULL;
         BIGNUM *bn = BN_new();
@@ skipping 23 matching lines @@
                 if (argc <= 0) break;
                 if (strcmp(*argv,"-out") == 0)
                         {
                         if (--argc < 1) goto bad;
                         outfile= *(++argv);
                         }
                 else if (strcmp(*argv,"-3") == 0)
                         f4=3;
                 else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
                         f4=RSA_F4;
-                else if (strcmp(*argv,"-x931") == 0)
-                        use_x931 = 1;
 #ifndef OPENSSL_NO_ENGINE
                 else if (strcmp(*argv,"-engine") == 0)
                         {
                         if (--argc < 1) goto bad;
                         engine= *(++argv);
                         }
 #endif
                 else if (strcmp(*argv,"-rand") == 0)
                         {
                         if (--argc < 1) goto bad;
@@ skipping 107 matching lines @@
                 && !RAND_status())
                 {
                 BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
                 }
         if (inrand != NULL)
                 BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
                         app_RAND_load_files(inrand));
 
         BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
                 num);
-
+#ifdef OPENSSL_NO_ENGINE
         rsa = RSA_new();
+#else
+        rsa = RSA_new_method(e);
+#endif
         if (!rsa)
                 goto err;
 
-        if (use_x931)
-                {
-                BIGNUM *pubexp;
-                pubexp = BN_new();
-                if (!BN_set_word(pubexp, f4))
-                        goto err;
-                if (!RSA_X931_generate_key_ex(rsa, num, pubexp, &cb))
-                        goto err;
-                BN_free(pubexp);
-                }
-        else if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
+        if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
                 goto err;
                 
         app_RAND_write_file(NULL, bio_err);
 
         /* We need to do the following for when the base number size is <
          * long, esp windows 3.1 :-(. */
         l=0L;
         for (i=0; i<rsa->e->top; i++)
                 {
 #ifndef SIXTY_FOUR_BIT
@@ skipping 39 matching lines @@
 #endif
         return 1;
         }
 #else /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
 static void *dummy=&dummy;
 # endif
 
 #endif