diff options
| author | Matt Caswell <matt@openssl.org> | 2015-02-26 23:52:19 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-02-27 08:57:44 +0000 |
| commit | ea65e92b22d34380c8caa49ac6bb10a55d8d7b0d (patch) | |
| tree | 9bd49fddfde1618bfea69c44ab08631aad79aa6f | |
| parent | f3cc3da4478d00a45371ee3f10f39b4956a11270 (diff) | |
| download | openssl-new-ea65e92b22d34380c8caa49ac6bb10a55d8d7b0d.tar.gz | |
Fix no-ec warning
This is a partial back port of commit 5b430cfc to remove a warning when
compiling with no-ec.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
| -rw-r--r-- | ssl/ssl_lib.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 18ec248f08..dead126184 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2044,14 +2044,17 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) int rsa_enc_export, dh_rsa_export, dh_dsa_export; int rsa_tmp_export, dh_tmp_export, kl; unsigned long mask_k, mask_a, emask_k, emask_a; - int have_ecc_cert, ecdh_ok, ecdsa_ok, ecc_pkey_size; +#ifndef OPENSSL_NO_ECDSA + int have_ecc_cert, ecdsa_ok, ecc_pkey_size; +#endif #ifndef OPENSSL_NO_ECDH - int have_ecdh_tmp; + int have_ecdh_tmp, ecdh_ok; #endif +#ifndef OPENSSL_NO_EC X509 *x = NULL; EVP_PKEY *ecc_pkey = NULL; int signature_nid = 0, pk_nid = 0, md_nid = 0; - +#endif if (c == NULL) return; @@ -2090,7 +2093,9 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) dh_dsa = (cpk->x509 != NULL && cpk->privatekey != NULL); dh_dsa_export = (dh_dsa && EVP_PKEY_size(cpk->privatekey) * 8 <= kl); cpk = &(c->pkeys[SSL_PKEY_ECC]); +#ifndef OPENSSL_NO_EC have_ecc_cert = (cpk->x509 != NULL && cpk->privatekey != NULL); +#endif mask_k = 0; mask_a = 0; emask_k = 0; @@ -2168,6 +2173,7 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) * An ECC certificate may be usable for ECDH and/or ECDSA cipher suites * depending on the key usage extension. */ +#ifndef OPENSSL_NO_EC if (have_ecc_cert) { /* This call populates extension flags (ex_flags) */ x = (c->pkeys[SSL_PKEY_ECC]).x509; @@ -2212,6 +2218,7 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) } #endif } +#endif #ifndef OPENSSL_NO_ECDH if (have_ecdh_tmp) { mask_k |= SSL_kEECDH; |