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

openssl/crypto/ocsp/ocsp_ext.c

 /* ocsp_ext.c */
 /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
  * project. */
 
 /* History:
    This file was transfered to Richard Levitte from CertCo by Kathy
    Weinhold in mid-spring 2000 to be included in OpenSSL or released
    as a patch kit. */
 
 /* ====================================================================
@@ skipping 246 matching lines @@
         {
         return X509V3_add1_i2d(&x->singleExtensions, nid, value, crit, flags);
         }
 
 int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc)
         {
         return(X509v3_add_ext(&(x->singleExtensions),ex,loc) != NULL);
         }
 
 /* also CRL Entry Extensions */
-
+#if 0
 ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
                                 void *data, STACK_OF(ASN1_OBJECT) *sk)
         {
         int i;
         unsigned char *p, *b = NULL;
 
         if (data)
                 {
                 if ((i=i2d(data,NULL)) <= 0) goto err;
                 if (!(b=p=OPENSSL_malloc((unsigned int)i)))
@@ skipping 20 matching lines @@
                 goto err;
                 }
         if (!s && !(s = ASN1_STRING_new())) goto err;
         if (!(ASN1_STRING_set(s, b, i))) goto err;
         OPENSSL_free(b);
         return s;
 err:
         if (b) OPENSSL_free(b);
         return NULL;
         }
+#endif
 
 /* Nonce handling functions */
 
 /* Add a nonce to an extension stack. A nonce can be specificed or if NULL
  * a random nonce will be generated.
  * Note: OpenSSL 0.9.7d and later create an OCTET STRING containing the 
  * nonce, previous versions used the raw nonce.
  */
 
 static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts, unsigned char *val, int len)
@@ skipping 117 matching lines @@
                 {
                 if (!(cid->crlNum = ASN1_INTEGER_new())) goto err;
                 if (!(ASN1_INTEGER_set(cid->crlNum, *n))) goto err;
                 }
         if (tim)
                 {
                 if (!(cid->crlTime = ASN1_GENERALIZEDTIME_new())) goto err;
                 if (!(ASN1_GENERALIZEDTIME_set_string(cid->crlTime, tim))) 
                         goto err;
                 }
-        if (!(x = X509_EXTENSION_new())) goto err;
-        if (!(x->object = OBJ_nid2obj(NID_id_pkix_OCSP_CrlID))) goto err;
-        if (!(ASN1_STRING_encode_of(OCSP_CRLID,x->value,i2d_OCSP_CRLID,cid,
-                                    NULL)))
-                goto err;
-        OCSP_CRLID_free(cid);
+        x = X509V3_EXT_i2d(NID_id_pkix_OCSP_CrlID, 0, cid);
+err:
+        if (cid) OCSP_CRLID_free(cid);
         return x;
