diff options
Diffstat (limited to 'src/lib/libssl/tls13_lib.c')
| -rw-r--r-- | src/lib/libssl/tls13_lib.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/tls13_lib.c b/src/lib/libssl/tls13_lib.c index c3470b2931..f93452402f 100644 --- a/src/lib/libssl/tls13_lib.c +++ b/src/lib/libssl/tls13_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls13_lib.c,v 1.78 2025/06/07 10:25:12 tb Exp $ */ | 1 | /* $OpenBSD: tls13_lib.c,v 1.79 2026/08/21 17:15:22 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
| 4 | * Copyright (c) 2019 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2019 Bob Beck <beck@openbsd.org> |
| @@ -25,14 +25,14 @@ | |||
| 25 | #include "tls13_internal.h" | 25 | #include "tls13_internal.h" |
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | * RFC 8446, section 4.6.1. Servers must not indicate a lifetime longer than | 28 | * RFC 9846 section 4.7.1. Servers must not indicate a lifetime longer than |
| 29 | * 7 days and clients must not cache tickets for longer than 7 days. | 29 | * 7 days and clients must not cache tickets for longer than 7 days. |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #define TLS13_MAX_TICKET_LIFETIME (7 * 24 * 3600) | 32 | #define TLS13_MAX_TICKET_LIFETIME (7 * 24 * 3600) |
| 33 | 33 | ||
| 34 | /* | 34 | /* |
| 35 | * Downgrade sentinels - RFC 8446 section 4.1.3, magic values which must be set | 35 | * Downgrade sentinels - RFC 9846 section 4.2.3, magic values which must be set |
| 36 | * by the server in server random if it is willing to downgrade but supports | 36 | * by the server in server random if it is willing to downgrade but supports |
| 37 | * TLSv1.3 | 37 | * TLSv1.3 |
| 38 | */ | 38 | */ |
| @@ -44,7 +44,7 @@ const uint8_t tls13_downgrade_11[8] = { | |||
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | /* | 46 | /* |
| 47 | * HelloRetryRequest hash - RFC 8446 section 4.1.3. | 47 | * HelloRetryRequest hash - RFC 9846 section 4.2.3. |
| 48 | */ | 48 | */ |
| 49 | const uint8_t tls13_hello_retry_request_hash[32] = { | 49 | const uint8_t tls13_hello_retry_request_hash[32] = { |
| 50 | 0xcf, 0x21, 0xad, 0x74, 0xe5, 0x9a, 0x61, 0x11, | 50 | 0xcf, 0x21, 0xad, 0x74, 0xe5, 0x9a, 0x61, 0x11, |
| @@ -54,7 +54,7 @@ const uint8_t tls13_hello_retry_request_hash[32] = { | |||
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | /* | 56 | /* |
| 57 | * Certificate Verify padding - RFC 8446 section 4.4.3. | 57 | * Certificate Verify padding - RFC 9846 section 4.5.2. |
| 58 | */ | 58 | */ |
| 59 | const uint8_t tls13_cert_verify_pad[64] = { | 59 | const uint8_t tls13_cert_verify_pad[64] = { |
| 60 | 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, | 60 | 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, |
| @@ -156,7 +156,7 @@ tls13_alert_received_cb(uint8_t alert_level, uint8_t alert_desc, void *arg) | |||
| 156 | if (alert_desc == TLS13_ALERT_USER_CANCELED) { | 156 | if (alert_desc == TLS13_ALERT_USER_CANCELED) { |
| 157 | /* | 157 | /* |
| 158 | * We treat this as advisory, since a close_notify alert | 158 | * We treat this as advisory, since a close_notify alert |
| 159 | * SHOULD follow this alert (RFC 8446 section 6.1). | 159 | * MUST follow this alert (RFC 9846 section 6.1). |
| 160 | */ | 160 | */ |
| 161 | return; | 161 | return; |
| 162 | } | 162 | } |
| @@ -369,7 +369,7 @@ tls13_key_update_recv(struct tls13_ctx *ctx, CBS *cbs) | |||
| 369 | return tls13_send_alert(ctx->rl, alert); | 369 | return tls13_send_alert(ctx->rl, alert); |
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | /* RFC 8446 section 4.6.1 */ | 372 | /* RFC 9846 section 4.7.1 */ |
| 373 | static ssize_t | 373 | static ssize_t |
| 374 | tls13_new_session_ticket_recv(struct tls13_ctx *ctx, CBS *cbs) | 374 | tls13_new_session_ticket_recv(struct tls13_ctx *ctx, CBS *cbs) |
| 375 | { | 375 | { |
| @@ -628,7 +628,7 @@ tls13_synthetic_handshake_message(struct tls13_ctx *ctx) | |||
| 628 | 628 | ||
| 629 | /* | 629 | /* |
| 630 | * Replace ClientHello with synthetic handshake message - see | 630 | * Replace ClientHello with synthetic handshake message - see |
| 631 | * RFC 8446 section 4.4.1. | 631 | * RFC 9846 section 4.1. |
| 632 | */ | 632 | */ |
| 633 | if (!tls1_transcript_hash_init(s)) | 633 | if (!tls1_transcript_hash_init(s)) |
| 634 | goto err; | 634 | goto err; |
