From ffd23209933ea0ad5543f15ca6303d63d8dac826 Mon Sep 17 00:00:00 2001 From: Kurt Roeckx Date: Sun, 29 Oct 2017 15:13:43 +0100 Subject: [PATCH] Only reset the ctx when a cipher is given This restores the 1.0.2 behaviour Reviewed-by: Rich Salz Reviewed-by: Benjamin Kaduk GH: #4613 --- crypto/evp/evp_enc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index d353084a9a..f89cff6f60 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -50,7 +50,8 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, const unsigned char *key, const unsigned char *iv, int enc) { - EVP_CIPHER_CTX_reset(ctx); + if (cipher != NULL) + EVP_CIPHER_CTX_reset(ctx); return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc); } -- 2.25.1