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_sess.c | 6 ------
 1 file changed, 6 deletions(-)

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

diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index de133a72ca..2900490ad2 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -210,12 +210,10 @@ SSL_SESSION_new(void)
 	ss->compress_meth = 0;
 	ss->tlsext_hostname = NULL;
 
-#ifndef OPENSSL_NO_EC
 	ss->tlsext_ecpointformatlist_length = 0;
 	ss->tlsext_ecpointformatlist = NULL;
 	ss->tlsext_ellipticcurvelist_length = 0;
 	ss->tlsext_ellipticcurvelist = NULL;
-#endif
 	CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data);
 #ifndef OPENSSL_NO_PSK
 	ss->psk_identity_hint = NULL;
@@ -359,7 +357,6 @@ ssl_get_new_session(SSL *s, int session)
 				return 0;
 			}
 		}
-#ifndef OPENSSL_NO_EC
 		if (s->tlsext_ecpointformatlist) {
 			free(ss->tlsext_ecpointformatlist);
 			if ((ss->tlsext_ecpointformatlist = malloc(s->tlsext_ecpointformatlist_length)) == NULL) {
@@ -380,7 +377,6 @@ ssl_get_new_session(SSL *s, int session)
 			ss->tlsext_ellipticcurvelist_length = s->tlsext_ellipticcurvelist_length;
 			memcpy(ss->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist_length);
 		}
-#endif
 	} else {
 		ss->session_id_length = 0;
 	}
@@ -691,12 +687,10 @@ SSL_SESSION_free(SSL_SESSION *ss)
 		sk_SSL_CIPHER_free(ss->ciphers);
 	free(ss->tlsext_hostname);
 	free(ss->tlsext_tick);
-#ifndef OPENSSL_NO_EC
 	ss->tlsext_ecpointformatlist_length = 0;
 	free(ss->tlsext_ecpointformatlist);
 	ss->tlsext_ellipticcurvelist_length = 0;
 	free(ss->tlsext_ellipticcurvelist);
-#endif /* OPENSSL_NO_EC */
 #ifndef OPENSSL_NO_PSK
 	free(ss->psk_identity_hint);
 	free(ss->psk_identity);
-- 
cgit v1.2.3-55-g6feb