diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-06-05 07:09:35 -0700 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-06-05 07:11:23 -0700 |
| commit | a7dd0e51f326dfcc478cc897033e0cd7de62b65d (patch) | |
| tree | 6c24a0058c52178d7f32f7aa91a9f584b8891d9c /deps/openssl/openssl/crypto/cms/cms_smime.c | |
| parent | 715bb7f89f727f0300d68af578450db27c225a10 (diff) | |
| download | android-node-v8-a7dd0e51f326dfcc478cc897033e0cd7de62b65d.tar.gz android-node-v8-a7dd0e51f326dfcc478cc897033e0cd7de62b65d.tar.bz2 android-node-v8-a7dd0e51f326dfcc478cc897033e0cd7de62b65d.zip | |
deps: update openssl to 1.0.1h
Diffstat (limited to 'deps/openssl/openssl/crypto/cms/cms_smime.c')
| -rw-r--r-- | deps/openssl/openssl/crypto/cms/cms_smime.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/deps/openssl/openssl/crypto/cms/cms_smime.c b/deps/openssl/openssl/crypto/cms/cms_smime.c index 8c56e3a852..1af9f3a60f 100644 --- a/deps/openssl/openssl/crypto/cms/cms_smime.c +++ b/deps/openssl/openssl/crypto/cms/cms_smime.c @@ -611,7 +611,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert) STACK_OF(CMS_RecipientInfo) *ris; CMS_RecipientInfo *ri; int i, r; - int debug = 0; + int debug = 0, ri_match = 0; ris = CMS_get0_RecipientInfos(cms); if (ris) debug = cms->d.envelopedData->encryptedContentInfo->debug; @@ -620,6 +620,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert) ri = sk_CMS_RecipientInfo_value(ris, i); if (CMS_RecipientInfo_type(ri) != CMS_RECIPINFO_TRANS) continue; + ri_match = 1; /* If we have a cert try matching RecipientInfo * otherwise try them all. */ @@ -655,7 +656,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert) } } /* If no cert and not debugging always return success */ - if (!cert && !debug) + if (ri_match && !cert && !debug) { ERR_clear_error(); return 1; |