From: Viktor Dukhovni <openssl-users@dukhovni.org>
Date: Fri, 29 Apr 2016 20:36:32 +0000 (-0400)
Subject: Drop duplicate  ctx->verify_cb assignment
X-Git-Tag: OpenSSL_1_1_0-pre6~945
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7b7eb4725ead9440e5f68c999e0792098ea82239;p=oweals%2Fopenssl.git

Drop duplicate  ctx->verify_cb assignment

The right variant is ~18 lines below.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 2b17b29f1d..6fc08c4a26 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -2171,11 +2171,10 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
     /* Zero ex_data to make sure we're cleanup-safe */
     memset(&ctx->ex_data, 0, sizeof(ctx->ex_data));
 
-    if (store) {
-        ctx->verify_cb = store->verify_cb;
-        /* Seems to always be 0 in OpenSSL, else must be idempotent */
+    /* store->cleanup is always 0 in OpenSSL, if set must be idempotent */
+    if (store)
         ctx->cleanup = store->cleanup;
-    } else
+    else
         ctx->cleanup = 0;
 
     if (store && store->check_issued)