v4.28-9669-beta

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/

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/

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!
 

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!
 

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

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

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

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

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/

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/

src/BuildUtil/UnixBuildSoftwares.cs

@@ -648,11 +648,16 @@ namespace BuildUtil
 				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 @@ namespace BuildUtil
 			}
 			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)

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)

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;
 

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;
 				}

src/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!
 

src/CurrentBuild.txt

@@ -1,4 +1,4 @@
-BUILD_NUMBER 9668
-VERSION 427
+BUILD_NUMBER 9669
+VERSION 428
 BUILD_NAME beta
-BUILD_DATE 20180529_211940
+BUILD_DATE 20180911_114834

src/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

src/Mayaqua/Network.c

@@ -13222,6 +13222,7 @@ bool StartSSLEx(SOCK *sock, X *x, K *priv, bool client_tls, UINT ssl_timeout, ch
 		sock->CipherName = CopyStr((char *)SSL_get_cipher(sock->ssl));
 	}
 	Unlock(openssl_lock);
+	Debug("SSL connected with %s\n", SSL_get_version(sock->ssl));
 
 	Unlock(sock->ssl_lock);
 

src/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

src/bin/hamcore/eula.txt

@@ -4,7 +4,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 Software Foundation.
 

src/bin/hamcore/strtable_cn.stb

@@ -185,7 +185,7 @@ ERR_119						VPN Server 上没有注册有效的产品许可证。请与 VPN Ser
 ERR_120						VPN Server 作为群集运行所需要的许可证未注册。请与 VPN Server 的管理员。
 ERR_121						VPN 连接设置已使用“Web 安装程序创建工具包”或“简单安装程序创建工具包”安装。目标服务器版本不支持支持 SoftEther VPN 的 2.0 管理包。请与系统管理员或安装程序创建者联系。
 ERR_122						与 VPN Server SDK for .NET，它只能连接到 SoftEther VPN Server 版本，支持 SoftEther VPN 的 2.0 管理包。 VPN Server 的目标不是一个版本，支持 SoftEther VPN 的 2.0 管理包。与系统管理员联系。
-ERR_123						试用版软件在目标服务器上已过期。联系服务器的系统管理员以下载新的测试版或从 http://www.softether.com/ 下载完整版本。
+ERR_123						试用版软件在目标服务器上已过期。联系服务器的系统管理员以下载新的测试版或从 https://www.softether.com/ 下载完整版本。
 
 # ----- 不完全翻訳ここから -----
 ERR_124						至 VPN Server 的 VPN 连接在服务器端被拒绝。
@@ -193,7 +193,7 @@ ERR_125						至 VPN Server 的 VPN 连接在客户端被拒绝。
 ERR_126						因为一段时期已经过去，安全策略强制执行自动断开了 VPN 会话。如果你想继续，请再次连接。
 ERR_127						VPN Server 需要特殊版本的 VPN Client 软件。请咨询您的管理员。
 ERR_128						注册用户对象的数量超过了 VPN Server 上产品许可证允许的最大数量。您不能再添加用户对象了，除非你删除旧的用户或升级到产品的更高版本。
-ERR_129						认购合同在 VPN Server 的、这个版本的、发布日期前已经到期。客户在此认购合同期内被授权使用 VPN Server的版本，。客户应延长认购期。客户也能“降级” VPN Server 的版本，至认购结束前发布的老版本。如果您想降级版本，旧版本在 http://www.softether.com/
+ERR_129						认购合同在 VPN Server 的、这个版本的、发布日期前已经到期。客户在此认购合同期内被授权使用 VPN Server的版本，。客户应延长认购期。客户也能“降级” VPN Server 的版本，至认购结束前发布的老版本。如果您想降级版本，旧版本在 https://www.softether.com/
 # ----- 不完全翻訳ここまで -----
 ERR_130						试用许可证密钥恐怕不能频繁地被相同的客户获取。请考虑购买的正式版。
 ERR_131						几个在同一 IP 地址的 VPN Server。您可以指定目标服务器的私有 IP 地址或具体的主机名，如“全球 IP 地址或主机名/192.168.x.x”。如果服务器端使用 NAT，配置 NAT 为打开、转发或转让相应的端口。
@@ -451,7 +451,7 @@ WINVER_ERROR_PC_REMOTE		远程服务器
 
 
 # 开源版本的警告
