summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_server.c
diff options
context:
space:
mode:
authorjsing <>2020-01-29 17:03:58 +0000
committerjsing <>2020-01-29 17:03:58 +0000
commit78553a4afddc4fe2a3045137470161d40051ec5a (patch)
tree7b81eb186a3012379a015398a5c6737542a43dd4 /src/lib/libssl/tls13_server.c
parent2c70372fd9b1d1710d7d8600620b9ddcffd8b4fd (diff)
downloadopenbsd-78553a4afddc4fe2a3045137470161d40051ec5a.tar.gz
openbsd-78553a4afddc4fe2a3045137470161d40051ec5a.tar.bz2
openbsd-78553a4afddc4fe2a3045137470161d40051ec5a.zip
If the TLSv1.3 code has not recorded an error and something already exists
on the error stack, refrain from pushing an 'unknown' error on the stack. This should allow libcrypto errors (including bio) to be visible, where we have nothing better to offer. ok tb@
Diffstat (limited to 'src/lib/libssl/tls13_server.c')
-rw-r--r--src/lib/libssl/tls13_server.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index 41b4d2b24e..a559e03219 100644
--- a/src/lib/libssl/tls13_server.c
+++ b/src/lib/libssl/tls13_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_server.c,v 1.20 2020/01/26 06:55:17 jsing Exp $ */ 1/* $OpenBSD: tls13_server.c,v 1.21 2020/01/29 17:03:58 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 4 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -78,6 +78,7 @@ tls13_legacy_accept(SSL *ssl)
78 } 78 }
79 } 79 }
80 80
81 ERR_clear_error();
81 S3I(ssl)->hs.state = SSL_ST_ACCEPT; 82 S3I(ssl)->hs.state = SSL_ST_ACCEPT;
82 83
83 ret = tls13_accept(ctx); 84 ret = tls13_accept(ctx);