-err:
-        if (x) X509_EXTENSION_free(x);
-        if (cid) OCSP_CRLID_free(cid);
-        return NULL;
         }
 
 /*   AcceptableResponses ::= SEQUENCE OF OBJECT IDENTIFIER */
 X509_EXTENSION *OCSP_accept_responses_new(char **oids)
         {
         int nid;
         STACK_OF(ASN1_OBJECT) *sk = NULL;
         ASN1_OBJECT *o = NULL;
         X509_EXTENSION *x = NULL;
 
         if (!(sk = sk_ASN1_OBJECT_new_null())) goto err;
         while (oids && *oids)
                 {
                 if ((nid=OBJ_txt2nid(*oids))!=NID_undef&&(o=OBJ_nid2obj(nid))) 
                         sk_ASN1_OBJECT_push(sk, o);
                 oids++;
                 }
-        if (!(x = X509_EXTENSION_new())) goto err;
-        if (!(x->object = OBJ_nid2obj(NID_id_pkix_OCSP_acceptableResponses)))
-                goto err;
-        if (!(ASN1_STRING_encode_of(ASN1_OBJECT,x->value,i2d_ASN1_OBJECT,NULL,
-                                    sk)))
-                goto err;
-        sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
+        x = X509V3_EXT_i2d(NID_id_pkix_OCSP_acceptableResponses, 0, sk);
+err:
+        if (sk) sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
         return x;
-err:
-        if (x) X509_EXTENSION_free(x);
-        if (sk) sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
-        return NULL;
         }
 
 /*  ArchiveCutoff ::= GeneralizedTime */
 X509_EXTENSION *OCSP_archive_cutoff_new(char* tim)
         {
         X509_EXTENSION *x=NULL;
         ASN1_GENERALIZEDTIME *gt = NULL;
 
         if (!(gt = ASN1_GENERALIZEDTIME_new())) goto err;
         if (!(ASN1_GENERALIZEDTIME_set_string(gt, tim))) goto err;
-        if (!(x = X509_EXTENSION_new())) goto err;
-        if (!(x->object=OBJ_nid2obj(NID_id_pkix_OCSP_archiveCutoff)))goto err;
-        if (!(ASN1_STRING_encode_of(ASN1_GENERALIZEDTIME,x->value,
-                                    i2d_ASN1_GENERALIZEDTIME,gt,NULL))) goto err;
-        ASN1_GENERALIZEDTIME_free(gt);
-        return x;
+        x = X509V3_EXT_i2d(NID_id_pkix_OCSP_archiveCutoff, 0, gt);
 err:
         if (gt) ASN1_GENERALIZEDTIME_free(gt);
-        if (x) X509_EXTENSION_free(x);
-        return NULL;
+        return x;
         }
 
 /* per ACCESS_DESCRIPTION parameter are oids, of which there are currently
  * two--NID_ad_ocsp, NID_id_ad_caIssuers--and GeneralName value.  This
  * method forces NID_ad_ocsp and uniformResourceLocator [6] IA5String.
  */
 X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME* issuer, char **urls)
         {
         X509_EXTENSION *x = NULL;
         ASN1_IA5STRING *ia5 = NULL;
         OCSP_SERVICELOC *sloc = NULL;
         ACCESS_DESCRIPTION *ad = NULL;
         
         if (!(sloc = OCSP_SERVICELOC_new())) goto err;
         if (!(sloc->issuer = X509_NAME_dup(issuer))) goto err;
         if (urls && *urls && !(sloc->locator = sk_ACCESS_DESCRIPTION_new_null())) goto err;
         while (urls && *urls)
                 {
                 if (!(ad = ACCESS_DESCRIPTION_new())) goto err;
                 if (!(ad->method=OBJ_nid2obj(NID_ad_OCSP))) goto err;
                 if (!(ad->location = GENERAL_NAME_new())) goto err;
                 if (!(ia5 = ASN1_IA5STRING_new())) goto err;
                 if (!ASN1_STRING_set((ASN1_STRING*)ia5, *urls, -1)) goto err;
                 ad->location->type = GEN_URI;
                 ad->location->d.ia5 = ia5;
                 if (!sk_ACCESS_DESCRIPTION_push(sloc->locator, ad)) goto err;
                 urls++;
                 }
-        if (!(x = X509_EXTENSION_new())) goto err;
-        if (!(x->object = OBJ_nid2obj(NID_id_pkix_OCSP_serviceLocator))) 
-                goto err;
-        if (!(ASN1_STRING_encode_of(OCSP_SERVICELOC,x->value,
-                                    i2d_OCSP_SERVICELOC,sloc,NULL))) goto err;
-        OCSP_SERVICELOC_free(sloc);
+        x = X509V3_EXT_i2d(NID_id_pkix_OCSP_serviceLocator, 0, sloc);
+err:
+        if (sloc) OCSP_SERVICELOC_free(sloc);
         return x;
-err:
-        if (x) X509_EXTENSION_free(x);
-        if (sloc) OCSP_SERVICELOC_free(sloc);
-        return NULL;
         }