v4.28-9669-beta

SoftEtherVPN · Sep 11, 2018 · abe1945 · abe1945
1 parent c5d56e6
commit abe1945
Show file tree

Hide file tree

Showing 38 changed files with 113 additions and 91 deletions.
diff --git a/BUILD_UNIX.TXT b/BUILD_UNIX.TXT
@@ -53,7 +53,7 @@ After the installation will complete successfully:
 
 - You can also use VPN Server/Client Manager GUI Tool on other Windows PC to
   connect to VPN services remotely.
-  You can download the GUI Tools from http://www.softether-download.com/.
+  You can download the GUI Tools from https://www.softether-download.com/.
 
 
 How to Run SoftEther VPN Server for Test
@@ -74,7 +74,7 @@ $ bin/vpncmd/vpncmd
 
 Or you can also use VPN Server Manager GUI Tool on other Windows PC to
 connect to the VPN Server remotely. You can download the GUI Tool
-from http://www.softether-download.com/.
+from https://www.softether-download.com/.
 
 
 How to Run SoftEther VPN Bridge for Test
@@ -95,7 +95,7 @@ $ bin/vpncmd/vpncmd
 
 Or you can also use VPN Server Manager GUI Tool on other Windows PC to
 connect to the VPN Bridge remotely. You can download the GUI Tool
-from http://www.softether-download.com/.
+from https://www.softether-download.com/.
 
 
 How to Run SoftEther VPN Client for Test
@@ -116,10 +116,10 @@ $ bin/vpncmd/vpncmd
 
 Or you can also use VPN Client Manager GUI Tool on other Windows PC to
 connect to the VPN Client remotely. You can download the GUI Tool
-from http://www.softether-download.com/.
+from https://www.softether-download.com/.
 
 
 ************************************
 Thank You Using SoftEther VPN !
 By SoftEther VPN Open-Source Project
-http://www.softether.org/
+https://www.softether.org/
diff --git a/BUILD_WINDOWS.TXT b/BUILD_WINDOWS.TXT
@@ -41,4 +41,4 @@ with Visual Studio 2008 to customize. Open "src\SEVPN.sln" and enjoy it.
 ************************************
 Thank You Using SoftEther VPN !
 By SoftEther VPN Open-Source Project
-http://www.softether.org/
+https://www.softether.org/
diff --git a/ChangeLog b/ChangeLog
@@ -2,9 +2,9 @@ ChangeLog of SoftEther VPN
 --------------------------
 
 The ChangeLog of SoftEther VPN is on our web site:
-http://www.softether.org/5-download/history
+https://www.softether.org/5-download/history
 
