6 files changed, 16 insertions, 58 deletions

diff --git a/security/softether/Makefile b/security/softether/Makefile
index e2acd1caa4d7..f8baa5179d73 100644
--- a/security/softether/Makefile
+++ b/security/softether/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	softether
-DISTVERSION=	4.25-9656
-PORTREVISION=	2
+DISTVERSION=	4.29-9680
 CATEGORIES=	security
-MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2018.01.15-tree/Source_Code/
+MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2019.02.28-tree/Source_Code/
 DISTNAME=	${PORTNAME}-src-v${DISTVERSION}-rtm
 
 MAINTAINER=	meta@FreeBSD.org
diff --git a/security/softether/distinfo b/security/softether/distinfo
index c3c6f8c0dc02..4622470ebd80 100644
--- a/security/softether/distinfo
+++ b/security/softether/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517525651
-SHA256 (softether-src-v4.25-9656-rtm.tar.gz) = b946dec3da5833ad2be69125224784b8a8e2a4149297d0c0a907ba0e1c4535f8
-SIZE (softether-src-v4.25-9656-rtm.tar.gz) = 33743898
+TIMESTAMP = 1551353603
+SHA256 (softether-src-v4.29-9680-rtm.tar.gz) = e6035fa7d9aaf59bdb342cd7ab5ecfdff89811a875f62a3230208cdc8a4e26e4
+SIZE (softether-src-v4.29-9680-rtm.tar.gz) = 33759397
diff --git a/security/softether/files/patch-chain-certs-dir b/security/softether/files/patch-chain-certs-dir
index 7a962c115e04..758211b25fa6 100644
--- a/security/softether/files/patch-chain-certs-dir
+++ b/security/softether/files/patch-chain-certs-dir
@@ -1,6 +1,6 @@
---- src/Cedar/Protocol.c.orig	2019-02-03 19:43:50 UTC
+--- src/Cedar/Protocol.c.orig	2019-02-28 08:10:54 UTC
 +++ src/Cedar/Protocol.c
-@@ -58,7 +58,7 @@ bool TryGetRootCertChain(LIST *o, X *x, bool auto_save
+@@ -164,7 +164,7 @@ bool TryGetRootCertChain(LIST *o, X *x, bool auto_save
  		wchar_t exedir[MAX_SIZE];
  
  		GetExeDirW(exedir, sizeof(exedir));
@@ -9,7 +9,7 @@
  		MakeDirExW(dirname);
  
  		if (auto_save)
-@@ -365,7 +365,7 @@ void AddAllChainCertsToCertList(LIST *o)
+@@ -471,7 +471,7 @@ void AddAllChainCertsToCertList(LIST *o)
  
  	GetExeDirW(exedir, sizeof(exedir));
  
@@ -18,9 +18,9 @@
  
  	MakeDirExW(dirname);
  
---- src/Mayaqua/Network.c.orig	2019-02-03 19:43:50 UTC
+--- src/Mayaqua/Network.c.orig	2019-02-28 08:10:54 UTC
 +++ src/Mayaqua/Network.c
-@@ -11520,7 +11520,7 @@ void AddChainSslCertOnDirectory(struct ssl_ctx_st *ctx
+@@ -12821,7 +12821,7 @@ void AddChainSslCertOnDirectory(struct ssl_ctx_st *ctx
  
  	GetExeDirW(exedir, sizeof(exedir));
  
diff --git a/security/softether/files/patch-fix-build-openssl111 b/security/softether/files/patch-fix-build-openssl111
deleted file mode 100644
index a7a9608c576f..000000000000
--- a/security/softether/files/patch-fix-build-openssl111
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Mayaqua/Encrypt.c.orig	2018-11-06 08:15:31 UTC
-+++ src/Mayaqua/Encrypt.c
-@@ -2684,7 +2684,7 @@ bool RsaCheck()
- 	BIO *bio;
- 	char errbuf[MAX_SIZE];
- 	UINT size = 0;
--	UINT bit = 32;
-+	UINT bit = RSA_KEY_SIZE;
- 	// Validate arguments
- 
- 	// Key generation
---- src/Mayaqua/Encrypt.h.orig	2018-11-06 08:15:31 UTC
-+++ src/Mayaqua/Encrypt.h
-@@ -128,7 +128,7 @@ void RAND_Free_For_SoftEther();
- #define	DES_IV_SIZE					8			// DES IV size
- #define DES_BLOCK_SIZE				8			// DES block size
- #define DES3_KEY_SIZE				(8 * 3)		// 3DES key size
--#define RSA_KEY_SIZE				128			// RSA key size
-+#define RSA_KEY_SIZE				4096			// RSA key size
- #define DH_KEY_SIZE					128			// DH key size
- #define	RSA_MIN_SIGN_HASH_SIZE		(15 + SHA1_HASH_SIZE)	// Minimum RSA hash size
- #define	RSA_SIGN_HASH_SIZE			(RSA_MIN_SIGN_HASH_SIZE)	// RSA hash size
diff --git a/security/softether/files/patch-piddir b/security/softether/files/patch-piddir
index c8375df27fcc..6ea950e852cb 100644
--- a/security/softether/files/patch-piddir
+++ b/security/softether/files/patch-piddir
@@ -1,6 +1,6 @@
---- src/Mayaqua/Unix.c.orig	2019-02-03 19:43:50 UTC
+--- src/Mayaqua/Unix.c.orig	2019-02-28 08:10:54 UTC
 +++ src/Mayaqua/Unix.c
-@@ -774,7 +774,7 @@ void *UnixNewSingleInstance(char *instance_name)
+@@ -927,7 +927,7 @@ void *UnixNewSingleInstance(char *instance_name)
  	GetExeDir(dir, sizeof(dir));
  
  	// File name generation
@@ -9,8 +9,8 @@
  
  	fd = open(name, O_WRONLY);
  	if (fd == -1)
-@@ -2194,7 +2194,7 @@ void UnixGenPidFileName(char *name, UINT size)
- 	Md5(hash, exe_name, StrLen(exe_name));
+@@ -2385,7 +2385,7 @@ void UnixGenPidFileName(char *name, UINT size)
+ 	Hash(hash, exe_name, StrLen(exe_name), false);
  	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
  
 -	Format(name, size, "%s/.pid_%s", dir, tmp1);
@@ -18,8 +18,8 @@
  }
  
  // Delete the PID file
-@@ -2239,7 +2239,7 @@ void UnixGenCtlFileName(char *name, UINT size)
- 	Md5(hash, exe_name, StrLen(exe_name));
+@@ -2430,7 +2430,7 @@ void UnixGenCtlFileName(char *name, UINT size)
+ 	Hash(hash, exe_name, StrLen(exe_name), false);
  	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
  
 -	Format(name, size, "%s/.ctl_%s", dir, tmp1);
diff --git a/security/softether/files/patch-src__Mayaqua__Network.c b/security/softether/files/patch-src__Mayaqua__Network.c
deleted file mode 100644
index 21cc6ec639e5..000000000000
--- a/security/softether/files/patch-src__Mayaqua__Network.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Mayaqua/Network.c.orig	2016-05-03 06:16:53 UTC
-+++ src/Mayaqua/Network.c
-@@ -13025,10 +13025,15 @@
- 		{
- 			if (client_tls == false)
- 			{
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#ifndef OPENSSL_NO_SSL3
- 				SSL_CTX_set_ssl_version(ssl_ctx, SSLv3_method());
- #else
- 				SSL_CTX_set_ssl_version(ssl_ctx, SSLv23_method());
-+				SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_TLSv1
-+#ifdef SSL_OP_NO_TLSv1_2
-+				| SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2
-+#endif
-+				);
- #endif
- 			}
- 			else