summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_server.c
diff options
context:
space:
mode:
authortb <>2026-08-21 17:15:22 +0000
committertb <>2026-08-21 17:15:22 +0000
commitfcc903ee8faa79f7dedb22f05008724ea327bdba (patch)
treed5921661f11d1c73ddb6d9c2302499f7d3466cf1 /src/lib/libssl/tls13_server.c
parentc59d718905f8bfe12745fa599341256608e132f4 (diff)
downloadopenbsd-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/tls13_server.c')
-rw-r--r--src/lib/libssl/tls13_server.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index 8ad11c6428..8b0dc8a26b 100644
--- a/src/lib/libssl/tls13_server.c
+++ b/src/lib/libssl/tls13_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_server.c,v 1.113 2026/07/31 03:59:50 kenjiro Exp $ */ 1/* $OpenBSD: tls13_server.c,v 1.114 2026/08/21 17:15:22 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -102,13 +102,13 @@ tls13_client_hello_required_extensions(struct tls13_ctx *ctx)
102 SSL *s = ctx->ssl; 102 SSL *s = ctx->ssl;
103 103
104 /* 104 /*
105 * RFC 8446, section 9.2. If the ClientHello has supported_versions 105 * RFC 9846 section 9.2. If the ClientHello has supported_versions
106 * containing TLSv1.3, presence or absence of some extensions requires 106 * containing TLSv1.3, presence or absence of some extensions requires
107 * presence or absence of others. 107 * presence or absence of others.
108 */ 108 */
109 109
110 /* 110 /*
111 * RFC 8446 section 4.2.9 - if we received a pre_shared_key, then we 111 * RFC 9846 section 4.3.9 - if we received a pre_shared_key, then we
112 * also need psk_key_exchange_modes. Otherwise, section 9.2 specifies 112 * also need psk_key_exchange_modes. Otherwise, section 9.2 specifies
113 * that we need both signature_algorithms and supported_groups. 113 * that we need both signature_algorithms and supported_groups.
114 */ 114 */
@@ -133,7 +133,7 @@ tls13_client_hello_required_extensions(struct tls13_ctx *ctx)
133 133
134 /* 134 /*
135 * XXX - Require server_name from client? If so, we SHOULD enforce 135 * XXX - Require server_name from client? If so, we SHOULD enforce
136 * this here - RFC 8446, 9.2. 136 * this here - RFC 9846, 9.2.
137 */ 137 */
138 138
139 return 1; 139 return 1;
@@ -246,7 +246,7 @@ tls13_client_hello_process(struct tls13_ctx *ctx, CBS *cbs)
246 /* 246 /*
247 * The legacy session identifier must either be zero length or a 32 byte 247 * The legacy session identifier must either be zero length or a 32 byte
248 * value (in which case the client is requesting middlebox compatibility 248 * value (in which case the client is requesting middlebox compatibility
249 * mode), as per RFC 8446 section 4.1.2. If it is valid, store the value 249 * mode), as per RFC 9846 section 4.2.2. If it is valid, store the value
250 * so that we can echo it back to the client. 250 * so that we can echo it back to the client.
251 */ 251 */
252 if (CBS_len(&session_id) != 0 && 252 if (CBS_len(&session_id) != 0 &&
@@ -459,7 +459,7 @@ tls13_server_hello_retry_request_sent(struct tls13_ctx *ctx)
459 /* 459 /*
460 * If the client has requested middlebox compatibility mode, 460 * If the client has requested middlebox compatibility mode,
461 * we MUST send a dummy CCS following our first handshake message. 461 * we MUST send a dummy CCS following our first handshake message.
462 * See RFC 8446 Appendix D.4. 462 * See RFC 9846 Appendix E.4.
463 */ 463 */
464 if (ctx->hs->tls13.legacy_session_id_len > 0) 464 if (ctx->hs->tls13.legacy_session_id_len > 0)
465 ctx->send_dummy_ccs_after = 1; 465 ctx->send_dummy_ccs_after = 1;
@@ -519,7 +519,7 @@ tls13_server_hello_sent(struct tls13_ctx *ctx)
519 /* 519 /*
520 * If the client has requested middlebox compatibility mode, 520 * If the client has requested middlebox compatibility mode,
521 * we MUST send a dummy CCS following our first handshake message. 521 * we MUST send a dummy CCS following our first handshake message.
522 * See RFC 8446 Appendix D.4. 522 * See RFC 9846 Appendix E.4.
523 */ 523 */
524 if ((ctx->handshake_stage.hs_type & WITHOUT_HRR) && 524 if ((ctx->handshake_stage.hs_type & WITHOUT_HRR) &&
525 ctx->hs->tls13.legacy_session_id_len > 0) 525 ctx->hs->tls13.legacy_session_id_len > 0)
@@ -572,7 +572,7 @@ tls13_server_check_certificate(struct tls13_ctx *ctx, SSL_CERT_PKEY *cpk,
572 572
573 /* 573 /*
574 * The digitalSignature bit MUST be set if the Key Usage extension is 574 * The digitalSignature bit MUST be set if the Key Usage extension is
575 * present as per RFC 8446 section 4.4.2.2. 575 * present as per RFC 9846 section 4.5.1.2.
576 */ 576 */
577 if (!(X509_get_key_usage(cpk->x509) & X509v3_KU_DIGITAL_SIGNATURE)) 577 if (!(X509_get_key_usage(cpk->x509) & X509v3_KU_DIGITAL_SIGNATURE))
578 goto done; 578 goto done;