diff options
| author | Matt Caswell <matt@openssl.org> | 2014-11-18 16:54:07 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-12-16 14:17:12 +0000 |
| commit | a38ae11c48761ab468296e8960210f041b93dfde (patch) | |
| tree | 3e1f68b65be6ec5c19343335a25a7c466fd4a1e9 /ssl/ssl_ciph.c | |
| parent | 4ca0e95b92811f7dac9fff213350c248619a135c (diff) | |
Add OPENSSL_NO_ECDH guards
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit af6e2d51bfeabbae827030d4c9d58a8f7477c4a0)
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index d961903d37..b26a57e439 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1420,6 +1420,7 @@ static int check_suiteb_cipher_list(const SSL_METHOD *meth, CERT *c, return 0; } +#ifndef OPENSSL_NO_ECDH switch(suiteb_flags) { case SSL_CERT_FLAG_SUITEB_128_LOS: @@ -1438,6 +1439,10 @@ static int check_suiteb_cipher_list(const SSL_METHOD *meth, CERT *c, /* Set auto ECDH parameter determination */ c->ecdh_tmp_auto = 1; return 1; +#else + SSLerr(SSL_F_CHECK_SUITEB_CIPHER_LIST, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS); + return 0; +#endif } #endif |