diff options
| author | Matt Caswell <matt@openssl.org> | 2016-11-09 14:51:06 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-10 15:05:36 +0000 |
| commit | de4d764e3271ce09d28c0d6d7bce3dc9d8b85ab9 (patch) | |
| tree | 7b0ae4c29057430930b4c4dfc2a7485606545b01 /ssl/ssl_sess.c | |
| parent | cf551a51d2385f59536645f644f03a572cc232f9 (diff) | |
Rename the Elliptic Curves extension to supported_groups
This is a skin deep change, which simply renames most places where we talk
about curves in a TLS context to groups. This is because TLS1.3 has renamed
the extension, and it can now include DH groups too. We still only support
curves, but this rename should pave the way for a future extension for DH
groups.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 291796e8ad..825e706561 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -132,7 +132,7 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) dest->tlsext_hostname = NULL; #ifndef OPENSSL_NO_EC dest->tlsext_ecpointformatlist = NULL; - dest->tlsext_ellipticcurvelist = NULL; + dest->tlsext_supportedgroupslist = NULL; #endif dest->tlsext_tick = NULL; #ifndef OPENSSL_NO_SRP @@ -198,11 +198,11 @@ SSL_SESSION *ssl_session_dup(SSL_SESSION *src, int ticket) if (dest->tlsext_ecpointformatlist == NULL) goto err; } - if (src->tlsext_ellipticcurvelist) { - dest->tlsext_ellipticcurvelist = - OPENSSL_memdup(src->tlsext_ellipticcurvelist, - src->tlsext_ellipticcurvelist_length); - if (dest->tlsext_ellipticcurvelist == NULL) + if (src->tlsext_supportedgroupslist) { + dest->tlsext_supportedgroupslist = + OPENSSL_memdup(src->tlsext_supportedgroupslist, + src->tlsext_supportedgroupslist_length); + if (dest->tlsext_supportedgroupslist == NULL) goto err; } #endif @@ -753,8 +753,8 @@ void SSL_SESSION_free(SSL_SESSION *ss) #ifndef OPENSSL_NO_EC ss->tlsext_ecpointformatlist_length = 0; OPENSSL_free(ss->tlsext_ecpointformatlist); - ss->tlsext_ellipticcurvelist_length = 0; - OPENSSL_free(ss->tlsext_ellipticcurvelist); + ss->tlsext_supportedgroupslist_length = 0; + OPENSSL_free(ss->tlsext_supportedgroupslist); #endif /* OPENSSL_NO_EC */ #ifndef OPENSSL_NO_PSK OPENSSL_free(ss->psk_identity_hint); |