-OSS_MSG						欢迎来到 SoftEther VPN 服务器学术版 !\r\n\r\n此 VPN 服务器作为日本筑波大学的一个学术研究由免费软件开发的，且由，开源 (GPL) SoftEther 项目 (http://www.softether.org/) 为公众利益免费发布的。\r\n\r\nSoftEther VPN 软件是作为筑波大学和 SoftEther 公司之间的联合研究合同的一部分而发布给公众的。SoftEther VPN 软件的开发和发布仅为学术研究目的。因此，对 SoftEther VPN 软件不提供支持服务，即使它包含错误或漏洞。用户将对使用 SoftEther VPN 的结果承担责任。 SoftEther VPN 的开发者和发行者都将永远不会为任何后果或损失承担责任。\r\n\r\n在您同意上述启示后，使用 SoftEther VPN 服务器享受 VPN 通信。\r\n\r\n对于 SoftEther VPN 的更多细节，请参阅 http://www.softether.org/。\r\n\r\n
+OSS_MSG						欢迎来到 SoftEther VPN 服务器学术版 !\r\n\r\n此 VPN 服务器作为日本筑波大学的一个学术研究由免费软件开发的，且由，开源 (GPL) SoftEther 项目 (https://www.softether.org/) 为公众利益免费发布的。\r\n\r\nSoftEther VPN 软件是作为筑波大学和 SoftEther 公司之间的联合研究合同的一部分而发布给公众的。SoftEther VPN 软件的开发和发布仅为学术研究目的。因此，对 SoftEther VPN 软件不提供支持服务，即使它包含错误或漏洞。用户将对使用 SoftEther VPN 的结果承担责任。 SoftEther VPN 的开发者和发行者都将永远不会为任何后果或损失承担责任。\r\n\r\n在您同意上述启示后，使用 SoftEther VPN 服务器享受 VPN 通信。\r\n\r\n对于 SoftEther VPN 的更多细节，请参阅 http://www.softether.org/。\r\n\r\n
 
 
 # NAT Traversal warning
@@ -2328,7 +2328,7 @@ S_RETRY_NUM_2				次
 S_RETRY_SPAN_1				重连间隔(&K):
 S_RETRY_SPAN_2				秒
 R_INFINITE					无限重连(总是保持 VPN 在线) (&I)
-R_NOTLS1					不要使用 TLS &1.0
+R_NOTLS1					使用 SSL 3.0 (&1)
 B_DETAIL					高级设置(&D)...
 IDOK						确定(&O)
 IDCANCEL					取消
@@ -2449,9 +2449,9 @@ STATIC7						保持互联网连接功能(&K)
 
 PREFIX						D_ABOUT
 S_INFO1					SoftEther VPN %u.0 (Ver %u.%02u, Build %u)
-S_INFO2				Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
+S_INFO2				Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: https://www.softether.org/\r\n%S
 S_INFO3					This product includes the following software components:\r\nBitVisor: Copyright (c) 2007, 2008 University of Tsukuba. Copyright (C) 2007, 2008 National Institute of Information and Communications Technology. All rights reserved. / Microsoft(R) C Runtime Library: (c) 2007 Microsoft Corporation. All Rights Reserved. / PKCS #11 Cryptographic Token Interface (Cryptoki): Copyright (c) RSA Security Inc. / WinPcap: Copyright (c) 2001 - 2003 NetGroup, Politecnico di Torino (Italy). All rights reserved. / libedit: Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. / libiconv: Copyright (C) 2007 Free Software Foundation, Inc. / ncurses: Copyright (c) 1998-2005, 2006 Free Software Foundation, Inc. / OpenSSL: Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic software written by Eric Young ([email protected]). / zlib: (C) 1995-2004 Jean-loup Gailly and Mark Adler. / Special Thanks to: Software Laboratory, Academic Computing Communication Center, Industrial Liaison and Cooperative Research Center and Professor Yasushi Shinjo in University of Tsukuba, Japan.
-S_INFO4				此 VPN 服务器作为的一个学术研究且由 (http://www.softether.org/) 为公众利益免费发布的。本软件是日本筑波大学 SoftEther 项目下开发的免费软件，无任何担保。开发人员、版权所有者或分销商在任何情况下对于使用本软件的任何索赔、损害赔偿或其他情况不承担责任。\r\n\r\nSoftEther VPN 是日本政府的研究和开发项目的一项工作，由日本的经济、贸易和工业部资助，由信息化推进机构管理。
+S_INFO4				此 VPN 服务器作为的一个学术研究且由 (https://www.softether.org/) 为公众利益免费发布的。本软件是日本筑波大学 SoftEther 项目下开发的免费软件，无任何担保。开发人员、版权所有者或分销商在任何情况下对于使用本软件的任何索赔、损害赔偿或其他情况不承担责任。\r\n\r\nSoftEther VPN 是日本政府的研究和开发项目的一项工作，由日本的经济、贸易和工业部资助，由信息化推进机构管理。
 IDCANCEL				确定(&O)
 B_WEB 访问				SoftEther VPN 和网站 (&W)...
 B_EULA					最终用户许可

src/bin/hamcore/strtable_en.stb

@@ -448,7 +448,7 @@ WINVER_ERROR_PC_REMOTE	the remote server
 
 
 # Warning for Open-source Version
-OSS_MSG					Welcome to the SoftEther VPN Server Academic Version!\r\n\r\n\r\nThis VPN Server is open-source free software developed as academic research at University of Tsukuba, Japan, and distributed from the SoftEther VPN Project (http://www.softether.org/), for free of charge for the public interests.\r\n\r\nSoftEther VPN software is distributed to public as a part of the joint-research contract between University of Tsukuba and SoftEther VPN Project. SoftEther VPN software is developed and published for JUST AN ACADEMIC RESEARCH PURPOSE. Therefore no support service are provided about SoftEther VPN software even if it contains bugs or vulnerabilities. A user will be liable for the result of use SoftEther VPN. The developers and publishers of SoftEther VPN will never be liable for either any consequences or damages.\r\n\r\nEnjoy using VPN with SoftEther VPN Server.\r\n\r\nFor more details of SoftEther VPN, visit http://www.softether.org/.\r\n\r\n
+OSS_MSG					Welcome to the SoftEther VPN Server Academic Version!\r\n\r\n\r\nThis VPN Server is open-source free software developed as academic research at University of Tsukuba, Japan, and distributed from the SoftEther VPN Project (https://www.softether.org/), for free of charge for the public interests.\r\n\r\nSoftEther VPN software is distributed to public as a part of the joint-research contract between University of Tsukuba and SoftEther VPN Project. SoftEther VPN software is developed and published for JUST AN ACADEMIC RESEARCH PURPOSE. Therefore no support service are provided about SoftEther VPN software even if it contains bugs or vulnerabilities. A user will be liable for the result of use SoftEther VPN. The developers and publishers of SoftEther VPN will never be liable for either any consequences or damages.\r\n\r\nEnjoy using VPN with SoftEther VPN Server.\r\n\r\nFor more details of SoftEther VPN, visit http://www.softether.org/.\r\n\r\n
 NATT_MSG				** Connected with NAT traversal - might be unstable **\r\n\r\nThis VPN Client is connected to the VPN Server '%S' by using the NAT Traversal (UDP Hole Punching) technology.\r\n\r\nNAT Traversal allows the VPN Server behind the NAT-box to accept VPN connections from VPN Client without any port-forwarding setting on the NAT-box.\r\n\r\nHowever, NAT Traversal-based VPN sessions sometimes become unstable, because NAT Traversal uses UDP-based protocol. For example, the VPN tunnel disconnects every 5 minutes if there is a poor NAT-box between the VPN Server and the VPN Client. Some large-scale NAT gateways in cheap ISPs sometimes cause the same problem on NAT Traversal. This is a problem of routers or ISPs. This is not a problem of SoftEther VPN software.\r\n\r\nTo solve the unstable tunnel problem, you should connect to the VPN Server's TCP listener port directly, instead of using NAT Traversal. To connect to the VPN Server directly by using TCP, a listener port of the VPN Server must be exposed to the Internet by a port-forward setting on the NAT-box. Ask the administrator of the NAT-box, or refer to the manual of the NAT-box to add a port-forwarding setting on the NAT-box.\r\n\r\nIf this message still remains despite the VPN Server is exposing a TCP port to the Internet, check the "Disable NAT-T" checkbox on the VPN Client connection setting screen.\r\n\r\n
 NATT_MSG2				** Connected with NAT traversal - might be unstable **\r\n\r\nThis VPN Client is connected to the VPN Server '%S' by using the NAT Traversal (UDP Hole Punching) technology.\r\n\r\nNAT Traversal allows the VPN Server behind the NAT-box to accept VPN connections from VPN Client without any port-forwarding setting on the NAT-box.\r\n\r\nHowever, NAT Traversal-based VPN sessions sometimes become unstable, because NAT Traversal uses UDP-based protocol. For example, the VPN tunnel disconnects every 5 minutes if there is a poor NAT-box between the VPN Server and the VPN Client. Some large-scale NAT gateways in cheap ISPs sometimes cause the same problem on NAT Traversal. This is a problem of routers or ISPs. This is not a problem of SoftEther VPN software.\r\n\r\nTo solve the unstable tunnel problem, you should connect to the VPN Server's TCP listener port directly, instead of using NAT Traversal. To connect to the VPN Server directly by using TCP, a listener port of the VPN Server must be exposed to the Internet by a port-forward setting on the NAT-box. Ask the administrator of the NAT-box, or refer to the manual of the NAT-box to add a port-forwarding setting on the NAT-box.\r\n\r\nIf this message still remains despite the VPN Server is exposing a TCP port to the Internet, check the "Disable NAT-T" checkbox on the VPN Client connection setting screen after upgrading the VPN Client to Build 9428 or later.\r\n\r\n
 
@@ -2308,7 +2308,7 @@ S_RETRY_NUM_2			times
 S_RETRY_SPAN_1			Reconnect Interval:
 S_RETRY_SPAN_2			seconds
 R_INFINITE				&Infinite Reconnects (Keep VPN Always Online)
-R_NOTLS1				Do not use TLS &1.0
+R_NOTLS1				Use SSL 3.0 (&1) 
 B_DETAIL				A&dvanced Settings...
 IDOK					&OK
 IDCANCEL				Cancel
@@ -2429,7 +2429,7 @@ STATIC7					&Keep Alive Internet Connection Function:
 
 PREFIX					D_ABOUT
 S_INFO1					SoftEther VPN %u.0 (Ver %u.%02u, Build %u)
-S_INFO2				Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
+S_INFO2				Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: https://www.softether.org/\r\n%S
 S_INFO3					This product includes the following software components:\r\nBitVisor: Copyright (c) 2007, 2008 University of Tsukuba. Copyright (C) 2007, 2008 National Institute of Information and Communications Technology. All rights reserved. / Microsoft(R) C Runtime Library: (c) 2007 Microsoft Corporation. All Rights Reserved. / PKCS #11 Cryptographic Token Interface (Cryptoki): Copyright (c) RSA Security Inc. / WinPcap: Copyright (c) 2001 - 2003 NetGroup, Politecnico di Torino (Italy). All rights reserved. / libedit: Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. / libiconv: Copyright (C) 2007 Free Software Foundation, Inc. / ncurses: Copyright (c) 1998-2005, 2006 Free Software Foundation, Inc. / OpenSSL: Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic software written by Eric Young ([email protected]). / zlib: (C) 1995-2004 Jean-loup Gailly and Mark Adler. / Special Thanks to: Software Laboratory, Academic Computing Communication Center, Industrial Liaison and Cooperative Research Center and Professor Yasushi Shinjo in University of Tsukuba, Japan.
 S_INFO4				THIS SOFTWARE IS FREEWARE DEVELOPED UNDER THE SOFTETHER VPN PROJECT AT UNIVERSITY OF TSUKUBA, WITHOUT WARRANTY OF AND KIND. IN NO EVENT SHALL THE DEVELOPERS, COPYRIGHT OWNERS OR DISTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY IN ANY WAY OUT OF THE USE OF THIS SOFTWARE.\r\n\r\nSoftEther VPN is a work of the research and development project of Japanese Government, subsidized by Ministry of Economy, Trade and Industry of Japan, administrated by Information Promotion Agency.
 IDCANCEL				&OK

src/bin/hamcore/strtable_ja.stb

@@ -468,7 +468,7 @@ WINVER_ERROR_PC_REMOTE	接続先のサーバーコンピュータ
 
 
 # オープンソース版に関する警告
-OSS_MSG					はじめに - SoftEther VPN Server について\r\n\r\nこの VPN Server は、筑波大学において学術実験目的で開発され SoftEther プロジェクト http://www.softether.org/ で無償配布されているオープンソースのフリーソフトです。\r\nSoftEther VPN ソフトウェアは国立大学法人筑波大学とソフトイーサ株式会社との共同研究契約の一環として広く公開されているものです。SoftEther VPN ソフトウェアは学術実験目的で開発・公開されております。SoftEther VPN ソフトウェアに含まれる不具合等についてのサポート等は提供されておらず、利用者がすべての責任を負うことになります。本ソフトウェアの開発者・配布者は、SoftEther VPN ソフトウェアの利用の結果、利用者に生じる損失等について、一切責任を負いません。\r\n\r\nこれらのことに合意いただいた上で、SoftEther VPN Server を用いた通信をお楽しみください。\r\n\r\nSoftEther VPN について詳しくは http://www.softether.org/ をご参照ください。\r\n\r\n
+OSS_MSG					はじめに - SoftEther VPN Server について\r\n\r\nこの VPN Server は、筑波大学において学術実験目的で開発され SoftEther プロジェクト https://www.softether.org/ で無償配布されているオープンソースのフリーソフトです。\r\nSoftEther VPN ソフトウェアは国立大学法人筑波大学とソフトイーサ株式会社との共同研究契約の一環として広く公開されているものです。SoftEther VPN ソフトウェアは学術実験目的で開発・公開されております。SoftEther VPN ソフトウェアに含まれる不具合等についてのサポート等は提供されておらず、利用者がすべての責任を負うことになります。本ソフトウェアの開発者・配布者は、SoftEther VPN ソフトウェアの利用の結果、利用者に生じる損失等について、一切責任を負いません。\r\n\r\nこれらのことに合意いただいた上で、SoftEther VPN Server を用いた通信をお楽しみください。\r\n\r\nSoftEther VPN について詳しくは http://www.softether.org/ をご参照ください。\r\n\r\n
 
 
 # NAT Traversal に関する警告
@@ -2313,7 +2313,7 @@ S_RETRY_NUM_2			回
 S_RETRY_SPAN_1			再接続間隔(&K):
 S_RETRY_SPAN_2			秒
 R_INFINITE				無限に再接続を試行する (常時接続) (&I)
-R_NOTLS1				TLS &1.0 を使用しない
+R_NOTLS1				SSL 3.0 を使用する(&1)
 B_DETAIL				高度な通信設定(&N)...
 IDOK					&OK
 IDCANCEL				キャンセル
@@ -2434,7 +2434,7 @@ STATIC7					インターネット接続の維持機能(&N)
 
 PREFIX					D_ABOUT
 S_INFO1					SoftEther VPN %u.0 (Ver %u.%02u, Build %u)
-S_INFO2				Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: http://www.softether.org/\r\n%S
+S_INFO2				Open-Source VPN Software for Academic Purpose, under the GPLv2 License.\r\nCopyright (c) 2012-%u SoftEther Project at University of Tsukuba, Japan. All Rights Reserved.\r\nWeb Site: https://www.softether.org/\r\n%S
 S_INFO3					This product includes the following software components:\r\nBitVisor: Copyright (c) 2007, 2008 University of Tsukuba. Copyright (C) 2007, 2008 National Institute of Information and Communications Technology. All rights reserved. / Microsoft(R) C Runtime Library: (c) 2007 Microsoft Corporation. All Rights Reserved. / PKCS #11 Cryptographic Token Interface (Cryptoki): Copyright (c) RSA Security Inc. / WinPcap: Copyright (c) 2001 - 2003 NetGroup, Politecnico di Torino (Italy). All rights reserved. / libedit: Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. / libiconv: Copyright (C) 2007 Free Software Foundation, Inc. / ncurses: Copyright (c) 1998-2005, 2006 Free Software Foundation, Inc. / OpenSSL: Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). This product includes cryptographic software written by Eric Young ([email protected]). / zlib: (C) 1995-2004 Jean-loup Gailly and Mark Adler. / Special Thanks to: Software Laboratory, Academic Computing Communication Center, Industrial Liaison and Cooperative Research Center and Professor Yasushi Shinjo in University of Tsukuba, Japan.
 S_INFO4				本ソフトウェアは筑波大学 SoftEther VPN プロジェクトで開発されたフリーウェアです。本ソフトウェアは一切の保証がない状態で提供されるものであり、開発および配布元は使用の結果の損害について一切責任を負いません。\r\n\r\nSoftEther VPN ソフトウェアは日本国経済産業省のソフトウェア研究開発プロジェクトの成果物です。IPA (独立行政法人 情報処理推進機構) の未踏ソフトウェア創造事業に採択され開発されました。詳しくは http://www.ipa.go.jp/ をご覧ください。
 IDCANCEL				&OK

src/makefiles/freebsd_32bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/freebsd_64bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/linux_32bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/linux_64bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/macos_32bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/macos_64bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/openbsd_32bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/openbsd_64bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/solaris_32bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/makefiles/solaris_64bit.mak

@@ -4,7 +4,7 @@
 # Copyright (c) 2012-2018 Daiyuu Nobori.
 # 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

src/vpnweb/vpnweb.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Tue May 29 21:19:59 2018
+/* at Tue Sep 11 11:48:58 2018
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)

src/vpnweb/vpnweb_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Tue May 29 21:19:59 2018
+/* at Tue Sep 11 11:48:58 2018
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)

src/vpnweb/vpnweb_p.c

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Tue May 29 21:19:59 2018
+/* at Tue Sep 11 11:48:58 2018
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)