diff options
author | jsing <> | 2018-11-05 20:41:30 +0000 |
---|---|---|
committer | jsing <> | 2018-11-05 20:41:30 +0000 |
commit | cc6841304de92627d97efb8864bf697cea3c3c11 (patch) | |
tree | 0dcb778a3611a7834d75d19cbaf3ab20c8778177 /src/lib/libssl/s3_lib.c | |
parent | 10fbcf441c789825e293dcdf108f5d3a6066e929 (diff) | |
download | openbsd-cc6841304de92627d97efb8864bf697cea3c3c11.tar.gz openbsd-cc6841304de92627d97efb8864bf697cea3c3c11.tar.bz2 openbsd-cc6841304de92627d97efb8864bf697cea3c3c11.zip |
Rename the TLS Supported Elliptic Curves extension to Supported Groups.
RFC 7919 renamed the Supported Elliptic Curves TLS extension to Supported
Groups and redefined it to include finite field DH (FFDH) in addition to
elliptic curve DH (ECDH). As such, rename the TLS extension and change the
associated code to refer to groups rather than curves.
ok beck@ tb@
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r-- | src/lib/libssl/s3_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index e1bad1ba1a..1c605613e8 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_lib.c,v 1.172 2018/11/05 06:55:37 jsing Exp $ */ | 1 | /* $OpenBSD: s3_lib.c,v 1.173 2018/11/05 20:41:30 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1820,7 +1820,7 @@ SSL_set1_groups(SSL *s, const int *groups, size_t groups_len) | |||
1820 | int | 1820 | int |
1821 | SSL_set1_groups_list(SSL *s, const char *groups) | 1821 | SSL_set1_groups_list(SSL *s, const char *groups) |
1822 | { | 1822 | { |
1823 | return tls1_set_groups_list(&s->internal->tlsext_supportedgroups, | 1823 | return tls1_set_group_list(&s->internal->tlsext_supportedgroups, |
1824 | &s->internal->tlsext_supportedgroups_length, groups); | 1824 | &s->internal->tlsext_supportedgroups_length, groups); |
1825 | } | 1825 | } |
1826 | 1826 | ||
@@ -2107,7 +2107,7 @@ SSL_CTX_set1_groups(SSL_CTX *ctx, const int *groups, size_t groups_len) | |||
2107 | int | 2107 | int |
2108 | SSL_CTX_set1_groups_list(SSL_CTX *ctx, const char *groups) | 2108 | SSL_CTX_set1_groups_list(SSL_CTX *ctx, const char *groups) |
2109 | { | 2109 | { |
2110 | return tls1_set_groups_list(&ctx->internal->tlsext_supportedgroups, | 2110 | return tls1_set_group_list(&ctx->internal->tlsext_supportedgroups, |
2111 | &ctx->internal->tlsext_supportedgroups_length, groups); | 2111 | &ctx->internal->tlsext_supportedgroups_length, groups); |
2112 | } | 2112 | } |
2113 | 2113 | ||