[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  c7c4625693e653b7b3cff726cd7946326c720841 (commit)
      from  21b80f9a1246e4af099ed580f1c352ed5bde87cb (commit)


- Log -----------------------------------------------------------------
commit c7c4625693e653b7b3cff726cd7946326c720841
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Feb 17 12:44:30 2016 +0000

    remove redundant code
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_lib.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index a2db43f..05107e8 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