From 5b430cfc441e7e442199ccfaefb99af2b13dc44e Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 17 Aug 2013 17:40:08 +0100 Subject: Make no-ec compilation work. (cherry picked from commit 14536c8c9c0abb894afcadb9a58b4b29fc8f7a4d) --- ssl/ssl_ciph.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ssl/ssl_ciph.c') diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 4d87d2dbc4..7c649109ec 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1350,7 +1350,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str, return(retval); } - +#ifndef OPENSSL_NO_EC static int check_suiteb_cipher_list(const SSL_METHOD *meth, CERT *c, const char **prule_str) { @@ -1405,6 +1405,7 @@ static int check_suiteb_cipher_list(const SSL_METHOD *meth, CERT *c, c->ecdh_tmp_auto = 1; return 1; } +#endif STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, @@ -1424,10 +1425,10 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, */ if (rule_str == NULL || cipher_list == NULL || cipher_list_by_id == NULL) return NULL; - +#ifndef OPENSSL_NO_EC if (!check_suiteb_cipher_list(ssl_method, c, &rule_str)) return NULL; - +#endif /* * To reduce the work to do we only want to process the compiled -- cgit v1.2.3