generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings about unused variables when EC is disabled.

Browse Source 
Reviewed-by: Stephen Henson <steve@openssl.org>
This commit is contained in:
Richard Levitte 2015-12-09 23:59:04 +01:00
parent f8d3ab4928
commit 60f43e9e4d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssl/ssl_lib.c
View File

@ -2001,7 +2001,9 @@ void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg)
void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher) void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher)
{ {
#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_GOST)
CERT_PKEY *cpk; CERT_PKEY *cpk;
#endif
CERT *c = s->cert; CERT *c = s->cert;
uint32_t *pvalid = s->s3->tmp.valid_flags; uint32_t *pvalid = s->s3->tmp.valid_flags;
int rsa_enc, rsa_sign, dh_tmp, dh_rsa, dh_dsa, dsa_sign; int rsa_enc, rsa_sign, dh_tmp, dh_rsa, dh_dsa, dsa_sign;
@ -2021,17 +2023,11 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher)
dh_tmp = 0; dh_tmp = 0;
#endif #endif
cpk = &(c->pkeys[SSL_PKEY_RSA_ENC]);
rsa_enc = pvalid[SSL_PKEY_RSA_ENC] & CERT_PKEY_VALID; rsa_enc = pvalid[SSL_PKEY_RSA_ENC] & CERT_PKEY_VALID;
cpk = &(c->pkeys[SSL_PKEY_RSA_SIGN]);
rsa_sign = pvalid[SSL_PKEY_RSA_SIGN] & CERT_PKEY_SIGN; rsa_sign = pvalid[SSL_PKEY_RSA_SIGN] & CERT_PKEY_SIGN;
cpk = &(c->pkeys[SSL_PKEY_DSA_SIGN]);
dsa_sign = pvalid[SSL_PKEY_DSA_SIGN] & CERT_PKEY_SIGN; dsa_sign = pvalid[SSL_PKEY_DSA_SIGN] & CERT_PKEY_SIGN;
cpk = &(c->pkeys[SSL_PKEY_DH_RSA]);
dh_rsa = pvalid[SSL_PKEY_DH_RSA] & CERT_PKEY_VALID; dh_rsa = pvalid[SSL_PKEY_DH_RSA] & CERT_PKEY_VALID;
cpk = &(c->pkeys[SSL_PKEY_DH_DSA]);
dh_dsa = pvalid[SSL_PKEY_DH_DSA] & CERT_PKEY_VALID; dh_dsa = pvalid[SSL_PKEY_DH_DSA] & CERT_PKEY_VALID;
cpk = &(c->pkeys[SSL_PKEY_ECC]);
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
have_ecc_cert = pvalid[SSL_PKEY_ECC] & CERT_PKEY_VALID; have_ecc_cert = pvalid[SSL_PKEY_ECC] & CERT_PKEY_VALID;
#endif #endif

7
ssl/statem/statem_clnt.c
View File

@ -3101,7 +3101,10 @@ int tls_construct_client_certificate(SSL *s)
int ssl3_check_cert_and_algorithm(SSL *s) int ssl3_check_cert_and_algorithm(SSL *s)
{ {
int i, idx; int i;
#ifndef OPENSSL_NO_EC
int idx;
#endif
long alg_k, alg_a; long alg_k, alg_a;
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
#ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_DH
@ -3121,8 +3124,8 @@ int ssl3_check_cert_and_algorithm(SSL *s)
/* This is the passed certificate */ /* This is the passed certificate */
idx = s->session->peer_type;
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
idx = s->session->peer_type;
if (idx == SSL_PKEY_ECC) { if (idx == SSL_PKEY_ECC) {
if (ssl_check_srvr_ecc_cert_and_alg(s->session->peer, s) == 0) { if (ssl_check_srvr_ecc_cert_and_alg(s->session->peer, s) == 0) {
/* check failed */ /* check failed */