-(In Japanese: http://ja.softether.org/5-download/history)
+(In Japanese: https://ja.softether.org/5-download/history)
 
 Enjoy it!
 
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -2,9 +2,9 @@ ChangeLog of SoftEther VPN
 --------------------------
 
 The ChangeLog of SoftEther VPN is on our web site:
-http://www.softether.org/5-download/history
+https://www.softether.org/5-download/history
 
-(In Japanese: http://ja.softether.org/5-download/history)
+(In Japanese: https://ja.softether.org/5-download/history)
 
 Enjoy it!
 
diff --git a/LICENSE b/LICENSE
@@ -7,7 +7,7 @@ Copyright (c) Daiyuu Nobori.
 Copyright (c) SoftEther Project at University of Tsukuba, Japan.
 Copyright (c) SoftEther Corporation.
 All Rights Reserved.
-http://www.softether.org/
+https://www.softether.org/
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License version 2 as published by the Free

diff --git a/LICENSE.TXT b/LICENSE.TXT
@@ -7,7 +7,7 @@ Copyright (c) Daiyuu Nobori.
 Copyright (c) SoftEther Project at University of Tsukuba, Japan.
 Copyright (c) SoftEther Corporation.
 All Rights Reserved.
-http://www.softether.org/
+https://www.softether.org/
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License version 2 as published by the Free

diff --git a/README b/README
@@ -1,6 +1,6 @@
 SoftEther VPN (Stable Edition Repository)
 - An Open-Source Cross-platform Multi-protocol VPN Program
-http://www.softether.org/
+https://www.softether.org/
 
 We use GitHub as the primary official SoftEther VPN repository:
 https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/
@@ -11,10 +11,10 @@ Developer Edition Master Repository on
 https://github.com/SoftEtherVPN/SoftEtherVPN
 
 Source code packages (.zip and .tar.gz) and binary files are also available:
-http://www.softether-download.com/
+https://www.softether-download.com/
 
 We accept your patches by the acceptance policy:
-http://www.softether.org/5-download/src/9.patch
+https://www.softether.org/5-download/src/9.patch
 
 Copyright (c) SoftEther Project at University of Tsukuba, Japan.
 
@@ -37,7 +37,7 @@ SoftEther VPN supports most of widely-used VPN protocols
 including SSL-VPN, OpenVPN, IPsec, L2TP, MS-SSTP, L2TPv3 and EtherIP
 by the single SoftEther VPN Server program.
 
-More details on http://www.softether.org/.
+More details on https://www.softether.org/.
 
 
 SOFTETHER VPN ADVANTAGES
@@ -77,18 +77,18 @@ SOFTETHER VPN ADVANTAGES
 - No memory leaks. High quality stable codes, intended for long-term runs.
   We always verify that there are no memory or resource leaks before
   releasing the build.
-- More details at http://www.softether.org/.
+- More details at https://www.softether.org/.
 
 
 GETTING STARTED
 ---------------
 
 Visit the SoftEther VPN Project official web site at first:
-        http://www.softether.org/
+        https://www.softether.org/
 
 If you are not a developer, it is recommended to download the binary
 installers from:
-        http://www.softether-download.com/
+        https://www.softether-download.com/
 
 To build from the source,
 see "BUILD_UNIX.TXT" or "BUILD_WINDOWS.TXT" files.
@@ -97,7 +97,7 @@ see "BUILD_UNIX.TXT" or "BUILD_WINDOWS.TXT" files.
 HOW TO DOWNLOAD THE LATEST SOURCE CODE PACKAGE
 ----------------------------------------------
 
-Go to http://www.softether-download.com/ and you can find the latest
+Go to https://www.softether-download.com/ and you can find the latest
 source-code package file in both .ZIP and .TAR.GZ format.
 
 This is the easiest way to obtain the source code of SoftEther VPN.
@@ -147,7 +147,7 @@ SOURCE CODE CONTRIBUTION
 Your contribution to SoftEther VPN Project is much appreciated.
 Please send patches to us through GitHub.
 Read the SoftEther VPN Patch Acceptance Policy in advance:
-http://www.softether.org/5-download/src/9.patch
+https://www.softether.org/5-download/src/9.patch
 
 
 DEAR SECURITY EXPERTS
@@ -162,7 +162,7 @@ softether-vpn-security [at] softether.org
 
 Please note that the above e-mail address is not a technical support
 inquiry address. If you need technical assistance, please visit
-http://www.softether.org/ and ask your question on the users forum.
+https://www.softether.org/ and ask your question on the users forum.
 
 
 DISCLAIMER

diff --git a/README.TXT b/README.TXT
@@ -1,6 +1,6 @@
 SoftEther VPN (Stable Edition Repository)
 - An Open-Source Cross-platform Multi-protocol VPN Program
-http://www.softether.org/
+https://www.softether.org/
 
 We use GitHub as the primary official SoftEther VPN repository:
 https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/
@@ -11,10 +11,10 @@ Developer Edition Master Repository on
 https://github.com/SoftEtherVPN/SoftEtherVPN
 
 Source code packages (.zip and .tar.gz) and binary files are also available:
-http://www.softether-download.com/
+https://www.softether-download.com/
 
 We accept your patches by the acceptance policy:
-http://www.softether.org/5-download/src/9.patch
+https://www.softether.org/5-download/src/9.patch
 
 Copyright (c) SoftEther Project at University of Tsukuba, Japan.
 
@@ -37,7 +37,7 @@ SoftEther VPN supports most of widely-used VPN protocols
 including SSL-VPN, OpenVPN, IPsec, L2TP, MS-SSTP, L2TPv3 and EtherIP
 by the single SoftEther VPN Server program.
 
-More details on http://www.softether.org/.
+More details on https://www.softether.org/.
 
 
 SOFTETHER VPN ADVANTAGES
@@ -77,18 +77,18 @@ SOFTETHER VPN ADVANTAGES
 - No memory leaks. High quality stable codes, intended for long-term runs.
   We always verify that there are no memory or resource leaks before
   releasing the build.
-- More details at http://www.softether.org/.
+- More details at https://www.softether.org/.
 
 
 GETTING STARTED
 ---------------
 
 Visit the SoftEther VPN Project official web site at first:
-        http://www.softether.org/
+        https://www.softether.org/
 
 If you are not a developer, it is recommended to download the binary
 installers from:
-        http://www.softether-download.com/
+        https://www.softether-download.com/
 
 To build from the source,
 see "BUILD_UNIX.TXT" or "BUILD_WINDOWS.TXT" files.
@@ -97,7 +97,7 @@ see "BUILD_UNIX.TXT" or "BUILD_WINDOWS.TXT" files.
 HOW TO DOWNLOAD THE LATEST SOURCE CODE PACKAGE
 ----------------------------------------------
 
-Go to http://www.softether-download.com/ and you can find the latest
+Go to https://www.softether-download.com/ and you can find the latest
 source-code package file in both .ZIP and .TAR.GZ format.
 
 This is the easiest way to obtain the source code of SoftEther VPN.
@@ -147,7 +147,7 @@ SOURCE CODE CONTRIBUTION
 Your contribution to SoftEther VPN Project is much appreciated.
 Please send patches to us through GitHub.
 Read the SoftEther VPN Patch Acceptance Policy in advance:
-http://www.softether.org/5-download/src/9.patch
+https://www.softether.org/5-download/src/9.patch
 
 
 DEAR SECURITY EXPERTS
@@ -162,7 +162,7 @@ softether-vpn-security [at] softether.org
 
 Please note that the above e-mail address is not a technical support
 inquiry address. If you need technical assistance, please visit
-http://www.softether.org/ and ask your question on the users forum.
+https://www.softether.org/ and ask your question on the users forum.
 
 
 DISCLAIMER

diff --git a/src/BUILD_UNIX.TXT b/src/BUILD_UNIX.TXT
@@ -53,7 +53,7 @@ After the installation will complete successfully:
 
 - You can also use VPN Server/Client Manager GUI Tool on other Windows PC to
   connect to VPN services remotely.
-  You can download the GUI Tools from http://www.softether-download.com/.
+  You can download the GUI Tools from https://www.softether-download.com/.
 
 
 How to Run SoftEther VPN Server for Test
@@ -74,7 +74,7 @@ $ bin/vpncmd/vpncmd
 
 Or you can also use VPN Server Manager GUI Tool on other Windows PC to
 connect to the VPN Server remotely. You can download the GUI Tool
-from http://www.softether-download.com/.
+from https://www.softether-download.com/.
 
 
 How to Run SoftEther VPN Bridge for Test
@@ -95,7 +95,7 @@ $ bin/vpncmd/vpncmd
 
 Or you can also use VPN Server Manager GUI Tool on other Windows PC to
 connect to the VPN Bridge remotely. You can download the GUI Tool
-from http://www.softether-download.com/.
+from https://www.softether-download.com/.
 
 
 How to Run SoftEther VPN Client for Test
@@ -116,10 +116,10 @@ $ bin/vpncmd/vpncmd
 
 Or you can also use VPN Client Manager GUI Tool on other Windows PC to
 connect to the VPN Client remotely. You can download the GUI Tool
-from http://www.softether-download.com/.
+from https://www.softether-download.com/.
 
 
 ************************************
 Thank You Using SoftEther VPN !
 By SoftEther VPN Open-Source Project
-http://www.softether.org/
+https://www.softether.org/
diff --git a/src/BUILD_WINDOWS.TXT b/src/BUILD_WINDOWS.TXT
@@ -41,4 +41,4 @@ with Visual Studio 2008 to customize. Open "src\SEVPN.sln" and enjoy it.
 ************************************
 Thank You Using SoftEther VPN !
 By SoftEther VPN Open-Source Project
-http://www.softether.org/
+https://www.softether.org/
diff --git a/src/BuildUtil/UnixBuildSoftwares.cs b/src/BuildUtil/UnixBuildSoftwares.cs
@@ -648,11 +648,16 @@ public virtual StringWriter GenerateMakeFileForRelease(string srcDir)
 				sr.WriteLine("\t-ranlib lib/{0}", Path.GetFileName(filename));
 			}
 
+			bool no_pie_first = false;
 			bool try_no_pie = false;
 
-			if (this.Os == OSList.Linux && (this.Cpu == CpuList.x86 || this.Cpu == CpuList.x64 || this.Cpu == CpuList.intel))
+			if (this.Os == OSList.Linux)
 			{
 				try_no_pie = true;
+				if (this.Cpu == CpuList.x86 || this.Cpu == CpuList.x64 || this.Cpu == CpuList.intel)
+				{
+					no_pie_first = true;
+				}
 			}
 
 			sr.WriteLine("\t-ranlib code/{0}.a", this.Software.ToString());
@@ -663,17 +668,32 @@ public virtual StringWriter GenerateMakeFileForRelease(string srcDir)
 			}
 			else
 			{
-				sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0} || $(CC) -no-pie code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
+				if (no_pie_first == false)
+				{
+					sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0} || $(CC) -no-pie code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
+				}
+				else
+				{
+					sr.WriteLine("\t$(CC) -no-pie code/{0}.a $(OPTIONS) -o {0} || $(CC) code/{0}.a $(OPTIONS) -o {0}", this.Software.ToString());
+				}
 			}
 
 			sr.WriteLine("\t-ranlib code/{0}.a", "vpncmd");
