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

openssl/crypto/asn1/t_x509.c

 /* crypto/asn1/t_x509.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 93 matching lines @@
 int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
         {
         long l;
         int ret=0,i;
         char *m=NULL,mlch = ' ';
         int nmindent = 0;
         X509_CINF *ci;
         ASN1_INTEGER *bs;
         EVP_PKEY *pkey=NULL;
         const char *neg;
-        ASN1_STRING *str=NULL;
 
         if((nmflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
                         mlch = '\n';
                         nmindent = 12;
         }
 
         if(nmflags == X509_FLAG_COMPAT)
                 nmindent = 16;
 
         ci=x->cert_info;
@@ skipping 83 matching lines @@
                 if (BIO_puts(bp, "\n") <= 0)
                         goto err;
 
                 pkey=X509_get_pubkey(x);
                 if (pkey == NULL)
                         {
                         BIO_printf(bp,"%12sUnable to load Public Key\n","");
                         ERR_print_errors(bp);
                         }
                 else
-#ifndef OPENSSL_NO_RSA
-                if (pkey->type == EVP_PKEY_RSA)
                         {
-                        BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","",
-                        BN_num_bits(pkey->pkey.rsa->n));
-                        RSA_print(bp,pkey->pkey.rsa,16);
+                        EVP_PKEY_print_public(bp, pkey, 16, NULL);
+                        EVP_PKEY_free(pkey);
                         }
-                else
-#endif
-#ifndef OPENSSL_NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                        {
-                        BIO_printf(bp,"%12sDSA Public Key:\n","");
-                        DSA_print(bp,pkey->pkey.dsa,16);
-                        }
-                else
-#endif
-#ifndef OPENSSL_NO_EC
-                if (pkey->type == EVP_PKEY_EC)
-                        {
-                        BIO_printf(bp, "%12sEC Public Key:\n","");
-                        EC_KEY_print(bp, pkey->pkey.ec, 16);
-                        }
-                else
-#endif
-                        BIO_printf(bp,"%12sUnknown Public Key:\n","");
-
-                EVP_PKEY_free(pkey);
                 }
 
         if (!(cflag & X509_FLAG_NO_EXTENSIONS))
                 X509V3_extensions_print(bp, "X509v3 extensions",
                                         ci->extensions, cflag, 8);
 
         if(!(cflag & X509_FLAG_NO_SIGDUMP))
                 {
                 if(X509_signature_print(bp, x->sig_alg, x->signature) <= 0) goto err;
                 }
         if(!(cflag & X509_FLAG_NO_AUX))
                 {
                 if (!X509_CERT_AUX_print(bp, x->aux, 0)) goto err;
                 }
         ret=1;
 err:
-        if (str != NULL) ASN1_STRING_free(str);
         if (m != NULL) OPENSSL_free(m);
         return(ret);
         }
 
 int X509_ocspid_print (BIO *bp, X509 *x)
         {
         unsigned char *der=NULL ;
         unsigned char *dertmp;
         int derlen;
         int i;
@@ skipping 49 matching lines @@
                 {
                 if ((i%18) == 0)
                         if (BIO_write(bp,"\n        ",9) <= 0) return 0;
                         if (BIO_printf(bp,"%02x%s",s[i],
                                 ((i+1) == n)?"":":") <= 0) return 0;
                 }
         if (BIO_write(bp,"\n",1) != 1) return 0;
         return 1;
 }
 
-int ASN1_STRING_print(BIO *bp, ASN1_STRING *v)
+int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
         {
         int i,n;
-        char buf[80],*p;
+        char buf[80];
+        const char *p;
 
         if (v == NULL) return(0);
         n=0;
-        p=(char *)v->data;
+        p=(const char *)v->data;
         for (i=0; i<v->length; i++)
                 {
                 if ((p[i] > '~') || ((p[i] < ' ') &&
                         (p[i] != '\n') && (p[i] != '\r')))
                         buf[n]='.';
                 else
                         buf[n]=p[i];
                 n++;
                 if (n >= 80)
                         {
                         if (BIO_write(bp,buf,n) <= 0)
                                 return(0);
                         n=0;
                         }
                 }
         if (n > 0)
                 if (BIO_write(bp,buf,n) <= 0)
                         return(0);
         return(1);
         }
 
-int ASN1_TIME_print(BIO *bp, ASN1_TIME *tm)
+int ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm)
 {
         if(tm->type == V_ASN1_UTCTIME) return ASN1_UTCTIME_print(bp, tm);
         if(tm->type == V_ASN1_GENERALIZEDTIME)
                                 return ASN1_GENERALIZEDTIME_print(bp, tm);
         BIO_write(bp,"Bad time value",14);
         return(0);
 }
 
 static const char *mon[12]=
     {
     "Jan","Feb","Mar","Apr","May","Jun",
     "Jul","Aug","Sep","Oct","Nov","Dec"
     };
 
-int ASN1_GENERALIZEDTIME_print(BIO *bp, ASN1_GENERALIZEDTIME *tm)
+int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm)
         {
         char *v;
         int gmt=0;
         int i;
         int y=0,M=0,d=0,h=0,m=0,s=0;
         char *f = NULL;
         int f_len = 0;
 
         i=tm->length;
         v=(char *)tm->data;
@@ skipping 27 matching lines @@
         if (BIO_printf(bp,"%s %2d %02d:%02d:%02d%.*s %d%s",
                 mon[M-1],d,h,m,s,f_len,f,y,(gmt)?" GMT":"") <= 0)
                 return(0);
         else
                 return(1);
 err:
         BIO_write(bp,"Bad time value",14);
         return(0);
         }
 
-int ASN1_UTCTIME_print(BIO *bp, ASN1_UTCTIME *tm)
+int ASN1_UTCTIME_print(BIO *bp, const ASN1_UTCTIME *tm)
         {
-        char *v;
+        const char *v;
         int gmt=0;
         int i;
         int y=0,M=0,d=0,h=0,m=0,s=0;
 
         i=tm->length;
-        v=(char *)tm->data;
+        v=(const char *)tm->data;
 
         if (i < 10) goto err;
         if (v[i-1] == 'Z') gmt=1;
         for (i=0; i<10; i++)
                 if ((v[i] > '9') || (v[i] < '0')) goto err;
         y= (v[0]-'0')*10+(v[1]-'0');
         if (y < 50) y+=100;
         M= (v[2]-'0')*10+(v[3]-'0');
         if ((M > 12) || (M < 1)) goto err;
         d= (v[4]-'0')*10+(v[5]-'0');
@@ skipping 66 matching lines @@
         
         ret=1;
         if (0)
                 {
 err:
                 X509err(X509_F_X509_NAME_PRINT,ERR_R_BUF_LIB);
                 }
         OPENSSL_free(b);
         return(ret);
         }