diff options
| author | Tomas Mraz <tomas@openssl.org> | 2023-01-18 18:07:55 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-02-07 17:05:10 +0100 |
| commit | 35da6af1f82e3d02338aabe28cab744a63728fd8 (patch) | |
| tree | 01c8439a8ec853b7ba47cfc0b1b9e91750a947be | |
| parent | c47b6fe9e6c014df009c55221b6c08391c361ba6 (diff) | |
Support signedAndEnveloped content in PKCS7_decrypt()
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index a635e4ddce..5b7b8e26ba 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -481,7 +481,8 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) return 0; } - if (!PKCS7_type_is_enveloped(p7)) { + if (!PKCS7_type_is_enveloped(p7) + && !PKCS7_type_is_signedAndEnveloped(p7)) { ERR_raise(ERR_LIB_PKCS7, PKCS7_R_WRONG_CONTENT_TYPE); return 0; } |