Added one more patch to configure SSL/TLS on server

3 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8922262771be..b23c83c3ceba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Mar 20 22:24:43 UTC 2016
+# Fri Jul 15 00:54:41 UTC 2016
 pkgbase = softethervpn-git
 	pkgdesc = Multi-protocol VPN software from University of Tsukuba
-	pkgver = v4.19.9605.beta
+	pkgver = v4.21.9613.beta
 	pkgrel = 1
 	url = http://www.softether.org/
 	arch = i686
@@ -15,11 +15,13 @@ pkgbase = softethervpn-git
 	source = softethervpn-bridge.service
 	source = softethervpn-client.service
 	source = softethervpn-server.service
-	source = disable_sslv3.patch
+	source = disable_client_sslv3.patch
+	source = configure_server_ssl_tls.patch::https://patch-diff.githubusercontent.com/raw/SoftEtherVPN/SoftEtherVPN/pull/208.patch
 	sha1sums = 12a3919aabcdd7531320056a4b43072892232925
 	sha1sums = ba594c7defb52548369726c56e2cad633019abef
 	sha1sums = 06cd320553daf0dffdf6a81a22d630fbe211fc33
-	sha1sums = ed10141565efe05dbe7ff9aae713dc4bef84e1c5
+	sha1sums = e3140d60f7805e5f693884a3ea8d3af70d8b2cdf
+	sha1sums = e49d291864ca2735d5c387a5798e666984a3bc6f
 
 pkgname = softethervpn-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e7d43d404ff5..87c46036879c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: ava1ar <mail(at)ava1ar(dot)me>
 
 pkgname=softethervpn-git
-pkgver=v4.19.9605.beta
+pkgver=v4.21.9613.beta
 pkgrel=1
 pkgdesc="Multi-protocol VPN software from University of Tsukuba"
 url="http://www.softether.org/"
@@ -9,11 +9,13 @@ arch=('i686' 'x86_64')
 source=('softethervpn-bridge.service' 
         'softethervpn-client.service' 
         'softethervpn-server.service'
-        'disable_sslv3.patch')
+        'disable_client_sslv3.patch'
+        'configure_server_ssl_tls.patch::https://patch-diff.githubusercontent.com/raw/SoftEtherVPN/SoftEtherVPN/pull/208.patch')
 sha1sums=('12a3919aabcdd7531320056a4b43072892232925'
           'ba594c7defb52548369726c56e2cad633019abef'
           '06cd320553daf0dffdf6a81a22d630fbe211fc33'
-          'ed10141565efe05dbe7ff9aae713dc4bef84e1c5')
+          'e3140d60f7805e5f693884a3ea8d3af70d8b2cdf'
+          'e49d291864ca2735d5c387a5798e666984a3bc6f')
 license=('GPL2')
 depends=('bash' 'openssl' 'zlib')
 makedepends=('git')
@@ -40,8 +42,12 @@ build() {
     cp src/makefiles/linux_64bit.mak Makefile
   fi
 
-  # small patch to disable SSLv3
-  patch --binary -p1 < "${srcdir}"/disable_sslv3.patch
+  # Patches
+
+  # Disable client SSLv3
+  patch --binary -p1 < "${srcdir}"/disable_client_sslv3.patch
+  # Allow specific SSL/TLS versions to be disabled: https://github.com/SoftEtherVPN/SoftEtherVPN/pull/208
+  patch --binary -p1 < "${srcdir}"/configure_server_ssl_tls.patch
 
   make
 }
diff --git a/disable_sslv3.patch b/disable_client_sslv3.patch
index 714870acda16..8e9f28591d07 100644
--- a/disable_sslv3.patch
+++ b/disable_client_sslv3.patch
@@ -1,6 +1,6 @@
 --- a/src/Mayaqua/Network.c	2016-03-20 13:37:38.829534634 -0400

 +++ b/src/Mayaqua/Network.c	2016-03-20 13:37:28.079218703 -0400

-@@ -12981,14 +12981,14 @@

+@@ -12981,14 +12981,7 @@

  		}

  		else

  		{

@@ -10,15 +10,8 @@
 -			}

 -			else

 -			{

-+			//if (client_tls == false)

-+			//{

-+			//	SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());

-+			//}

-+			//else

-+			//{

  				SSL_CTX_set_ssl_version(ssl_ctx, TLSv1_client_method());

 -			}

-+			//}

  		}

  		sock->ssl = SSL_new(ssl_ctx);

  		SSL_set_fd(sock->ssl, (int)sock->socket);