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

openssl/apps/pkcs8.c

 /* pkcs8.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 62 matching lines @@
         char **args, *infile = NULL, *outfile = NULL;
         char *passargin = NULL, *passargout = NULL;
         BIO *in = NULL, *out = NULL;
         int topk8 = 0;
         int pbe_nid = -1;
         const EVP_CIPHER *cipher = NULL;
         int iter = PKCS12_DEFAULT_ITER;
         int informat, outformat;
         int p8_broken = PKCS8_OK;
         int nocrypt = 0;
-        X509_SIG *p8;
-        PKCS8_PRIV_KEY_INFO *p8inf;
+        X509_SIG *p8 = NULL;
+        PKCS8_PRIV_KEY_INFO *p8inf = NULL;
         EVP_PKEY *pkey=NULL;
         char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
         int badarg = 0;
+        int ret = 1;
 #ifndef OPENSSL_NO_ENGINE
         char *engine=NULL;
 #endif
 
         if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
 
         if (!load_config(bio_err, NULL))
                 goto end;
 
         informat=FORMAT_PEM;
@@ skipping 120 matching lines @@
                 BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");
                 BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");
                 BIO_printf(bio_err, "-nsdb           use (nonstandard) DSA Netscape DB format\n");
                 BIO_printf(bio_err, "-noiter         use 1 as iteration count\n");
                 BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
                 BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
                 BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
 #ifndef OPENSSL_NO_ENGINE
                 BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 #endif
-                return 1;
+                goto end;
                 }
 
 #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");
-                return 1;
+                goto end;
                 }
 
         if ((pbe_nid == -1) && !cipher)
                 pbe_nid = NID_pbeWithMD5AndDES_CBC;
 
         if (infile)
                 {
                 if (!(in = BIO_new_file(infile, "rb")))
                         {
                         BIO_printf(bio_err,
                                  "Can't open input file %s\n", infile);
-                        return (1);
+                        goto end;
                         }
                 }
         else
                 in = BIO_new_fp (stdin, BIO_NOCLOSE);
 
         if (outfile)
                 {
                 if (!(out = BIO_new_file (outfile, "wb")))
                         {
                         BIO_printf(bio_err,
                                  "Can't open output file %s\n", outfile);
-                        return (1);
+                        goto end;
                         }
                 }
         else
                 {
                 out = BIO_new_fp (stdout, BIO_NOCLOSE);
 #ifdef OPENSSL_SYS_VMS
                         {
                         BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                         out = BIO_push(tmpbio, out);
                         }
 #endif
                 }
         if (topk8)
                 {
-                BIO_free(in); /* Not needed in this section */
                 pkey = load_key(bio_err, infile, informat, 1,
                         passin, e, "key");
                 if (!pkey)
-                        {
-                        BIO_free_all(out);
-                        return 1;
-                        }
+                        goto end;
                 if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken)))
                         {
                         BIO_printf(bio_err, "Error converting key\n");
                         ERR_print_errors(bio_err);
-                        EVP_PKEY_free(pkey);
-                        BIO_free_all(out);
-                        return 1;
+                        goto end;
                         }
                 if (nocrypt)
                         {
                         if (outformat == FORMAT_PEM) 
                                 PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf);
                         else if (outformat == FORMAT_ASN1)
                                 i2d_PKCS8_PRIV_KEY_INFO_bio(out, p8inf);
                         else
                                 {
                                 BIO_printf(bio_err, "Bad format specified for key\n");
-                                PKCS8_PRIV_KEY_INFO_free(p8inf);
-                                EVP_PKEY_free(pkey);
-                                BIO_free_all(out);
-                                return (1);
+                                goto end;
                                 }
                         }
                 else
                         {
                         if (passout)
                                 p8pass = passout;
                         else
                                 {
                                 p8pass = pass;
                                 if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
-                                        {
-                                        PKCS8_PRIV_KEY_INFO_free(p8inf);
-                                        EVP_PKEY_free(pkey);
-                                        BIO_free_all(out);
-                                        return (1);
-                                        }
+                                        goto end;
                                 }
                         app_RAND_load_file(NULL, bio_err, 0);
                         if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
                                         p8pass, strlen(p8pass),
                                         NULL, 0, iter, p8inf)))
                                 {
                                 BIO_printf(bio_err, "Error encrypting key\n");
                                 ERR_print_errors(bio_err);
-                                PKCS8_PRIV_KEY_INFO_free(p8inf);
-                                EVP_PKEY_free(pkey);
-                                BIO_free_all(out);
-                                return (1);
+                                goto end;
                                 }
                         app_RAND_write_file(NULL, bio_err);
                         if (outformat == FORMAT_PEM) 
                                 PEM_write_bio_PKCS8(out, p8);
                         else if (outformat == FORMAT_ASN1)
                                 i2d_PKCS8_bio(out, p8);
                         else
                                 {
                                 BIO_printf(bio_err, "Bad format specified for key\n");
-                                PKCS8_PRIV_KEY_INFO_free(p8inf);
-                                EVP_PKEY_free(pkey);
-                                BIO_free_all(out);
-                                return (1);
+                                goto end;
                                 }
