From b23c8f0c7e56fd5c6e99bcad0ec4f4a085be2d6a Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 12 Sep 2015 19:54:31 +0000
Subject: Ensure that we clear the libssl error stack before we make a function
 call that we will pass the result through tls_ssl_error() on failure.
 Otherwise we can end up reporting spurious errors due to their being
 unrelated errors already on the error stack.

Spotted by Marko Kreen.

ok beck@
---
 src/lib/libtls/tls_server.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib/libtls/tls_server.c')

diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c
index 69baf5c1c2..1baf717c90 100644
--- a/src/lib/libtls/tls_server.c
+++ b/src/lib/libtls/tls_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_server.c,v 1.16 2015/09/11 08:31:26 beck Exp $ */
+/* $OpenBSD: tls_server.c,v 1.17 2015/09/12 19:54:31 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -16,6 +16,7 @@
  */
 
 #include <openssl/ec.h>
+#include <openssl/err.h>
 #include <openssl/ssl.h>
 
 #include <tls.h>
@@ -167,6 +168,7 @@ tls_handshake_server(struct tls *ctx)
 		goto err;
 	}
 
+	ERR_clear_error();
 	if ((ssl_ret = SSL_accept(ctx->ssl_conn)) != 1) {
 		rv = tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, "handshake");
 		goto err;
-- 
cgit v1.2.3-55-g6feb