diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_sess.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index b3dd3e6117..af29cfc7ff 100644 --- a/src/lib/libssl/ssl_sess.c +++ b/src/lib/libssl/ssl_sess.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_sess.c,v 1.35 2014/07/10 08:51:15 tedu Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.36 2014/07/11 09:24:44 beck Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -214,10 +214,6 @@ SSL_SESSION_new(void) | |||
| 214 | ss->tlsext_ellipticcurvelist_length = 0; | 214 | ss->tlsext_ellipticcurvelist_length = 0; |
| 215 | ss->tlsext_ellipticcurvelist = NULL; | 215 | ss->tlsext_ellipticcurvelist = NULL; |
| 216 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data); | 216 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_SSL_SESSION, ss, &ss->ex_data); |
| 217 | #ifndef OPENSSL_NO_PSK | ||
| 218 | ss->psk_identity_hint = NULL; | ||
| 219 | ss->psk_identity = NULL; | ||
| 220 | #endif | ||
| 221 | return (ss); | 217 | return (ss); |
| 222 | } | 218 | } |
| 223 | 219 | ||
| @@ -690,10 +686,6 @@ SSL_SESSION_free(SSL_SESSION *ss) | |||
| 690 | free(ss->tlsext_ecpointformatlist); | 686 | free(ss->tlsext_ecpointformatlist); |
| 691 | ss->tlsext_ellipticcurvelist_length = 0; | 687 | ss->tlsext_ellipticcurvelist_length = 0; |
| 692 | free(ss->tlsext_ellipticcurvelist); | 688 | free(ss->tlsext_ellipticcurvelist); |
| 693 | #ifndef OPENSSL_NO_PSK | ||
| 694 | free(ss->psk_identity_hint); | ||
| 695 | free(ss->psk_identity); | ||
| 696 | #endif | ||
| 697 | OPENSSL_cleanse(ss, sizeof(*ss)); | 689 | OPENSSL_cleanse(ss, sizeof(*ss)); |
| 698 | free(ss); | 690 | free(ss); |
| 699 | } | 691 | } |
