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

openssl/crypto/cms/cms_smime.c

 /* crypto/cms/cms_smime.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 153 matching lines @@
         return r;
         }
 
 CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags)
         {
         CMS_ContentInfo *cms;
         cms = cms_Data_create();
         if (!cms)
                 return NULL;
 
-        if (CMS_final(cms, in, NULL, flags))
+        if ((flags & CMS_STREAM) || CMS_final(cms, in, NULL, flags))
                 return cms;
 
         CMS_ContentInfo_free(cms);
 
         return NULL;
         }
 
 int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
                                                         unsigned int flags)
         {
@@ skipping 22 matching lines @@
                                         unsigned int flags)
         {
         CMS_ContentInfo *cms;
         if (!md)
                 md = EVP_sha1();
         cms = cms_DigestedData_create(md);
         if (!cms)
                 return NULL;
 
         if(!(flags & CMS_DETACHED))
-                {
-                flags &= ~CMS_STREAM;
                 CMS_set_detached(cms, 0);
-                }
 
         if ((flags & CMS_STREAM) || CMS_final(cms, in, NULL, flags))
                 return cms;
 
         CMS_ContentInfo_free(cms);
         return NULL;
         }
 
 int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
                                 const unsigned char *key, size_t keylen,
@@ skipping 31 matching lines @@
                 CMSerr(CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT, CMS_R_NO_CIPHER);
                 return NULL;
                 }
         cms = CMS_ContentInfo_new();
         if (!cms)
                 return NULL;
         if (!CMS_EncryptedData_set1_key(cms, cipher, key, keylen))
                 return NULL;
 
         if(!(flags & CMS_DETACHED))
-                {
-                flags &= ~CMS_STREAM;
                 CMS_set_detached(cms, 0);
-                }
 
         if ((flags & (CMS_STREAM|CMS_PARTIAL))
                 || CMS_final(cms, in, NULL, flags))
                 return cms;
 
         CMS_ContentInfo_free(cms);
         return NULL;
         }
 
 static int cms_signerinfo_verify_cert(CMS_SignerInfo *si,
@@ skipping 163 matching lines @@
                 sk_X509_CRL_pop_free(crls, X509_CRL_free);
 
         return ret;
         }
 
 int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
                         STACK_OF(X509) *certs,
                         X509_STORE *store, unsigned int flags)
         {
         int r;
+        flags &= ~(CMS_DETACHED|CMS_TEXT);
         r = CMS_verify(rcms, certs, store, NULL, NULL, flags);
         if (r <= 0)
                 return r;
         return cms_Receipt_verify(rcms, ocms);
         }
 
 CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
                                                 BIO *data, unsigned int flags)
         {
         CMS_ContentInfo *cms;
@@ skipping 10 matching lines @@
                 }
 
         for (i = 0; i < sk_X509_num(certs); i++)
                 {
                 X509 *x = sk_X509_value(certs, i);
                 if (!CMS_add1_cert(cms, x))
                         goto merr;
                 }
 
         if(!(flags & CMS_DETACHED))
-                {
-                flags &= ~CMS_STREAM;
                 CMS_set_detached(cms, 0);
-                }
 
         if ((flags & (CMS_STREAM|CMS_PARTIAL))
                 || CMS_final(cms, data, NULL, flags))
                 return cms;
         else
                 goto err;
 
         merr:
         CMSerr(CMS_F_CMS_SIGN, ERR_R_MALLOC_FAILURE);
 
         err:
         if (cms)
                 CMS_ContentInfo_free(cms);
         return NULL;
         }
 
 CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
                                         X509 *signcert, EVP_PKEY *pkey,
                                         STACK_OF(X509) *certs,
                                         unsigned int flags)
         {
         CMS_SignerInfo *rct_si;
         CMS_ContentInfo *cms = NULL;
         ASN1_OCTET_STRING **pos, *os;
         BIO *rct_cont = NULL;
         int r = 0;
 
-        flags &= ~CMS_STREAM;
+        flags &= ~(CMS_STREAM|CMS_TEXT);
         /* Not really detached but avoids content being allocated */
         flags |= CMS_PARTIAL|CMS_BINARY|CMS_DETACHED;
         if (!pkey || !signcert)
                 {
                 CMSerr(CMS_F_CMS_SIGN_RECEIPT, CMS_R_NO_KEY_OR_CERT);
                 return NULL;
                 }
 
         /* Initialize signed data */
 
@@ skipping 60 matching lines @@
                 {
                 recip = sk_X509_value(certs, i);
                 if (!CMS_add1_recipient_cert(cms, recip, flags))
                         {
                         CMSerr(CMS_F_CMS_ENCRYPT, CMS_R_RECIPIENT_ERROR);
                         goto err;
                         }
                 }
 
         if(!(flags & CMS_DETACHED))
-                {
-                flags &= ~CMS_STREAM;
                 CMS_set_detached(cms, 0);
-                }
 
         if ((flags & (CMS_STREAM|CMS_PARTIAL))
                 || CMS_final(cms, data, NULL, flags))
                 return cms;
         else
                 goto err;
 
         merr:
         CMSerr(CMS_F_CMS_ENCRYPT, ERR_R_MALLOC_FAILURE);
         err:
@@ skipping 159 matching lines @@
 CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags)
         {
         CMS_ContentInfo *cms;
         if (comp_nid <= 0)
                 comp_nid = NID_zlib_compression;
         cms = cms_CompressedData_create(comp_nid);
         if (!cms)
                 return NULL;
 
         if(!(flags & CMS_DETACHED))
-                {
-                flags &= ~CMS_STREAM;
                 CMS_set_detached(cms, 0);
-                }
 
-        if (CMS_final(cms, in, NULL, flags))
+        if ((flags & CMS_STREAM) || CMS_final(cms, in, NULL, flags))
                 return cms;
 
         CMS_ContentInfo_free(cms);
         return NULL;
         }
 
 #else
 
 int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
                                                         unsigned int flags)
         {
         CMSerr(CMS_F_CMS_UNCOMPRESS, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
         return 0;
         }
 
 CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags)
         {
         CMSerr(CMS_F_CMS_COMPRESS, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
         return NULL;
         }
 
 #endif