SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-06-27 00:27:56 +00:00
parent 7f3136b31c
commit e26320a0e2
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
7 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/libssl/ssl_tlsext.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ssl_tlsext.c,v 1.151 2024/06/25 05:46:48 tb Exp $ */
/* $OpenBSD: ssl_tlsext.c,v 1.153 2024/06/26 03:41:10 tb Exp $ */
/*
* Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org>
* Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@ -2368,7 +2368,8 @@ tls_extension_find(uint16_t type, size_t *tls_extensions_idx)
for (i = 0; i < N_TLS_EXTENSIONS; i++) {
if (tls_extensions[i].type == type) {
*tls_extensions_idx = i;
if (tls_extensions_idx != NULL)
*tls_extensions_idx = i;
return &tls_extensions[i];
}
}
@ -2409,7 +2410,7 @@ int
tlsext_randomize_build_order(SSL *s)
{
const struct tls_extension *psk_ext;
size_t idx, new_idx, psk_idx;
size_t idx, new_idx;
size_t alpn_idx = 0, sni_idx = 0;
free(s->tlsext_build_order);
@ -2422,7 +2423,7 @@ tlsext_randomize_build_order(SSL *s)
/* RFC 8446, section 4.2 - PSK MUST be the last extension in the CH. */
if ((psk_ext = tls_extension_find(TLSEXT_TYPE_pre_shared_key,
&psk_idx)) == NULL)
NULL)) == NULL)
return 0;
s->tlsext_build_order[N_TLS_EXTENSIONS - 1] = psk_ext;