From a7f9e0a45f5f35a5fe318461aa03b4afe944af74 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 16 May 2016 14:56:53 +0100 Subject: [PATCH] Remove an unneccessary check of cipher Due to short-circuiting we only need to check "cipher" for NULL once. PR#699 Reviewed-by: Richard Levitte --- crypto/evp/evp_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index e02e801949..ad64a74bb4 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -120,7 +120,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, * reinitialisation, when it may all be unnecessary. */ if (ctx->engine && ctx->cipher - && (!cipher || (cipher && (cipher->nid == ctx->cipher->nid)))) + && (cipher == NULL || cipher->nid == ctx->cipher->nid)) goto skip_to_init; #endif if (cipher) { -- 2.25.1