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/ssl_locl.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/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index fcb369405c..0eca4e673d 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.380 2022/01/09 15:53:52 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.381 2022/01/11 18:28:41 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1424,8 +1424,10 @@ int ssl_kex_generate_dhe(DH *dh, DH *dh_params); | |||
1424 | int ssl_kex_generate_dhe_params_auto(DH *dh, size_t key_len); | 1424 | int ssl_kex_generate_dhe_params_auto(DH *dh, size_t key_len); |
1425 | int ssl_kex_params_dhe(DH *dh, CBB *cbb); | 1425 | int ssl_kex_params_dhe(DH *dh, CBB *cbb); |
1426 | int ssl_kex_public_dhe(DH *dh, CBB *cbb); | 1426 | int ssl_kex_public_dhe(DH *dh, CBB *cbb); |
1427 | int ssl_kex_peer_params_dhe(DH *dh, CBS *cbs, int *invalid_params); | 1427 | int ssl_kex_peer_params_dhe(DH *dh, CBS *cbs, int *decode_error, |
1428 | int ssl_kex_peer_public_dhe(DH *dh, CBS *cbs, int *invalid_key); | 1428 | int *invalid_params); |
1429 | int ssl_kex_peer_public_dhe(DH *dh, CBS *cbs, int *decode_error, | ||
1430 | int *invalid_key); | ||
1429 | int ssl_kex_derive_dhe(DH *dh, DH *dh_peer, | 1431 | int ssl_kex_derive_dhe(DH *dh, DH *dh_peer, |
1430 | uint8_t **shared_key, size_t *shared_key_len); | 1432 | uint8_t **shared_key, size_t *shared_key_len); |
1431 | 1433 | ||