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/tls1.h | |
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/tls1.h')
-rw-r--r-- | src/lib/libssl/tls1.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index 0474bb73ae..7ad9a387c9 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls1.h,v 1.32 2018/02/17 15:08:21 jsing Exp $ */ | 1 | /* $OpenBSD: tls1.h,v 1.33 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 | * |
@@ -230,8 +230,13 @@ extern "C" { | |||
230 | /* ExtensionType values from RFC 6091. */ | 230 | /* ExtensionType values from RFC 6091. */ |
231 | #define TLSEXT_TYPE_cert_type 9 | 231 | #define TLSEXT_TYPE_cert_type 9 |
232 | 232 | ||
233 | /* ExtensionType values from RFC 7919. */ | ||
234 | #define TLSEXT_TYPE_supported_groups 10 | ||
235 | |||
233 | /* ExtensionType values from RFC 4492. */ | 236 | /* ExtensionType values from RFC 4492. */ |
234 | #define TLSEXT_TYPE_elliptic_curves 10 | 237 | #ifndef LIBRESSL_INTERNAL |
238 | #define TLSEXT_TYPE_elliptic_curves TLSEXT_TYPE_supported_groups | ||
239 | #endif | ||
235 | #define TLSEXT_TYPE_ec_point_formats 11 | 240 | #define TLSEXT_TYPE_ec_point_formats 11 |
236 | 241 | ||
237 | /* ExtensionType value from RFC 5054. */ | 242 | /* ExtensionType value from RFC 5054. */ |