diff options
author | tedu <> | 2014-04-16 20:39:09 +0000 |
---|---|---|
committer | tedu <> | 2014-04-16 20:39:09 +0000 |
commit | e7892d59587f55067ca2e2bc6fa26cf4bcd6c084 (patch) | |
tree | 761d3461cd8f278c74120d2836c29dd21dc95be6 /src/lib/libssl/ssl_sess.c | |
parent | 750d86a4fc04f53024575d65269281ea6c4e450c (diff) | |
download | openbsd-e7892d59587f55067ca2e2bc6fa26cf4bcd6c084.tar.gz openbsd-e7892d59587f55067ca2e2bc6fa26cf4bcd6c084.tar.bz2 openbsd-e7892d59587f55067ca2e2bc6fa26cf4bcd6c084.zip |
add back SRP. i was being too greedy.
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
-rw-r--r-- | src/lib/libssl/ssl_sess.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index 5c5ef4a312..0b1c655820 100644 --- a/src/lib/libssl/ssl_sess.c +++ b/src/lib/libssl/ssl_sess.c | |||
@@ -224,6 +224,9 @@ SSL_SESSION | |||
224 | ss->psk_identity_hint = NULL; | 224 | ss->psk_identity_hint = NULL; |
225 | ss->psk_identity = NULL; | 225 | ss->psk_identity = NULL; |
226 | #endif | 226 | #endif |
227 | #ifndef OPENSSL_NO_SRP | ||
228 | ss->srp_username = NULL; | ||
229 | #endif | ||
227 | return (ss); | 230 | return (ss); |
228 | } | 231 | } |
229 | 232 | ||
@@ -734,6 +737,10 @@ SSL_SESSION_free(SSL_SESSION *ss) | |||
734 | if (ss->psk_identity != NULL) | 737 | if (ss->psk_identity != NULL) |
735 | OPENSSL_free(ss->psk_identity); | 738 | OPENSSL_free(ss->psk_identity); |
736 | #endif | 739 | #endif |
740 | #ifndef OPENSSL_NO_SRP | ||
741 | if (ss->srp_username != NULL) | ||
742 | OPENSSL_free(ss->srp_username); | ||
743 | #endif | ||
737 | OPENSSL_cleanse(ss, sizeof(*ss)); | 744 | OPENSSL_cleanse(ss, sizeof(*ss)); |
738 | OPENSSL_free(ss); | 745 | OPENSSL_free(ss); |
739 | } | 746 | } |