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

openssl/apps/x509.c

 /* apps/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 81 matching lines @@
 " -inform arg     - input format - default PEM (one of DER, NET or PEM)\n",
 " -outform arg    - output format - default PEM (one of DER, NET or PEM)\n",
 " -keyform arg    - private key format - default PEM\n",
 " -CAform arg     - CA format - default PEM\n",
 " -CAkeyform arg  - CA key format - default PEM\n",
 " -in arg         - input file - default stdin\n",
 " -out arg        - output file - default stdout\n",
 " -passin arg     - private key password source\n",
 " -serial         - print serial number value\n",
 " -subject_hash   - print subject hash value\n",
+#ifndef OPENSSL_NO_MD5
+" -subject_hash_old   - print old-style (MD5) subject hash value\n",
+#endif
 " -issuer_hash    - print issuer hash value\n",
+#ifndef OPENSSL_NO_MD5
+" -issuer_hash_old    - print old-style (MD5) issuer hash value\n",
+#endif
 " -hash           - synonym for -subject_hash\n",
 " -subject        - print subject DN\n",
 " -issuer         - print issuer DN\n",
 " -email          - print email address(es)\n",
 " -startdate      - notBefore field\n",
 " -enddate        - notAfter field\n",
 " -purpose        - print out certificate purposes\n",
 " -dates          - both Before and After dates\n",
 " -modulus        - print the RSA key modulus\n",
 " -pubkey         - output the public key\n",
@@ skipping 59 matching lines @@
         BIO *out=NULL;
         BIO *STDout=NULL;
         STACK_OF(ASN1_OBJECT) *trust = NULL, *reject = NULL;
         int informat,outformat,keyformat,CAformat,CAkeyformat;
         char *infile=NULL,*outfile=NULL,*keyfile=NULL,*CAfile=NULL;
         char *CAkeyfile=NULL,*CAserial=NULL;
         char *alias=NULL;
         int text=0,serial=0,subject=0,issuer=0,startdate=0,enddate=0;
         int next_serial=0;
         int subject_hash=0,issuer_hash=0,ocspid=0;
+#ifndef OPENSSL_NO_MD5
+        int subject_hash_old=0,issuer_hash_old=0;
+#endif
         int noout=0,sign_flag=0,CA_flag=0,CA_createserial=0,email=0;
         int ocsp_uri=0;
         int trustout=0,clrtrust=0,clrreject=0,aliasout=0,clrext=0;
         int C=0;
         int x509req=0,days=DEF_DAYS,modulus=0,pubkey=0;
         int pprint = 0;
         const char **pp;
         X509_STORE *ctx=NULL;
         X509_REQ *rq=NULL;
         int fingerprint=0;
         char buf[256];
-        const EVP_MD *md_alg,*digest=EVP_sha1();
+        const EVP_MD *md_alg,*digest=NULL;
         CONF *extconf = NULL;
         char *extsect = NULL, *extfile = NULL, *passin = NULL, *passargin = NULL;
         int need_rand = 0;
         int checkend=0,checkoffset=0;
         unsigned long nmflag = 0, certflag = 0;
 #ifndef OPENSSL_NO_ENGINE
         char *engine=NULL;
 #endif
 
         reqfile=0;
@@ skipping 14 matching lines @@
 #endif
 
         informat=FORMAT_PEM;
         outformat=FORMAT_PEM;
         keyformat=FORMAT_PEM;
         CAformat=FORMAT_PEM;
         CAkeyformat=FORMAT_PEM;
 
         ctx=X509_STORE_new();
         if (ctx == NULL) goto end;
-        X509_STORE_set_verify_cb_func(ctx,callb);
+        X509_STORE_set_verify_cb(ctx,callb);
 
         argc--;
         argv++;
         num=0;
         while (argc >= 1)
                 {
                 if      (strcmp(*argv,"-inform") == 0)
                         {
                         if (--argc < 1) goto bad;
                         informat=str2fmt(*(++argv));
@@ skipping 151 matching lines @@
                         modulus= ++num;
                 else if (strcmp(*argv,"-pubkey") == 0)
                         pubkey= ++num;
                 else if (strcmp(*argv,"-x509toreq") == 0)
                         x509req= ++num;
                 else if (strcmp(*argv,"-text") == 0)
                         text= ++num;
                 else if (strcmp(*argv,"-hash") == 0
                         || strcmp(*argv,"-subject_hash") == 0)
                         subject_hash= ++num;
+#ifndef OPENSSL_NO_MD5
+                else if (strcmp(*argv,"-subject_hash_old") == 0)
+                        subject_hash_old= ++num;
+#endif
                 else if (strcmp(*argv,"-issuer_hash") == 0)
                         issuer_hash= ++num;
+#ifndef OPENSSL_NO_MD5
+                else if (strcmp(*argv,"-issuer_hash_old") == 0)
+                        issuer_hash_old= ++num;
+#endif
                 else if (strcmp(*argv,"-subject") == 0)
                         subject= ++num;
                 else if (strcmp(*argv,"-issuer") == 0)
                         issuer= ++num;
                 else if (strcmp(*argv,"-fingerprint") == 0)
                         fingerprint= ++num;
                 else if (strcmp(*argv,"-dates") == 0)
                         {
                         startdate= ++num;
                         enddate= ++num;
@@ skipping 120 matching lines @@
                                                                  extsect);
                         ERR_print_errors(bio_err);
                         goto end;
                         }
                 }
 
 
         if (reqfile)
                 {
                 EVP_PKEY *pkey;
-                X509_CINF *ci;
                 BIO *in;
 
                 if (!sign_flag && !CA_flag)
                         {
                         BIO_printf(bio_err,"We need a private key to sign with\n");
                         goto end;
                         }
                 in=BIO_new(BIO_s_file());
                 if (in == NULL)
                         {
@@ skipping 47 matching lines @@
                         {
                         BIO_printf(bio_err,"Signature did not match the certificate request\n");
                         goto end;
                         }
                 else
                         BIO_printf(bio_err,"Signature ok\n");
 
                 print_name(bio_err, "subject=", X509_REQ_get_subject_name(req), nmflag);
 
                 if ((x=X509_new()) == NULL) goto end;
-                ci=x->cert_info;
 
                 if (sno == NULL)
                         {
                         sno = ASN1_INTEGER_new();
                         if (!sno || !rand_serial(NULL, sno))
                                 goto end;
                         if (!X509_set_serialNumber(x, sno)) 
                                 goto end;
                         ASN1_INTEGER_free(sno);
                         sno = NULL;
                         }
                 else if (!X509_set_serialNumber(x, sno)) 
                         goto end;
 
                 if (!X509_set_issuer_name(x,req->req_info->subject)) goto end;
                 if (!X509_set_subject_name(x,req->req_info->subject)) goto end;
 
                 X509_gmtime_adj(X509_get_notBefore(x),0);
-                X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days);
+                X509_time_adj_ex(X509_get_notAfter(x),days, 0, NULL);
 
                 pkey = X509_REQ_get_pubkey(req);
                 X509_set_pubkey(x,pkey);
                 EVP_PKEY_free(pkey);
                 }
         else
                 x=load_cert(bio_err,infile,informat,NULL,e,"Certificate");
 
         if (x == NULL) goto end;
         if (CA_flag)
@@ skipping 91 matching lines @@
                                 if (!ser)
                                         goto end;
                                 BN_free(bnser);
                                 i2a_ASN1_INTEGER(out, ser);
                                 ASN1_INTEGER_free(ser);
                                 BIO_puts(out, "\n");
                                 }
                         else if ((email == i) || (ocsp_uri == i))
                                 {
                                 int j;
-                                STACK *emlst;
+                                STACK_OF(OPENSSL_STRING) *emlst;
                                 if (email == i)
                                         emlst = X509_get1_email(x);
                                 else
                                         emlst = X509_get1_ocsp(x);
-                                for (j = 0; j < sk_num(emlst); j++)
-                                        BIO_printf(STDout, "%s\n", sk_value(emlst, j));
+                                for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
+                                        BIO_printf(STDout, "%s\n",
+                                                   sk_OPENSSL_STRING_value(emlst, j));
                                 X509_email_free(emlst);
                                 }
                         else if (aliasout == i)
                                 {
                                 unsigned char *alstr;
                                 alstr = X509_alias_get0(x, NULL);
                                 if (alstr) BIO_printf(STDout,"%s\n", alstr);
                                 else BIO_puts(STDout,"<No Alias>\n");
                                 }
                         else if (subject_hash == i)
                                 {
                                 BIO_printf(STDout,"%08lx\n",X509_subject_name_hash(x));
                                 }
+#ifndef OPENSSL_NO_MD5
+                        else if (subject_hash_old == i)
+                                {
+                                BIO_printf(STDout,"%08lx\n",X509_subject_name_hash_old(x));
+                                }
+#endif
                         else if (issuer_hash == i)
                                 {
                                 BIO_printf(STDout,"%08lx\n",X509_issuer_name_hash(x));
                                 }
+#ifndef OPENSSL_NO_MD5
+                        else if (issuer_hash_old == i)
+                                {
+                                BIO_printf(STDout,"%08lx\n",X509_issuer_name_hash_old(x));
+                                }
+#endif
                         else if (pprint == i)
                                 {
                                 X509_PURPOSE *ptmp;
                                 int j;
                                 BIO_printf(STDout, "Certificate purposes:\n");
                                 for (j = 0; j < X509_PURPOSE_get_count(); j++)
                                         {
                                         ptmp = X509_PURPOSE_get0(j);
                                         purpose_print(STDout, x, ptmp);
                                         }
@@ skipping 110 matching lines @@
                                 {
                                 BIO_puts(STDout,"notAfter=");
                                 ASN1_TIME_print(STDout,X509_get_notAfter(x));
                                 BIO_puts(STDout,"\n");
                                 }
                         else if (fingerprint == i)
                                 {
                                 int j;
                                 unsigned int n;
                                 unsigned char md[EVP_MAX_MD_SIZE];
+                                const EVP_MD *fdig = digest;
 
-                                if (!X509_digest(x,digest,md,&n))
+                                if (!fdig)
+                                        fdig = EVP_sha1();
+
+                                if (!X509_digest(x,fdig,md,&n))
                                         {
                                         BIO_printf(bio_err,"out of memory\n");
                                         goto end;
                                         }
                                 BIO_printf(STDout,"%s Fingerprint=",
-                                                OBJ_nid2sn(EVP_MD_type(digest)));
+                                                OBJ_nid2sn(EVP_MD_type(fdig)));
                                 for (j=0; j<(int)n; j++)
                                         {
                                         BIO_printf(STDout,"%02X%c",md[j],
                                                 (j+1 == (int)n)
                                                 ?'\n':':');
                                         }
                                 }
 
                         /* should be in the library */
                         else if ((sign_flag == i) && (x509req == 0))
                                 {
                                 BIO_printf(bio_err,"Getting Private key\n");
                                 if (Upkey == NULL)
                                         {
                                         Upkey=load_key(bio_err,
                                                 keyfile, keyformat, 0,
                                                 passin, e, "Private key");
                                         if (Upkey == NULL) goto end;
                                         }
-#ifndef OPENSSL_NO_DSA
-                                if (Upkey->type == EVP_PKEY_DSA)
-                                        digest=EVP_dss1();
-#endif
-#ifndef OPENSSL_NO_ECDSA
-                                if (Upkey->type == EVP_PKEY_EC)
-                                        digest=EVP_ecdsa();
-#endif
 
                                 assert(need_rand);
                                 if (!sign(x,Upkey,days,clrext,digest,
                                                  extconf, extsect)) goto end;
                                 }
                         else if (CA_flag == i)
                                 {
                                 BIO_printf(bio_err,"Getting CA Private Key\n");
                                 if (CAkeyfile != NULL)
                                         {
                                         CApkey=load_key(bio_err,
                                                 CAkeyfile, CAkeyformat,
                                                 0, passin, e,
                                                 "CA Private Key");
                                         if (CApkey == NULL) goto end;
                                         }
-#ifndef OPENSSL_NO_DSA
-                                if (CApkey->type == EVP_PKEY_DSA)
-                                        digest=EVP_dss1();
-#endif
-#ifndef OPENSSL_NO_ECDSA
-                                if (CApkey->type == EVP_PKEY_EC)
-                                        digest = EVP_ecdsa();
-#endif
                                 
                                 assert(need_rand);
                                 if (!x509_certify(ctx,CAfile,digest,x,xca,
                                         CApkey, CAserial,CA_createserial,days, clrext,
                                         extconf, extsect, sno))
                                         goto end;
                                 }
                         else if (x509req == i)
                                 {
                                 EVP_PKEY *pk;
 
                                 BIO_printf(bio_err,"Getting request Private Key\n");
                                 if (keyfile == NULL)
                                         {
                                         BIO_printf(bio_err,"no request key file specified\n");
                                         goto end;
                                         }
                                 else
                                         {
                                         pk=load_key(bio_err,
-                                                keyfile, FORMAT_PEM, 0,
+                                                keyfile, keyformat, 0,
                                                 passin, e, "request key");
                                         if (pk == NULL) goto end;
                                         }
 
                                 BIO_printf(bio_err,"Generating certificate request\n");
 
-#ifndef OPENSSL_NO_DSA
-                                if (pk->type == EVP_PKEY_DSA)
-                                        digest=EVP_dss1();
-#endif
-#ifndef OPENSSL_NO_ECDSA
-                                if (pk->type == EVP_PKEY_EC)
-                                        digest=EVP_ecdsa();
-#endif
-
                                 rq=X509_to_X509_REQ(x,pk,digest);
                                 EVP_PKEY_free(pk);
                                 if (rq == NULL)
                                         {
                                         ERR_print_errors(bio_err);
                                         goto end;
                                         }
                                 if (!noout)
                                         {
                                         X509_REQ_print(out,rq);
@@ skipping 33 matching lines @@
 
         if      (outformat == FORMAT_ASN1)
                 i=i2d_X509_bio(out,x);
         else if (outformat == FORMAT_PEM)
                 {
                 if (trustout) i=PEM_write_bio_X509_AUX(out,x);
                 else i=PEM_write_bio_X509(out,x);
                 }
         else if (outformat == FORMAT_NETSCAPE)
                 {
-                ASN1_HEADER ah;
-                ASN1_OCTET_STRING os;
+                NETSCAPE_X509 nx;
+                ASN1_OCTET_STRING hdr;
 
-                os.data=(unsigned char *)NETSCAPE_CERT_HDR;
-                os.length=strlen(NETSCAPE_CERT_HDR);
-                ah.header= &os;
-                ah.data=(char *)x;
-                ah.meth=X509_asn1_meth();
+                hdr.data=(unsigned char *)NETSCAPE_CERT_HDR;
+                hdr.length=strlen(NETSCAPE_CERT_HDR);
+                nx.header= &hdr;
+                nx.cert=x;
 
-                i=ASN1_i2d_bio_of(ASN1_HEADER,i2d_ASN1_HEADER,out,&ah);
+                i=ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509),out,&nx);
                 }
         else    {
                 BIO_printf(bio_err,"bad output format specified for outfile\n");
                 goto end;
                 }
         if (!i)
                 {
                 BIO_printf(bio_err,"unable to write certificate\n");
                 ERR_print_errors(bio_err);
                 goto end;
@@ skipping 98 matching lines @@
                 goto end;
                 }
 
         if (!X509_set_issuer_name(x,X509_get_subject_name(xca))) goto end;
         if (!X509_set_serialNumber(x,bs)) goto end;
 
         if (X509_gmtime_adj(X509_get_notBefore(x),0L) == NULL)
                 goto end;
 
         /* hardwired expired */
-        if (X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days) == NULL)
+        if (X509_time_adj_ex(X509_get_notAfter(x),days, 0, NULL) == NULL)
                 goto end;
 
         if (clrext)
                 {
                 while (X509_get_ext_count(x) > 0) X509_delete_ext(x, 0);
                 }
 
         if (conf)
                 {
                 X509V3_CTX ctx2;
@@ skipping 95 matching lines @@
         for (i = 0; i < 2; i++)
                 {
                 idret = X509_check_purpose(cert, id, i);
                 BIO_printf(bio, "%s%s : ", pname, i ? " CA" : ""); 
                 if (idret == 1) BIO_printf(bio, "Yes\n");
                 else if (idret == 0) BIO_printf(bio, "No\n");
                 else BIO_printf(bio, "Yes (WARNING code=%d)\n", idret);
                 }
         return 1;
 }