diff options
| author | Matt Caswell <matt@openssl.org> | 2019-06-18 11:45:26 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-06-18 13:36:25 +0100 |
| commit | cd0fb43cbe2774220f2702b8289faec590a72d01 (patch) | |
| tree | 5d8e94dabc78600b440a30ea29496284943b0113 /ssl/ssl_sess.c | |
| parent | eee2a6a718151336534d15a61d8d11209d4dfb1e (diff) | |
Following the previous 2 commits also move ecpointformats out of session
The previous 2 commits moved supported groups and ciphers out of the
session object to avoid race conditions. We now also move ecpointformats
for consistency. There does not seem to be a race condition with access
to this data since it is only ever set in a non-resumption handshake.
However, there is no reason for it to be in the session.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9162)
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index f13c909da7..f80b8e24a7 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -122,9 +122,6 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) dest->psk_identity = NULL; #endif dest->ext.hostname = NULL; -#ifndef OPENSSL_NO_EC - dest->ext.ecpointformats = NULL; -#endif dest->ext.tick = NULL; dest->ext.alpn_selected = NULL; #ifndef OPENSSL_NO_SRP @@ -185,15 +182,6 @@ SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket) goto err; } } -#ifndef OPENSSL_NO_EC - if (src->ext.ecpointformats) { - dest->ext.ecpointformats = - OPENSSL_memdup(src->ext.ecpointformats, - src->ext.ecpointformats_len); - if (dest->ext.ecpointformats == NULL) - goto err; - } -#endif if (ticket != 0 && src->ext.tick != NULL) { dest->ext.tick = @@ -776,11 +764,6 @@ void SSL_SESSION_free(SSL_SESSION *ss) sk_X509_pop_free(ss->peer_chain, X509_free); OPENSSL_free(ss->ext.hostname); OPENSSL_free(ss->ext.tick); -#ifndef OPENSSL_NO_EC - OPENSSL_free(ss->ext.ecpointformats); - ss->ext.ecpointformats = NULL; - ss->ext.ecpointformats_len = 0; -#endif /* OPENSSL_NO_EC */ #ifndef OPENSSL_NO_PSK OPENSSL_free(ss->psk_identity_hint); OPENSSL_free(ss->psk_identity); |