diff options
| author | Matt Caswell <matt@openssl.org> | 2018-06-05 13:23:28 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-06-07 11:58:35 +0200 |
| commit | 6cf2dbd9faffbed52a6bede924fe0a93345b8bfa (patch) | |
| tree | 81f0b2d8235ed72960672ff1663582c6367e4ff8 /ssl/ssl_sess.c | |
| parent | Fix TLSv1.3 ticket nonces (diff) | |
| download | openssl-6cf2dbd9faffbed52a6bede924fe0a93345b8bfa.tar.xz openssl-6cf2dbd9faffbed52a6bede924fe0a93345b8bfa.zip | |
Don't store the ticket nonce in the session
We generate the secrets based on the nonce immediately so there is no
need to keep the nonce.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6415)
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 52ec670787..525edb3289 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -133,7 +133,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) #endif dest->peer_chain = NULL; dest->peer = NULL; - dest->ext.tick_nonce = NULL; dest->ticket_appdata = NULL; memset(&dest->ex_data, 0, sizeof(dest->ex_data)); @@ -230,13 +229,6 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) } } - if (src->ext.tick_nonce != NULL) { - dest->ext.tick_nonce = OPENSSL_memdup(src->ext.tick_nonce, - src->ext.tick_nonce_len); - if (dest->ext.tick_nonce == NULL) - goto err; - } - #ifndef OPENSSL_NO_SRP if (src->srp_username) { dest->srp_username = OPENSSL_strdup(src->srp_username); @@ -824,7 +816,6 @@ void SSL_SESSION_free(SSL_SESSION *ss) OPENSSL_free(ss->srp_username); #endif OPENSSL_free(ss->ext.alpn_selected); - OPENSSL_free(ss->ext.tick_nonce); OPENSSL_free(ss->ticket_appdata); CRYPTO_THREAD_lock_free(ss->lock); OPENSSL_clear_free(ss, sizeof(*ss)); |