summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_lib.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-06-12 13:30:21 +0100
committerMatt Caswell <matt@openssl.org>2017-06-21 14:45:35 +0100
commit9368f86526d9feb1f511fab9c0eee8e8dc869b87 (patch)
treeb10c253f6a3f118a4009ecfc3120cfec403d2d54 /ssl/ssl_lib.c
parent3a7c56b2c0e6680e4ad3d83387a970110efdf1ba (diff)
Add TLSv1.3 client side external PSK support
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3670)
Diffstat (limited to 'ssl/ssl_lib.c')
-rw-r--r--ssl/ssl_lib.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index a46ede1414..4bcbfa8377 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -419,6 +419,8 @@ int SSL_clear(SSL *s)
SSL_SESSION_free(s->session);
s->session = NULL;
}
+ SSL_SESSION_free(s->psksession);
+ s->psksession = NULL;
s->error = 0;
s->hit = 0;
@@ -969,6 +971,7 @@ void SSL_free(SSL *s)
ssl_clear_bad_session(s);
SSL_SESSION_free(s->session);
}
+ SSL_SESSION_free(s->psksession);
clear_ciphers(s);