summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_sess.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-02-24 12:45:37 +0000
committerMatt Caswell <matt@openssl.org>2017-03-02 17:44:15 +0000
commitf637004037a11bc04682f54571e3ff11d48d8e36 (patch)
tree8a8e9d34511fd8800c054e9ee24ff7e4d45813be /ssl/ssl_sess.c
parenta832b5ef7a6080a6a66d1135c80c9aaf5570fc02 (diff)
Only accept early_data if the negotiated ALPN is the same
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2737)
Diffstat (limited to 'ssl/ssl_sess.c')
-rw-r--r--ssl/ssl_sess.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index be3c4c3526..cc9eeadc12 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -791,6 +791,7 @@ void SSL_SESSION_free(SSL_SESSION *ss)
#ifndef OPENSSL_NO_SRP
OPENSSL_free(ss->srp_username);
#endif
+ OPENSSL_free(ss->ext.alpn_selected);
CRYPTO_THREAD_lock_free(ss->lock);
OPENSSL_clear_free(ss, sizeof(*ss));
}