From: Matt Caswell <matt@openssl.org>
Date: Mon, 16 May 2016 13:56:53 +0000 (+0100)
Subject: Remove an unneccessary check of cipher
X-Git-Tag: OpenSSL_1_1_0-pre6~816
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a7f9e0a45f5f35a5fe318461aa03b4afe944af74;p=oweals%2Fopenssl.git

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 <levitte@openssl.org>
---

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) {