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

openssl/crypto/cms/cms_lib.c

 /* crypto/cms/cms_lib.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
 /* ====================================================================
  * Copyright (c) 2008 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 42 matching lines @@
 
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/bio.h>
 #include <openssl/asn1.h>
 #include "cms.h"
 #include "cms_lcl.h"
 
-IMPLEMENT_ASN1_FUNCTIONS_const(CMS_ContentInfo)
+IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo)
+IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
 
 DECLARE_ASN1_ITEM(CMS_CertificateChoices)
 DECLARE_ASN1_ITEM(CMS_RevocationInfoChoice)
 DECLARE_STACK_OF(CMS_CertificateChoices)
 DECLARE_STACK_OF(CMS_RevocationInfoChoice)
 
 const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms)
         {
         return cms->contentType;
         }
@@ skipping 265 matching lines @@
         CMSerr(CMS_F_CMS_SET_DETACHED, ERR_R_MALLOC_FAILURE);
         return 0;
         }
 
 /* Set up an X509_ALGOR DigestAlgorithmIdentifier from an EVP_MD */
 
 void cms_DigestAlgorithm_set(X509_ALGOR *alg, const EVP_MD *md)
         {
         int param_type;
 
-        switch (EVP_MD_type(md))
-                {
-                case NID_sha1:
-                case NID_sha224:
-                case NID_sha256:
-                case NID_sha384:
-                case NID_sha512:
+        if (md->flags & EVP_MD_FLAG_DIGALGID_ABSENT)
                 param_type = V_ASN1_UNDEF;
-                break;
-        
-                default:
+        else
                 param_type = V_ASN1_NULL;
-                break;
-                }
 
         X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL);
 
         }
 
 /* Create a digest BIO from an X509_ALGOR structure */
 
 BIO *cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm)
         {
         BIO *mdbio = NULL;
@@ skipping 181 matching lines @@
         {
         CMS_RevocationInfoChoice *rch;
         rch = CMS_add0_RevocationInfoChoice(cms);
         if (!rch)
                 return 0;
         rch->type = CMS_REVCHOICE_CRL;
         rch->d.crl = crl;
         return 1;
         }
 
+int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl)
+        {
+        int r;
+        r = CMS_add0_crl(cms, crl);
+        if (r > 0)
+                CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL);
+        return r;
+        }
+
 STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms)
         {
         STACK_OF(X509) *certs = NULL;
         CMS_CertificateChoices *cch;
         STACK_OF(CMS_CertificateChoices) **pcerts;
         int i;
         pcerts = cms_get0_certificate_choices(cms);
         if (!pcerts)
                 return NULL;
         for (i = 0; i < sk_CMS_CertificateChoices_num(*pcerts); i++)
@@ skipping 44 matching lines @@
                                 {
                                 sk_X509_CRL_pop_free(crls, X509_CRL_free);
                                 return NULL;
                                 }
                         CRYPTO_add(&rch->d.crl->references,
                                                 1, CRYPTO_LOCK_X509_CRL);
                         }
                 }
         return crls;
         }