From 67c433e601181bbc3b254730070faf943094a004 Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Sat, 31 Oct 2020 23:32:57 +0500
Subject: [PATCH] Revert "Add Tls_Disable1_3 (Import v4 change)"

---
 src/Cedar/Server.c    | 2 --
 src/Mayaqua/Network.c | 7 -------
 src/Mayaqua/Network.h | 1 -
 3 files changed, 10 deletions(-)

diff --git a/src/Cedar/Server.c b/src/Cedar/Server.c
index fcd0c2bd..eb4f6a21 100644
--- a/src/Cedar/Server.c
+++ b/src/Cedar/Server.c
@@ -5930,7 +5930,6 @@ void SiLoadServerCfg(SERVER *s, FOLDER *f)
 		c->SslAcceptSettings.Tls_Disable1_0 = CfgGetBool(f, "Tls_Disable1_0");
 		c->SslAcceptSettings.Tls_Disable1_1 = CfgGetBool(f, "Tls_Disable1_1");
 		c->SslAcceptSettings.Tls_Disable1_2 = CfgGetBool(f, "Tls_Disable1_2");
-		c->SslAcceptSettings.Tls_Disable1_3 = CfgGetBool(f, "Tls_Disable1_3");
 
 		s->StrictSyslogDatetimeFormat = CfgGetBool(f, "StrictSyslogDatetimeFormat");
 
@@ -6255,7 +6254,6 @@ void SiWriteServerCfg(FOLDER *f, SERVER *s)
 		CfgAddBool(f, "Tls_Disable1_0", c->SslAcceptSettings.Tls_Disable1_0);
 		CfgAddBool(f, "Tls_Disable1_1", c->SslAcceptSettings.Tls_Disable1_1);
 		CfgAddBool(f, "Tls_Disable1_2", c->SslAcceptSettings.Tls_Disable1_2);
-		CfgAddBool(f, "Tls_Disable1_3", c->SslAcceptSettings.Tls_Disable1_3);
 		CfgAddInt(f, "DhParamBits", c->DhParamBits);
 
 		// Disable session reconnect
diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c
index bbe4b1ad..b9c268e5 100644
--- a/src/Mayaqua/Network.c
+++ b/src/Mayaqua/Network.c
@@ -12147,13 +12147,6 @@ bool StartSSLEx(SOCK *sock, X *x, K *priv, UINT ssl_timeout, char *sni_hostname)
 			}
 #endif	// SSL_OP_NO_TLSv1_2
 
-#ifdef	SSL_OP_NO_TLSv1_3
-			if (sock->SslAcceptSettings.Tls_Disable1_3)
-			{
-				SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_TLSv1_3);
-			}
-#endif	// SSL_OP_NO_TLSv1_3
-
 			Unlock(openssl_lock);
 			AddChainSslCertOnDirectory(ssl_ctx);
 			Lock(openssl_lock);
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h
index 8f1a44f2..90b5e95c 100644
--- a/src/Mayaqua/Network.h
+++ b/src/Mayaqua/Network.h
@@ -147,7 +147,6 @@ struct SSL_ACCEPT_SETTINGS
 	bool Tls_Disable1_0;
 	bool Tls_Disable1_1;
 	bool Tls_Disable1_2;
-	bool Tls_Disable1_3;
 };
 
 // Socket