diff options
author | tb <> | 2024-06-26 03:41:10 +0000 |
---|---|---|
committer | tb <> | 2024-06-26 03:41:10 +0000 |
commit | a169bd764563505d8a6969d2959a0248f8cfd6b4 (patch) | |
tree | 42c15a9012b52f2d4478d8f47383c55047f28991 /src | |
parent | e3ce8d6d4aec7d1155c67d969a9528d19ff8be7d (diff) | |
download | openbsd-a169bd764563505d8a6969d2959a0248f8cfd6b4.tar.gz openbsd-a169bd764563505d8a6969d2959a0248f8cfd6b4.tar.bz2 openbsd-a169bd764563505d8a6969d2959a0248f8cfd6b4.zip |
remove psk_idx from tlsext_randomize_build_order()
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/ssl_tlsext.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c index 95174dc805..d0d67598d4 100644 --- a/src/lib/libssl/ssl_tlsext.c +++ b/src/lib/libssl/ssl_tlsext.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_tlsext.c,v 1.152 2024/06/26 03:39:49 tb Exp $ */ | 1 | /* $OpenBSD: ssl_tlsext.c,v 1.153 2024/06/26 03:41:10 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
@@ -2410,7 +2410,7 @@ int | |||
2410 | tlsext_randomize_build_order(SSL *s) | 2410 | tlsext_randomize_build_order(SSL *s) |
2411 | { | 2411 | { |
2412 | const struct tls_extension *psk_ext; | 2412 | const struct tls_extension *psk_ext; |
2413 | size_t idx, new_idx, psk_idx; | 2413 | size_t idx, new_idx; |
2414 | size_t alpn_idx = 0, sni_idx = 0; | 2414 | size_t alpn_idx = 0, sni_idx = 0; |
2415 | 2415 | ||
2416 | free(s->tlsext_build_order); | 2416 | free(s->tlsext_build_order); |
@@ -2423,7 +2423,7 @@ tlsext_randomize_build_order(SSL *s) | |||
2423 | 2423 | ||
2424 | /* RFC 8446, section 4.2 - PSK MUST be the last extension in the CH. */ | 2424 | /* RFC 8446, section 4.2 - PSK MUST be the last extension in the CH. */ |
2425 | if ((psk_ext = tls_extension_find(TLSEXT_TYPE_pre_shared_key, | 2425 | if ((psk_ext = tls_extension_find(TLSEXT_TYPE_pre_shared_key, |
2426 | &psk_idx)) == NULL) | 2426 | NULL)) == NULL) |
2427 | return 0; | 2427 | return 0; |
2428 | s->tlsext_build_order[N_TLS_EXTENSIONS - 1] = psk_ext; | 2428 | s->tlsext_build_order[N_TLS_EXTENSIONS - 1] = psk_ext; |
2429 | 2429 | ||