From 0c8481527354cd5324e6b474cbd1cbe8e36ef4e2 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Thu, 18 Jun 2015 22:51:05 +0000
Subject: Remove Microsoft Server Gated Crypto.

Another relic due to the old US crypto policy.

From OpenSSL commit 63eab8a620944a990ab3985620966ccd9f48d681 and
95275599399e277e71d064790a1f828a99fc661a.

ok jsing@ miod@
---
 src/lib/libssl/s3_both.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

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

diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c
index 633bf5bb7b..d9484d77d8 100644
--- a/src/lib/libssl/s3_both.c
+++ b/src/lib/libssl/s3_both.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_both.c,v 1.38 2015/03/27 12:29:54 jsing Exp $ */
+/* $OpenBSD: s3_both.c,v 1.39 2015/06/18 22:51:05 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -450,20 +450,6 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
 			SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_UNEXPECTED_MESSAGE);
 			goto f_err;
 		}
-		if ((mt < 0) && (*p == SSL3_MT_CLIENT_HELLO) &&
-		    (st1 == SSL3_ST_SR_CERT_A) && (stn == SSL3_ST_SR_CERT_B)) {
-			/* At this point we have got an MS SGC second client
-			 * hello (maybe we should always allow the client to
-			 * start a new handshake?). We need to restart the mac.
-			 * Don't increment {num,total}_renegotiations because
-			 * we have not completed the handshake. */
-			if (!ssl3_init_finished_mac(s)) {
-				SSLerr(SSL_F_SSL3_GET_MESSAGE,
-				    ERR_R_MALLOC_FAILURE);
-				goto err;
-			}
-		}
-
 		s->s3->tmp.message_type= *(p++);
 
 		n2l3(p, l);
-- 
cgit v1.2.3-55-g6feb