summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2020-01-22 03:15:43 +0000
committerbeck <>2020-01-22 03:15:43 +0000
commitb0f820dcfc24b9120618dc0c86f71400e314f16a (patch)
treef246cb23f43219902c5d00b613ff7f6af5881713
parente841f2e08f8bcc62f31051874b1b2a491665e7c6 (diff)
downloadopenbsd-b0f820dcfc24b9120618dc0c86f71400e314f16a.tar.gz
openbsd-b0f820dcfc24b9120618dc0c86f71400e314f16a.tar.bz2
openbsd-b0f820dcfc24b9120618dc0c86f71400e314f16a.zip
Don't add an extra unknown error if we got a fatal alert
ok jsing@
-rw-r--r--src/lib/libssl/tls13_lib.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/tls13_lib.c b/src/lib/libssl/tls13_lib.c
index e353e9fdad..d92d3cb8b6 100644
--- a/src/lib/libssl/tls13_lib.c
+++ b/src/lib/libssl/tls13_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_lib.c,v 1.18 2020/01/22 02:21:05 beck Exp $ */ 1/* $OpenBSD: tls13_lib.c,v 1.19 2020/01/22 03:15:43 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2019 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2019 Bob Beck <beck@openbsd.org>
@@ -381,7 +381,8 @@ tls13_legacy_return_code(SSL *ssl, ssize_t ret)
381 return 0; 381 return 0;
382 382
383 case TLS13_IO_FAILURE: 383 case TLS13_IO_FAILURE:
384 tls13_legacy_error(ssl); 384 if (S3I(ssl)->fatal_alert == 0)
385 tls13_legacy_error(ssl);
385 return -1; 386 return -1;
386 387
387 case TLS13_IO_WANT_POLLIN: 388 case TLS13_IO_WANT_POLLIN: