Commit 5a3d24ad authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Only reset the ctx when a cipher is given 



This restores the 1.0.2 behaviour

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarBenjamin Kaduk <bkaduk@akamai.com>
GH: #4613
(cherry picked from commit ffd23209)
parent 257a03cc

crypto/evp/evp_enc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) 
int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,

int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,

                   const unsigned char *key, const unsigned char *iv, int enc)

                   const unsigned char *key, const unsigned char *iv, int enc)

{

{

    if (cipher != NULL)

        EVP_CIPHER_CTX_reset(ctx);

        EVP_CIPHER_CTX_reset(ctx);

    return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc);

    return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc);

}

}