From 86b9c46552e3f57d558ae8570ed33059e9418153 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 13 Sep 2015 09:20:19 +0000
Subject: The *_accept() functions increment in_handshake at the start of the
 function, then decrement it and call a callback on exit from the function. As
 such, these functions should not return in the middle, otherwise in_handshake
 is never decremented and the callback never called.

ok beck@ "with many sighs" miod@
---
 src/lib/libssl/d1_srvr.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/lib/libssl/d1_srvr.c')

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index f5e0ec3e4b..f6664237ae 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.66 2015/09/12 20:51:33 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.67 2015/09/13 09:20:19 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -202,7 +202,8 @@ dtls1_accept(SSL *s)
 
 	if (s->cert == NULL) {
 		SSLerr(SSL_F_DTLS1_ACCEPT, SSL_R_NO_CERTIFICATE_SET);
-		return (-1);
+		ret = -1;
+		goto end;
 	}
 
 	for (;;) {
@@ -224,7 +225,8 @@ dtls1_accept(SSL *s)
 
 			if ((s->version & 0xff00) != (DTLS1_VERSION & 0xff00)) {
 				SSLerr(SSL_F_DTLS1_ACCEPT, ERR_R_INTERNAL_ERROR);
-				return -1;
+				ret = -1;
+				goto end;
 			}
 			s->type = SSL_ST_ACCEPT;
 
-- 
cgit v1.2.3-55-g6feb