diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-09 23:59:04 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-12-09 23:59:04 +0100 |
| commit | 60f43e9e4d883394c9cf601f667d5d188fe84308 (patch) | |
| tree | 4c8b3889a49063fc03b7a1e6ffdd0b639dd3b6d1 | |
| parent | f8d3ab49283ef6fa760da8b69aa5dfc4e83b0f01 (diff) | |
Fix warnings about unused variables when EC is disabled.
Reviewed-by: Stephen Henson <steve@openssl.org>
| -rw-r--r-- | ssl/ssl_lib.c | 8 | ||||
| -rw-r--r-- | ssl/statem/statem_clnt.c | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 3ca7c3ffa6..e9da27e90a 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -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) { +#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_GOST) CERT_PKEY *cpk; +#endif CERT *c = s->cert; uint32_t *pvalid = s->s3->tmp.valid_flags; 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; #endif - cpk = &(c->pkeys[SSL_PKEY_RSA_ENC]); 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; - cpk = &(c->pkeys[SSL_PKEY_DSA_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; - cpk = &(c->pkeys[SSL_PKEY_DH_DSA]); dh_dsa = pvalid[SSL_PKEY_DH_DSA] & CERT_PKEY_VALID; - cpk = &(c->pkeys[SSL_PKEY_ECC]); #ifndef OPENSSL_NO_EC have_ecc_cert = pvalid[SSL_PKEY_ECC] & CERT_PKEY_VALID; #endif diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 60c0983def..7c98228b42 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -3101,7 +3101,10 @@ int tls_construct_client_certificate(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; EVP_PKEY *pkey = NULL; #ifndef OPENSSL_NO_DH @@ -3121,8 +3124,8 @@ int ssl3_check_cert_and_algorithm(SSL *s) /* This is the passed certificate */ - idx = s->session->peer_type; #ifndef OPENSSL_NO_EC + idx = s->session->peer_type; if (idx == SSL_PKEY_ECC) { if (ssl_check_srvr_ecc_cert_and_alg(s->session->peer, s) == 0) { /* check failed */ |