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

openssl/crypto/pem/pem_info.c

 /* crypto/pem/pem_info.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 80 matching lines @@
 STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)
         {
         X509_INFO *xi=NULL;
         char *name=NULL,*header=NULL;
         void *pp;
         unsigned char *data=NULL;
         const unsigned char *p;
         long len,error=0;
         int ok=0;
         STACK_OF(X509_INFO) *ret=NULL;
-        unsigned int i,raw;
-        d2i_of_void *d2i;
+        unsigned int i,raw,ptype;
+        d2i_of_void *d2i = 0;
 
         if (sk == NULL)
                 {
                 if ((ret=sk_X509_INFO_new_null()) == NULL)
                         {
                         PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_MALLOC_FAILURE);
                         goto err;
                         }
                 }
         else
                 ret=sk;
 
         if ((xi=X509_INFO_new()) == NULL) goto err;
         for (;;)
                 {
                 raw=0;
+                ptype = 0;
                 i=PEM_read_bio(bp,&name,&header,&data,&len);
                 if (i == 0)
                         {
                         error=ERR_GET_REASON(ERR_peek_last_error());
                         if (error == PEM_R_NO_START_LINE)
                                 {
                                 ERR_clear_error();
                                 break;
                                 }
                         goto err;
@@ skipping 30 matching lines @@
                                 if (!sk_X509_INFO_push(ret,xi)) goto err;
                                 if ((xi=X509_INFO_new()) == NULL) goto err;
                                 goto start;
                                 }
                         pp=&(xi->crl);
                         }
                 else
 #ifndef OPENSSL_NO_RSA
                         if (strcmp(name,PEM_STRING_RSA) == 0)
                         {
-                        d2i=(D2I_OF(void))d2i_RSAPrivateKey;
                         if (xi->x_pkey != NULL) 
                                 {
                                 if (!sk_X509_INFO_push(ret,xi)) goto err;
                                 if ((xi=X509_INFO_new()) == NULL) goto err;
                                 goto start;
                                 }
 
                         xi->enc_data=NULL;
                         xi->enc_len=0;
 
                         xi->x_pkey=X509_PKEY_new();
-                        if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
-                                goto err;
-                        xi->x_pkey->dec_pkey->type=EVP_PKEY_RSA;
-                        pp=&(xi->x_pkey->dec_pkey->pkey.rsa);
+                        ptype=EVP_PKEY_RSA;
+                        pp=&xi->x_pkey->dec_pkey;
                         if ((int)strlen(header) > 10) /* assume encrypted */
                                 raw=1;
                         }
                 else
 #endif
 #ifndef OPENSSL_NO_DSA
                         if (strcmp(name,PEM_STRING_DSA) == 0)
                         {
                         d2i=(D2I_OF(void))d2i_DSAPrivateKey;
                         if (xi->x_pkey != NULL) 
                                 {
                                 if (!sk_X509_INFO_push(ret,xi)) goto err;
                                 if ((xi=X509_INFO_new()) == NULL) goto err;
                                 goto start;
                                 }
 
                         xi->enc_data=NULL;
                         xi->enc_len=0;
 
                         xi->x_pkey=X509_PKEY_new();
-                        if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
-                                goto err;
-                        xi->x_pkey->dec_pkey->type=EVP_PKEY_DSA;
-                        pp=&xi->x_pkey->dec_pkey->pkey.dsa;
+                        ptype = EVP_PKEY_DSA;
+                        pp=&xi->x_pkey->dec_pkey;
                         if ((int)strlen(header) > 10) /* assume encrypted */
                                 raw=1;
                         }
                 else
 #endif
 #ifndef OPENSSL_NO_EC
                         if (strcmp(name,PEM_STRING_ECPRIVATEKEY) == 0)
                         {
                                 d2i=(D2I_OF(void))d2i_ECPrivateKey;
                                 if (xi->x_pkey != NULL) 
                                 {
                                         if (!sk_X509_INFO_push(ret,xi)) goto err;
                                         if ((xi=X509_INFO_new()) == NULL) goto err;
                                                 goto start;
                                 }
  
                         xi->enc_data=NULL;
                         xi->enc_len=0;
  
                         xi->x_pkey=X509_PKEY_new();
-                        if ((xi->x_pkey->dec_pkey=EVP_PKEY_new()) == NULL)
-                                goto err;
-                        xi->x_pkey->dec_pkey->type=EVP_PKEY_EC;
-                        pp=&(xi->x_pkey->dec_pkey->pkey.ec);
+                        ptype = EVP_PKEY_EC;
+                        pp=&xi->x_pkey->dec_pkey;
                         if ((int)strlen(header) > 10) /* assume encrypted */
                                 raw=1;
                         }
                 else
 #endif
                         {
                         d2i=NULL;
                         pp=NULL;
                         }
 
                 if (d2i != NULL)
                         {
                         if (!raw)
                                 {
                                 EVP_CIPHER_INFO cipher;
 
                                 if (!PEM_get_EVP_CIPHER_INFO(header,&cipher))
                                         goto err;
                                 if (!PEM_do_header(&cipher,data,&len,cb,u))
                                         goto err;
                                 p=data;
-                                if (d2i(pp,&p,len) == NULL)
+                                if (ptype)
+                                        {
+                                        if (!d2i_PrivateKey(ptype, pp, &p, len))
+                                                {
+                                                PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_ASN1_LIB);
+                                                goto err;
+                                                }
+                                        }
+                                else if (d2i(pp,&p,len) == NULL)
                                         {
                                         PEMerr(PEM_F_PEM_X509_INFO_READ_BIO,ERR_R_ASN1_LIB);
                                         goto err;
                                         }
                                 }
                         else
                                 { /* encrypted RSA data */
                                 if (!PEM_get_EVP_CIPHER_INFO(header,
                                         &xi->enc_cipher)) goto err;
                                 xi->enc_data=(char *)data;
@@ skipping 65 matching lines @@
 
         /* now for the fun part ... if we have a private key then 
          * we have to be able to handle a not-yet-decrypted key
          * being written out correctly ... if it is decrypted or
          * it is non-encrypted then we use the base code
          */
         if (xi->x_pkey!=NULL)
                 {
                 if ( (xi->enc_data!=NULL) && (xi->enc_len>0) )
                         {
+                        if (enc == NULL)
+                                {
+                                PEMerr(PEM_F_PEM_X509_INFO_WRITE_BIO,PEM_R_CIPHER_IS_NULL);
+                                goto err;
+                                }
+
                         /* copy from weirdo names into more normal things */
                         iv=xi->enc_cipher.iv;
                         data=(unsigned char *)xi->enc_data;
                         i=xi->enc_len;
 
                         /* we take the encryption data from the
                          * internal stuff rather than what the
                          * user has passed us ... as we have to 
                          * match exactly for some strange reason
                          */
@@ skipping 38 matching lines @@
          * base library --tjh
          */
 
         ret=1;
 
 err:
         OPENSSL_cleanse((char *)&ctx,sizeof(ctx));
         OPENSSL_cleanse(buf,PEM_BUFSIZE);
         return(ret);
         }