-                        X509_SIG_free(p8);
                         }
 
-                PKCS8_PRIV_KEY_INFO_free (p8inf);
-                EVP_PKEY_free(pkey);
-                BIO_free_all(out);
-                if (passin)
-                        OPENSSL_free(passin);
-                if (passout)
-                        OPENSSL_free(passout);
-                return (0);
+                ret = 0;
+                goto end;
                 }
 
         if (nocrypt)
                 {
                 if (informat == FORMAT_PEM) 
                         p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL, NULL);
                 else if (informat == FORMAT_ASN1)
                         p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL);
                 else
                         {
                         BIO_printf(bio_err, "Bad format specified for key\n");
-                        return (1);
+                        goto end;
                         }
                 }
         else
                 {
                 if (informat == FORMAT_PEM) 
                         p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL);
                 else if (informat == FORMAT_ASN1)
                         p8 = d2i_PKCS8_bio(in, NULL);
                 else
                         {
                         BIO_printf(bio_err, "Bad format specified for key\n");
-                        return (1);
+                        goto end;
                         }
 
                 if (!p8)
                         {
                         BIO_printf (bio_err, "Error reading key\n");
                         ERR_print_errors(bio_err);
-                        return (1);
+                        goto end;
                         }
                 if (passin)
                         p8pass = passin;
                 else
                         {
                         p8pass = pass;
                         EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
                         }
                 p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
-                X509_SIG_free(p8);
                 }
 
         if (!p8inf)
                 {
                 BIO_printf(bio_err, "Error decrypting key\n");
                 ERR_print_errors(bio_err);
-                return (1);
+                goto end;
                 }
 
         if (!(pkey = EVP_PKCS82PKEY(p8inf)))
                 {
                 BIO_printf(bio_err, "Error converting key\n");
                 ERR_print_errors(bio_err);
-                return (1);
+                goto end;
                 }
         
         if (p8inf->broken)
                 {
                 BIO_printf(bio_err, "Warning: broken key encoding: ");
                 switch (p8inf->broken)
                         {
                         case PKCS8_NO_OCTET:
                         BIO_printf(bio_err, "No Octet String in PrivateKey\n");
                         break;
 
                         case PKCS8_EMBEDDED_PARAM:
                         BIO_printf(bio_err, "DSA parameters included in PrivateKey\n");
                         break;
 
                         case PKCS8_NS_DB:
                         BIO_printf(bio_err, "DSA public key include in PrivateKey\n");
                         break;
 
+                        case PKCS8_NEG_PRIVKEY:
+                        BIO_printf(bio_err, "DSA private key value is negative\n");
+                        break;
+
                         default:
                         BIO_printf(bio_err, "Unknown broken type\n");
                         break;
                 }
         }
         
-        PKCS8_PRIV_KEY_INFO_free(p8inf);
         if (outformat == FORMAT_PEM) 
                 PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
         else if (outformat == FORMAT_ASN1)
                 i2d_PrivateKey_bio(out, pkey);
         else
                 {
                 BIO_printf(bio_err, "Bad format specified for key\n");
-                        return (1);
+                        goto end;
                 }
+        ret = 0;
 
         end:
+        X509_SIG_free(p8);
+        PKCS8_PRIV_KEY_INFO_free(p8inf);
         EVP_PKEY_free(pkey);
         BIO_free_all(out);
         BIO_free(in);
         if (passin)
                 OPENSSL_free(passin);
         if (passout)
                 OPENSSL_free(passout);
 
-        return (0);
+        return ret;
         }