diff options
author | jsing <> | 2022-01-11 18:28:41 +0000 |
---|---|---|
committer | jsing <> | 2022-01-11 18:28:41 +0000 |
commit | 7af437db632fa247609a08c8b60d48ae34bf3d68 (patch) | |
tree | b1b5872add715360561434ded72edd4aac2d3950 /src/lib/libssl/tls_internal.h | |
parent | c48aae5cc38995b3b04baaf61334783d01a7772e (diff) | |
download | openbsd-7af437db632fa247609a08c8b60d48ae34bf3d68.tar.gz openbsd-7af437db632fa247609a08c8b60d48ae34bf3d68.tar.bz2 openbsd-7af437db632fa247609a08c8b60d48ae34bf3d68.zip |
Plumb decode errors through key share parsing code.
Distinguish between decode errors and other errors, so that we can send
a SSL_AD_DECODE_ERROR alert when appropriate.
Fixes a tlsfuzzer failure, due to it expecting a decode error alert and
not receiving one.
Prompted by anton@
ok tb@
Diffstat (limited to 'src/lib/libssl/tls_internal.h')
-rw-r--r-- | src/lib/libssl/tls_internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/tls_internal.h b/src/lib/libssl/tls_internal.h index f7f939215a..a009635a05 100644 --- a/src/lib/libssl/tls_internal.h +++ b/src/lib/libssl/tls_internal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls_internal.h,v 1.4 2022/01/07 15:46:30 jsing Exp $ */ | 1 | /* $OpenBSD: tls_internal.h,v 1.5 2022/01/11 18:28:41 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, 2019, 2021 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019, 2021 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -72,9 +72,9 @@ int tls_key_share_generate(struct tls_key_share *ks); | |||
72 | int tls_key_share_params(struct tls_key_share *ks, CBB *cbb); | 72 | int tls_key_share_params(struct tls_key_share *ks, CBB *cbb); |
73 | int tls_key_share_public(struct tls_key_share *ks, CBB *cbb); | 73 | int tls_key_share_public(struct tls_key_share *ks, CBB *cbb); |
74 | int tls_key_share_peer_params(struct tls_key_share *ks, CBS *cbs, | 74 | int tls_key_share_peer_params(struct tls_key_share *ks, CBS *cbs, |
75 | int *invalid_params); | 75 | int *decode_error, int *invalid_params); |
76 | int tls_key_share_peer_public(struct tls_key_share *ks, CBS *cbs, | 76 | int tls_key_share_peer_public(struct tls_key_share *ks, CBS *cbs, |
77 | int *invalid_key); | 77 | int *decode_error, int *invalid_key); |
78 | int tls_key_share_derive(struct tls_key_share *ks, uint8_t **shared_key, | 78 | int tls_key_share_derive(struct tls_key_share *ks, uint8_t **shared_key, |
79 | size_t *shared_key_len); | 79 | size_t *shared_key_len); |
80 | 80 | ||