openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-25 06:35:46 +00:00
Code Issues Projects Releases Wiki Activity

Simplify tls13_server_hello_build()

Browse Source 
There's no need to pass in the hrr parameter as it is redundant with
the tls13.hrr flag. This avoids boolean blindness in the caller and
removes a leftover from before we had tls13.hrr.

ok jsing kenjiro
This commit is contained in:
tb
2025-10-25 12:31:44 +00:00
parent 61d6733dbb
commit 1ff8d81aaa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libssl/tls13_server.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tls13_server.c,v 1.110 2025/10/16 14:42:21 jsing Exp $ */
/* $OpenBSD: tls13_server.c,v 1.111 2025/10/25 12:31:44 tb Exp $ */
/*
* Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
* Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -327,7 +327,7 @@ tls13_client_hello_recv(struct tls13_ctx *ctx, CBS *cbs)
}
static int
tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb, int hrr)
tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb)
{
uint16_t tlsext_msg_type = SSL_TLSEXT_MSG_SH;
const uint8_t *server_random;
@@ -338,7 +338,7 @@ tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb, int hrr)
cipher = SSL_CIPHER_get_value(ctx->hs->cipher);
server_random = s->s3->server_random;
if (hrr) {
if (ctx->hs->tls13.hrr) {
server_random = tls13_hello_retry_request_hash;
tlsext_msg_type = SSL_TLSEXT_MSG_HRR;
}
@@ -447,7 +447,7 @@ tls13_server_hello_retry_request_send(struct tls13_ctx *ctx, CBB *cbb)
if (ctx->hs->tls13.server_group == 0)
return 0;
if (!tls13_server_hello_build(ctx, cbb, 1))
if (!tls13_server_hello_build(ctx, cbb))
return 0;
return 1;
@@ -507,7 +507,7 @@ tls13_server_hello_send(struct tls13_ctx *ctx, CBB *cbb)
if (!tls13_servername_process(ctx))
return 0;
if (!tls13_server_hello_build(ctx, cbb, 0))
if (!tls13_server_hello_build(ctx, cbb))
return 0;
return 1;