From: Matt Caswell <matt@openssl.org>
Date: Thu, 4 Dec 2014 09:22:50 +0000 (+0000)
Subject: Remove incorrect code inadvertently introduced through commit 59669b6ab.
X-Git-Tag: OpenSSL_1_0_1k~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fcabfc66aeade294c06259c885d4df1eab06b86c;p=oweals%2Fopenssl.git

Remove incorrect code inadvertently introduced through commit 59669b6ab.

Reviewed-by: Tim Hudson <tjh@openssl.org>

Conflicts:
	ssl/d1_lib.c
---

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 39058577e2..14337b31a4 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -280,10 +280,6 @@ long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg)
 		/* Just one protocol version is supported so far;
 		 * fail closed if the version is not as expected. */
 		return s->version == DTLS_MAX_VERSION;
-
-		/* Just one protocol version is supported so far;
-		 * fail closed if the version is not as expected. */
-		return s->version == DTLS_MAX_VERSION;
 	case DTLS_CTRL_SET_LINK_MTU:
 		if (larg < (long)dtls1_link_min_mtu())
 			return 0;