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

openssl/apps/dsa.c

 /* apps/dsa.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 <openssl/opensslconf.h>        /* for OPENSSL_NO_DSA */
 #ifndef OPENSSL_NO_DSA
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#include <openssl/dsa.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/bn.h>
-#include <openssl/dsa.h>
 
 #undef PROG
 #define PROG    dsa_main
 
 /* -inform arg  - input format - default PEM (one of DER, NET or PEM)
  * -outform arg - output format - default PEM
  * -in arg      - input file - default stdin
  * -out arg     - output file - default stdout
  * -des         - encrypt output if PEM format with DES in cbc mode
  * -des3        - encrypt output if PEM format
@@ skipping 22 matching lines @@
         int informat,outformat,text=0,noout=0;
         int pubin = 0, pubout = 0;
         char *infile,*outfile,*prog;
 #ifndef OPENSSL_NO_ENGINE
         char *engine;
 #endif
         char *passargin = NULL, *passargout = NULL;
         char *passin = NULL, *passout = NULL;
         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;
 
 #ifndef OPENSSL_NO_ENGINE
@@ skipping 39 matching lines @@
                         if (--argc < 1) goto bad;
                         passargout= *(++argv);
                         }
 #ifndef OPENSSL_NO_ENGINE
                 else if (strcmp(*argv,"-engine") == 0)
                         {
                         if (--argc < 1) goto bad;
                         engine= *(++argv);
                         }
 #endif
+                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,"-pubin") == 0)
                         pubin=1;
                 else if (strcmp(*argv,"-pubout") == 0)
                         pubout=1;
@@ skipping 47 matching lines @@
 
 #ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine, 0);
 #endif
 
         if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
                 BIO_printf(bio_err, "Error getting passwords\n");
                 goto end;
         }
 
+        in=BIO_new(BIO_s_file());
         out=BIO_new(BIO_s_file());
-        if (out == NULL)
+        if ((in == NULL) || (out == NULL))
                 {
                 ERR_print_errors(bio_err);
                 goto end;
                 }
 
+        if (infile == NULL)
+                BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        else
+                {
+                if (BIO_read_filename(in,infile) <= 0)
+                        {
+                        perror(infile);
+                        goto end;
+                        }
+                }
+
         BIO_printf(bio_err,"read DSA key\n");
-        {
+
+                {
                 EVP_PKEY        *pkey;
+
                 if (pubin)
                         pkey = load_pubkey(bio_err, infile, informat, 1,
                                 passin, e, "Public Key");
                 else
                         pkey = load_key(bio_err, infile, informat, 1,
                                 passin, e, "Private Key");
 
-                if (pkey != NULL)
-                dsa = pkey == NULL ? NULL : EVP_PKEY_get1_DSA(pkey);
-                EVP_PKEY_free(pkey);
-        }
+                if (pkey)
+                        {
+                        dsa = EVP_PKEY_get1_DSA(pkey);
+                        EVP_PKEY_free(pkey);
+                        }
+                }
         if (dsa == NULL)
                 {
                 BIO_printf(bio_err,"unable to load Key\n");
                 ERR_print_errors(bio_err);
                 goto end;
                 }
 
         if (outfile == NULL)
                 {
                 BIO_set_fp(out,stdout,BIO_NOCLOSE);
@@ skipping 31 matching lines @@
         if (noout) goto end;
         BIO_printf(bio_err,"writing DSA key\n");
         if      (outformat == FORMAT_ASN1) {
                 if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
                 else i=i2d_DSAPrivateKey_bio(out,dsa);
         } else if (outformat == FORMAT_PEM) {
                 if(pubin || pubout)
                         i=PEM_write_bio_DSA_PUBKEY(out,dsa);
                 else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
                                                         NULL,0,NULL, passout);
+#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4)
+        } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
+                EVP_PKEY *pk;
+                pk = EVP_PKEY_new();
+                EVP_PKEY_set1_DSA(pk, dsa);
+                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 private key\n");
                 ERR_print_errors(bio_err);
                 }
         else
                 ret=0;
 end:
         if(in != NULL) BIO_free(in);
         if(out != NULL) BIO_free_all(out);
         if(dsa != NULL) DSA_free(dsa);
         if(passin) OPENSSL_free(passin);
         if(passout) OPENSSL_free(passout);
         apps_shutdown();
         OPENSSL_EXIT(ret);
         }
+#else /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif