summaryrefslogtreecommitdiffstats
path: root/lib/libssl/tls13_server.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2020-01-29 17:03:58 +0000
committerjsing <jsing@openbsd.org>2020-01-29 17:03:58 +0000
commitae613d71d249156d26e03c3677540a177f339483 (patch)
tree5355c1636ed704bf0ae2576d3c9821cac80d1360 /lib/libssl/tls13_server.c
parentWarn if a message type that is no longer used is received. (diff)
downloadwireguard-openbsd-ae613d71d249156d26e03c3677540a177f339483.tar.xz
wireguard-openbsd-ae613d71d249156d26e03c3677540a177f339483.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 'lib/libssl/tls13_server.c')
-rw-r--r--lib/libssl/tls13_server.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libssl/tls13_server.c b/lib/libssl/tls13_server.c
index 41b4d2b24ec..a559e032195 100644
--- a/lib/libssl/tls13_server.c
+++ b/lib/libssl/tls13_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_server.c,v 1.20 2020/01/26 06:55:17 jsing Exp $ */
+/* $OpenBSD: tls13_server.c,v 1.21 2020/01/29 17:03:58 jsing Exp $ */
/*
* Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
* Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -78,6 +78,7 @@ tls13_legacy_accept(SSL *ssl)
}
}
+ ERR_clear_error();
S3I(ssl)->hs.state = SSL_ST_ACCEPT;
ret = tls13_accept(ctx);