diff options
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
-rw-r--r-- | src/lib/libssl/ssl_sess.c | 6 |
1 files changed, 0 insertions, 6 deletions
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) | |||
210 | ss->compress_meth = 0; | 210 | ss->compress_meth = 0; |
211 | ss->tlsext_hostname = NULL; | 211 | ss->tlsext_hostname = NULL; |
212 | 212 | ||
213 | #ifndef OPENSSL_NO_EC | ||
214 | ss->tlsext_ecpointformatlist_length = 0; | 213 | ss->tlsext_ecpointformatlist_length = 0; |
215 | ss->tlsext_ecpointformatlist = NULL; | 214 | ss->tlsext_ecpointformatlist = NULL; |
216 | ss->tlsext_ellipticcurvelist_length = 0; | 215 | ss->tlsext_ellipticcurvelist_length = 0; |
217 | ss->tlsext_ellipticcurvelist = NULL; | 216 | ss->tlsext_ellipticcurvelist = NULL; |
218 | #endif | ||
219 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data); | 217 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data); |
220 | #ifndef OPENSSL_NO_PSK | 218 | #ifndef OPENSSL_NO_PSK |
221 | ss->psk_identity_hint = NULL; | 219 | ss->psk_identity_hint = NULL; |
@@ -359,7 +357,6 @@ ssl_get_new_session(SSL *s, int session) | |||
359 | return 0; | 357 | return 0; |
360 | } | 358 | } |
361 | } | 359 | } |
362 | #ifndef OPENSSL_NO_EC | ||
363 | if (s->tlsext_ecpointformatlist) { | 360 | if (s->tlsext_ecpointformatlist) { |
364 | free(ss->tlsext_ecpointformatlist); | 361 | free(ss->tlsext_ecpointformatlist); |
365 | if ((ss->tlsext_ecpointformatlist = malloc(s->tlsext_ecpointformatlist_length)) == NULL) { | 362 | if ((ss->tlsext_ecpointformatlist = malloc(s->tlsext_ecpointformatlist_length)) == NULL) { |
@@ -380,7 +377,6 @@ ssl_get_new_session(SSL *s, int session) | |||
380 | ss->tlsext_ellipticcurvelist_length = s->tlsext_ellipticcurvelist_length; | 377 | ss->tlsext_ellipticcurvelist_length = s->tlsext_ellipticcurvelist_length; |
381 | memcpy(ss->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist_length); | 378 | memcpy(ss->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist_length); |
382 | } | 379 | } |
383 | #endif | ||
384 | } else { | 380 | } else { |
385 | ss->session_id_length = 0; | 381 | ss->session_id_length = 0; |
386 | } | 382 | } |
@@ -691,12 +687,10 @@ SSL_SESSION_free(SSL_SESSION *ss) | |||
691 | sk_SSL_CIPHER_free(ss->ciphers); | 687 | sk_SSL_CIPHER_free(ss->ciphers); |
692 | free(ss->tlsext_hostname); | 688 | free(ss->tlsext_hostname); |
693 | free(ss->tlsext_tick); | 689 | free(ss->tlsext_tick); |
694 | #ifndef OPENSSL_NO_EC | ||
695 | ss->tlsext_ecpointformatlist_length = 0; | 690 | ss->tlsext_ecpointformatlist_length = 0; |
696 | free(ss->tlsext_ecpointformatlist); | 691 | free(ss->tlsext_ecpointformatlist); |
697 | ss->tlsext_ellipticcurvelist_length = 0; | 692 | ss->tlsext_ellipticcurvelist_length = 0; |
698 | free(ss->tlsext_ellipticcurvelist); | 693 | free(ss->tlsext_ellipticcurvelist); |
699 | #endif /* OPENSSL_NO_EC */ | ||
700 | #ifndef OPENSSL_NO_PSK | 694 | #ifndef OPENSSL_NO_PSK |
701 | free(ss->psk_identity_hint); | 695 | free(ss->psk_identity_hint); |
702 | free(ss->psk_identity); | 696 | free(ss->psk_identity); |