diff options
| author | tb <> | 2026-08-21 17:15:22 +0000 |
|---|---|---|
| committer | tb <> | 2026-08-21 17:15:22 +0000 |
| commit | fcc903ee8faa79f7dedb22f05008724ea327bdba (patch) | |
| tree | d5921661f11d1c73ddb6d9c2302499f7d3466cf1 /src/lib/libssl/tls1.h | |
| parent | c59d718905f8bfe12745fa599341256608e132f4 (diff) | |
| download | openbsd-fcc903ee8faa79f7dedb22f05008724ea327bdba.tar.gz openbsd-fcc903ee8faa79f7dedb22f05008724ea327bdba.tar.bz2 openbsd-fcc903ee8faa79f7dedb22f05008724ea327bdba.zip | |
Change RFC references from 8446 to 9846 and adjust section numbers
with/ok kenjiro
Diffstat (limited to 'src/lib/libssl/tls1.h')
| -rw-r--r-- | src/lib/libssl/tls1.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h index 2d5dffc6cf..42451a4214 100644 --- a/src/lib/libssl/tls1.h +++ b/src/lib/libssl/tls1.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls1.h,v 1.61 2025/04/18 07:34:01 tb Exp $ */ | 1 | /* $OpenBSD: tls1.h,v 1.62 2026/08/21 17:15:22 tb 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 | * |
| @@ -240,7 +240,7 @@ extern "C" { | |||
| 240 | /* ExtensionType value from RFC 5054. */ | 240 | /* ExtensionType value from RFC 5054. */ |
| 241 | #define TLSEXT_TYPE_srp 12 | 241 | #define TLSEXT_TYPE_srp 12 |
| 242 | 242 | ||
| 243 | /* ExtensionType value from RFC 5246/RFC 8446. */ | 243 | /* ExtensionType value from RFC 5246/RFC 9846. */ |
| 244 | #define TLSEXT_TYPE_signature_algorithms 13 | 244 | #define TLSEXT_TYPE_signature_algorithms 13 |
| 245 | 245 | ||
| 246 | /* ExtensionType value from RFC 5764. */ | 246 | /* ExtensionType value from RFC 5764. */ |
| @@ -258,7 +258,7 @@ extern "C" { | |||
| 258 | /* ExtensionType value from RFC 4507. */ | 258 | /* ExtensionType value from RFC 4507. */ |
| 259 | #define TLSEXT_TYPE_session_ticket 35 | 259 | #define TLSEXT_TYPE_session_ticket 35 |
| 260 | 260 | ||
| 261 | /* ExtensionType values from RFC 8446 section 4.2 */ | 261 | /* ExtensionType values from RFC 9846 section 4.3 */ |
| 262 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | 262 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) |
| 263 | #define TLSEXT_TYPE_pre_shared_key 41 | 263 | #define TLSEXT_TYPE_pre_shared_key 41 |
| 264 | #define TLSEXT_TYPE_early_data 42 | 264 | #define TLSEXT_TYPE_early_data 42 |
| @@ -279,7 +279,7 @@ extern "C" { | |||
| 279 | 279 | ||
| 280 | /* | 280 | /* |
| 281 | * TLS 1.3 extension names from OpenSSL, where they decided to use a different | 281 | * TLS 1.3 extension names from OpenSSL, where they decided to use a different |
| 282 | * name from that given in RFC 8446. | 282 | * name from that given in RFC 9846. |
| 283 | */ | 283 | */ |
| 284 | #if defined(LIBRESSL_HAS_TLS1_3) | 284 | #if defined(LIBRESSL_HAS_TLS1_3) |
| 285 | #define TLSEXT_TYPE_psk TLSEXT_TYPE_pre_shared_key | 285 | #define TLSEXT_TYPE_psk TLSEXT_TYPE_pre_shared_key |
| @@ -486,7 +486,7 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) | |||
| 486 | #define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 0x030000C4 | 486 | #define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 0x030000C4 |
| 487 | #define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA256 0x030000C5 | 487 | #define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA256 0x030000C5 |
| 488 | 488 | ||
| 489 | /* TLS 1.3 cipher suites from RFC 8446 appendix B.4. */ | 489 | /* TLS 1.3 cipher suites from RFC 9846 appendix B.4. */ |
| 490 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | 490 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) |
| 491 | #define TLS1_3_CK_AES_128_GCM_SHA256 0x03001301 | 491 | #define TLS1_3_CK_AES_128_GCM_SHA256 0x03001301 |
| 492 | #define TLS1_3_CK_AES_256_GCM_SHA384 0x03001302 | 492 | #define TLS1_3_CK_AES_256_GCM_SHA384 0x03001302 |
| @@ -725,7 +725,7 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb) | |||
| 725 | #define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 "ECDHE-ECDSA-CHACHA20-POLY1305" | 725 | #define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 "ECDHE-ECDSA-CHACHA20-POLY1305" |
| 726 | #define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305 "DHE-RSA-CHACHA20-POLY1305" | 726 | #define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305 "DHE-RSA-CHACHA20-POLY1305" |
| 727 | 727 | ||
| 728 | /* TLS 1.3 cipher suites from RFC 8446 appendix B.4. */ | 728 | /* TLS 1.3 cipher suites from RFC 9846 appendix B.4. */ |
| 729 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) | 729 | #if defined(LIBRESSL_HAS_TLS1_3) || defined(LIBRESSL_INTERNAL) |
| 730 | #define TLS1_3_TXT_AES_128_GCM_SHA256 "AEAD-AES128-GCM-SHA256" | 730 | #define TLS1_3_TXT_AES_128_GCM_SHA256 "AEAD-AES128-GCM-SHA256" |
| 731 | #define TLS1_3_TXT_AES_256_GCM_SHA384 "AEAD-AES256-GCM-SHA384" | 731 | #define TLS1_3_TXT_AES_256_GCM_SHA384 "AEAD-AES256-GCM-SHA384" |
