From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 17 Feb 2016 12:44:30 +0000 (+0000)
Subject: remove redundant code
X-Git-Tag: OpenSSL_1_1_0-pre4~639
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c7c4625693e653b7b3cff726cd7946326c720841;p=oweals%2Fopenssl.git

remove redundant code

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

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index a2db43f49e..05107e8e5c 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2505,7 +2505,6 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher)
 #ifndef OPENSSL_NO_EC
     int have_ecc_cert, ecdsa_ok;
     X509 *x = NULL;
-    int pk_nid = 0, md_nid = 0;
 #endif
     if (c == NULL)
         return;
@@ -2577,10 +2576,8 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher)
         ecdsa_ok = ex_kusage & X509v3_KU_DIGITAL_SIGNATURE;
         if (!(pvalid[SSL_PKEY_ECC] & CERT_PKEY_SIGN))
             ecdsa_ok = 0;
-        OBJ_find_sigid_algs(X509_get_signature_nid(x), &md_nid, &pk_nid);
-        if (ecdsa_ok) {
+        if (ecdsa_ok)
             mask_a |= SSL_aECDSA;
-        }
     }
 #endif