From f6e83696cca45f0d0392ebe733e48b8bd94ebb47 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 31 May 2014 10:53:39 +0000
Subject: ECDH and ECDSA will not work overly well if there is no EC, so
 unifdef OPENSSL_NO_EC.

ok tedu@
---
 src/lib/libssl/ssl_lib.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/lib/libssl/ssl_lib.c')

diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 262b5a2130..1138ac5a69 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -536,10 +536,8 @@ SSL_free(SSL *s)
 	free(s->tlsext_hostname);
 	if (s->initial_ctx)
 		SSL_CTX_free(s->initial_ctx);
-#ifndef OPENSSL_NO_EC
 	free(s->tlsext_ecpointformatlist);
 	free(s->tlsext_ellipticcurvelist);
-#endif /* OPENSSL_NO_EC */
 	free(s->tlsext_opaque_prf_input);
 	if (s->tlsext_ocsp_exts)
 		sk_X509_EXTENSION_pop_free(s->tlsext_ocsp_exts,
@@ -2120,7 +2118,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
 #define ku_reject(x, usage) \
 	(((x)->ex_flags & EXFLAG_KUSAGE) && !((x)->ex_kusage & (usage)))
 
-#ifndef OPENSSL_NO_EC
 
 int
 ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s)
@@ -2190,7 +2187,6 @@ ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s)
 	/* all checks are ok */
 }
 
-#endif
 
 /* THIS NEEDS CLEANING UP */
 CERT_PKEY *
-- 
cgit v1.2.3-55-g6feb