diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-10 17:30:02 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-12 15:57:24 +1000 |
| commit | 0f0b7dfbe5740da9e3fdf4753f8fb56301af13b7 (patch) | |
| tree | c869849d673b59df3d5f640e60b1d40dca6e6b84 /crypto/pkcs7 | |
| parent | 6e417f951c64f4643cdc62c370badf46d5fe485e (diff) | |
Fix coverity issue: CID 1466484 - Remove dead code in PKCS7_dataInit()
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12847)
Diffstat (limited to 'crypto/pkcs7')
| -rw-r--r-- | crypto/pkcs7/pk7_doit.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 6a7af7826d..c48c629398 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -316,17 +316,12 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) fetched_cipher = EVP_CIPHER_fetch(p7_ctx->libctx, EVP_CIPHER_name(evp_cipher), p7_ctx->propq); + (void)ERR_pop_to_mark(); if (fetched_cipher != NULL) cipher = fetched_cipher; else cipher = evp_cipher; - if (cipher == NULL) { - (void)ERR_clear_last_mark(); - goto err; - } - (void)ERR_pop_to_mark(); - if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, 1) <= 0) goto err; |