diff options
author | tb <> | 2020-08-31 14:04:51 +0000 |
---|---|---|
committer | tb <> | 2020-08-31 14:04:51 +0000 |
commit | f551307b25934acd84205155d6286b2d937e2479 (patch) | |
tree | 724850986fbe9b93cfd38e922f1d17205d123b6b /src/lib/libssl/ssl_srvr.c | |
parent | 09997f3d41692022beb138f1e238f51af93a8024 (diff) | |
download | openbsd-f551307b25934acd84205155d6286b2d937e2479.tar.gz openbsd-f551307b25934acd84205155d6286b2d937e2479.tar.bz2 openbsd-f551307b25934acd84205155d6286b2d937e2479.zip |
Send alert on ssl_get_prev_session failure
ssl_get_prev_session() can fail for various reasons some of which
may be internal_error others decode_error alerts. Propagate the
appropriate alert up to the caller so we can abort the handshake
by sending a fatal alert instead of rudely closing the pipe.
Currently only 28 of 292 test cases of tlsfuzzer's test-extension.py pass.
With this diff, 272 pass. The rest will require fixes elsewhere.
ok beck inoguchi jsing
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r-- | src/lib/libssl/ssl_srvr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c index 67671f276c..745b15aad0 100644 --- a/src/lib/libssl/ssl_srvr.c +++ b/src/lib/libssl/ssl_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_srvr.c,v 1.80 2020/07/03 04:12:50 tb Exp $ */ | 1 | /* $OpenBSD: ssl_srvr.c,v 1.81 2020/08/31 14:04:51 tb 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 | * |
@@ -920,11 +920,11 @@ ssl3_get_client_hello(SSL *s) | |||
920 | 920 | ||
921 | CBS_dup(&cbs, &ext_block); | 921 | CBS_dup(&cbs, &ext_block); |
922 | 922 | ||
923 | i = ssl_get_prev_session(s, &session_id, &ext_block); | 923 | i = ssl_get_prev_session(s, &session_id, &ext_block, &al); |
924 | if (i == 1) { /* previous session */ | 924 | if (i == 1) { /* previous session */ |
925 | s->internal->hit = 1; | 925 | s->internal->hit = 1; |
926 | } else if (i == -1) | 926 | } else if (i == -1) |
927 | goto err; | 927 | goto f_err; |
928 | else { | 928 | else { |
929 | /* i == 0 */ | 929 | /* i == 0 */ |
930 | if (!ssl_get_new_session(s, 1)) | 930 | if (!ssl_get_new_session(s, 1)) |