diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-09-26 09:46:26 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-09-26 09:46:26 +0200 |
| commit | 394451dbae3e71282611058e00b5fd16c865f147 (patch) | |
| tree | 17b71034d9350a2848603f5edf0a8b13025909be /app/openssl/crypto/cms/cms_smime.c | |
| parent | 644fd02cf8da95b0b5a99fb9f2142628dd27f7c2 (diff) | |
Revert "Updated native subprojects from ics-openvpn."
This reverts commit d0e7ba3029b2fd42582413aa95773fe7dbdede90.
I'll postpone this work for the next cycle, it's not trivial because it doesn't link properly.
Diffstat (limited to 'app/openssl/crypto/cms/cms_smime.c')
| -rw-r--r-- | app/openssl/crypto/cms/cms_smime.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/openssl/crypto/cms/cms_smime.c b/app/openssl/crypto/cms/cms_smime.c index 1af9f3a6..8c56e3a8 100644 --- a/app/openssl/crypto/cms/cms_smime.c +++ b/app/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, ri_match = 0; + int debug = 0; ris = CMS_get0_RecipientInfos(cms); if (ris) debug = cms->d.envelopedData->encryptedContentInfo->debug; @@ -620,7 +620,6 @@ 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. */ @@ -656,7 +655,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert) } } /* If no cert and not debugging always return success */ - if (ri_match && !cert && !debug) + if (!cert && !debug) { ERR_clear_error(); return 1; |