+
 			if (try_no_pie == false)
 			{
 				sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
 			}
 			else
 			{
-				sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0} || $(CC) -no-pie code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
+				if (no_pie_first == false)
+				{
+					sr.WriteLine("\t$(CC) code/{0}.a $(OPTIONS) -o {0} || $(CC) -no-pie code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
+				}
+				else
+				{
+					sr.WriteLine("\t$(CC) -no-pie code/{0}.a $(OPTIONS) -o {0} || $(CC) code/{0}.a $(OPTIONS) -o {0}", "vpncmd");
+				}
 			}
 
 			if (this.Software == Software.vpnserver_vpnbridge || this.Software == Software.vpnbridge || this.Software == Software.vpnserver)

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
@@ -135,10 +135,10 @@
 
 
 // Version number
-#define	CEDAR_VER					427
+#define	CEDAR_VER					428
 
 // Build Number
-#define	CEDAR_BUILD					9668
+#define	CEDAR_BUILD					9669
 
 // Beta number
 //#define	BETA_NUMBER					3
@@ -158,11 +158,11 @@
 
 // Specifies the build date
 #define	BUILD_DATE_Y		2018
-#define	BUILD_DATE_M		5
-#define	BUILD_DATE_D		29
-#define	BUILD_DATE_HO		21
-#define	BUILD_DATE_MI		19
-#define	BUILD_DATE_SE		40
+#define	BUILD_DATE_M		9
+#define	BUILD_DATE_D		11
+#define	BUILD_DATE_HO		11
+#define	BUILD_DATE_MI		48
+#define	BUILD_DATE_SE		34
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

diff --git a/src/Cedar/IPsec_IkePacket.c b/src/Cedar/IPsec_IkePacket.c
@@ -2983,6 +2983,7 @@ void IkeHMac(IKE_HASH *h, void *dst, void *key, UINT key_size, void *data, UINT
 	{
 		case IKE_HASH_SHA1_ID:
 		case IKE_HASH_SHA2_256_ID:
+		case IKE_HASH_MD5_ID:
 			hmac_block_size = HMAC_BLOCK_SIZE;
 			break;
 

diff --git a/src/Cedar/Virtual.c b/src/Cedar/Virtual.c
@@ -5009,7 +5009,7 @@ void PollingNatTcp(VH *v, NAT_ENTRY *n)
 			if (n->TcpFinished)
 			{
 				// Disconnect if all data transmission has completed
-				if (n->SendFifo->size == 0)
+				if (n->SendFifo->size == 0 && n->RecvFifo->size == 0)
 				{
 					n->TcpStatus = NAT_TCP_SEND_RESET;
 				}