wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove redundant code

Browse source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-02-17 12:44:30 +00:00
parent 21b80f9a12
commit c7c4625693
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ssl/ssl_lib.c
View file

@ -2505,7 +2505,6 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher)
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
int have_ecc_cert, ecdsa_ok; int have_ecc_cert, ecdsa_ok;
X509 *x = NULL; X509 *x = NULL;
int pk_nid = 0, md_nid = 0;
#endif #endif
if (c == NULL) if (c == NULL)
return; return;
@ -2577,11 +2576,9 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher)
ecdsa_ok = ex_kusage & X509v3_KU_DIGITAL_SIGNATURE; ecdsa_ok = ex_kusage & X509v3_KU_DIGITAL_SIGNATURE;
if (!(pvalid[SSL_PKEY_ECC] & CERT_PKEY_SIGN)) if (!(pvalid[SSL_PKEY_ECC] & CERT_PKEY_SIGN))
ecdsa_ok = 0; 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; mask_a |= SSL_aECDSA;
} }
}
#endif #endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC