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

openssl/apps/rsa.c

 /* apps/rsa.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 97 matching lines @@
         int informat,outformat,text=0,check=0,noout=0;
         int pubin = 0, pubout = 0;
         char *infile,*outfile,*prog;
         char *passargin = NULL, *passargout = NULL;
         char *passin = NULL, *passout = NULL;
 #ifndef OPENSSL_NO_ENGINE
         char *engine=NULL;
 #endif
         int modulus=0;
 
+        int pvk_encr = 2;
+
         apps_startup();
 
         if (bio_err == NULL)
                 if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                         BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
         if (!load_config(bio_err, NULL))
                 goto end;
 
         infile=NULL;
@@ skipping 42 matching lines @@
                         if (--argc < 1) goto bad;
                         engine= *(++argv);
                         }
 #endif
                 else if (strcmp(*argv,"-sgckey") == 0)
                         sgckey=1;
                 else if (strcmp(*argv,"-pubin") == 0)
                         pubin=1;
                 else if (strcmp(*argv,"-pubout") == 0)
                         pubout=1;
+                else if (strcmp(*argv,"-RSAPublicKey_in") == 0)
+                        pubin = 2;
+                else if (strcmp(*argv,"-RSAPublicKey_out") == 0)
+                        pubout = 2;
+                else if (strcmp(*argv,"-pvk-strong") == 0)
+                        pvk_encr=2;
+                else if (strcmp(*argv,"-pvk-weak") == 0)
+                        pvk_encr=1;
+                else if (strcmp(*argv,"-pvk-none") == 0)
+                        pvk_encr=0;
                 else if (strcmp(*argv,"-noout") == 0)
                         noout=1;
                 else if (strcmp(*argv,"-text") == 0)
                         text=1;
                 else if (strcmp(*argv,"-modulus") == 0)
                         modulus=1;
                 else if (strcmp(*argv,"-check") == 0)
                         check=1;
                 else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
                         {
@@ skipping 60 matching lines @@
                 BIO_printf(bio_err, "Only private keys can be checked\n");
                 goto end;
         }
 
         out=BIO_new(BIO_s_file());
 
         {
                 EVP_PKEY        *pkey;
 
                 if (pubin)
-                        pkey = load_pubkey(bio_err, infile,
-                                (informat == FORMAT_NETSCAPE && sgckey ?
-                                        FORMAT_IISSGC : informat), 1,
+                        {
+                        int tmpformat=-1;
+                        if (pubin == 2)
+                                {
+                                if (informat == FORMAT_PEM)
+                                        tmpformat = FORMAT_PEMRSA;
+                                else if (informat == FORMAT_ASN1)
+                                        tmpformat = FORMAT_ASN1RSA;
+                                }
+                        else if (informat == FORMAT_NETSCAPE && sgckey)
+                                tmpformat = FORMAT_IISSGC;
+                        else
+                                tmpformat = informat;
+                                        
+                        pkey = load_pubkey(bio_err, infile, tmpformat, 1,
                                 passin, e, "Public Key");
+                        }
                 else
                         pkey = load_key(bio_err, infile,
                                 (informat == FORMAT_NETSCAPE && sgckey ?
                                         FORMAT_IISSGC : informat), 1,
                                 passin, e, "Private Key");
 
                 if (pkey != NULL)
-                rsa = pkey == NULL ? NULL : EVP_PKEY_get1_RSA(pkey);
+                        rsa = EVP_PKEY_get1_RSA(pkey);
                 EVP_PKEY_free(pkey);
         }
 
         if (rsa == NULL)
                 {
                 ERR_print_errors(bio_err);
                 goto end;
                 }
 
         if (outfile == NULL)
@@ skipping 57 matching lines @@
                         }
                 }
                 
         if (noout)
                 {
                 ret = 0;
                 goto end;
                 }
         BIO_printf(bio_err,"writing RSA key\n");
         if      (outformat == FORMAT_ASN1) {
-                if(pubout || pubin) i=i2d_RSA_PUBKEY_bio(out,rsa);
+                if(pubout || pubin) 
+                        {
+                        if (pubout == 2)
+                                i=i2d_RSAPublicKey_bio(out,rsa);
+                        else
+                                i=i2d_RSA_PUBKEY_bio(out,rsa);
+                        }
                 else i=i2d_RSAPrivateKey_bio(out,rsa);
         }
 #ifndef OPENSSL_NO_RC4
         else if (outformat == FORMAT_NETSCAPE)
                 {
                 unsigned char *p,*pp;
                 int size;
 
                 i=1;
                 size=i2d_RSA_NET(rsa,NULL,NULL, sgckey);
                 if ((p=(unsigned char *)OPENSSL_malloc(size)) == NULL)
                         {
                         BIO_printf(bio_err,"Memory allocation failure\n");
                         goto end;
                         }
                 pp=p;
                 i2d_RSA_NET(rsa,&p,NULL, sgckey);
                 BIO_write(out,(char *)pp,size);
                 OPENSSL_free(pp);
                 }
 #endif
         else if (outformat == FORMAT_PEM) {
                 if(pubout || pubin)
-                    i=PEM_write_bio_RSA_PUBKEY(out,rsa);
+                        {
+                        if (pubout == 2)
+                                i=PEM_write_bio_RSAPublicKey(out,rsa);
+                        else
+                                i=PEM_write_bio_RSA_PUBKEY(out,rsa);
+                        }
                 else i=PEM_write_bio_RSAPrivateKey(out,rsa,
                                                 enc,NULL,0,NULL,passout);
+#if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_RC4)
+        } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
+                EVP_PKEY *pk;
+                pk = EVP_PKEY_new();
+                EVP_PKEY_set1_RSA(pk, rsa);
+                if (outformat == FORMAT_PVK)
+                        i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
+                else if (pubin || pubout)
+                        i = i2b_PublicKey_bio(out, pk);
+                else
+                        i = i2b_PrivateKey_bio(out, pk);
+                EVP_PKEY_free(pk);
+#endif
         } else  {
                 BIO_printf(bio_err,"bad output format specified for outfile\n");
                 goto end;
                 }
-        if (!i)
+        if (i <= 0)
                 {
                 BIO_printf(bio_err,"unable to write key\n");
                 ERR_print_errors(bio_err);
                 }
         else
                 ret=0;
 end:
         if(out != NULL) BIO_free_all(out);
         if(rsa != NULL) RSA_free(rsa);
         if(passin) OPENSSL_free(passin);
         if(passout) OPENSSL_free(passout);
         apps_shutdown();
         OPENSSL_EXIT(ret);
         }
 #else /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
 static void *dummy=&dummy;
 # endif
 
 #endif