v4.41-9782-betav4.41-9782-beta

48 files changed, 207 insertions, 64 deletions

diff --git a/src/BuildFiles/Library/OpenSSL_Build_ID.txt b/src/BuildFiles/Library/OpenSSL_Build_ID.txt
index 7bb77537..96c3c49e 100644
--- a/src/BuildFiles/Library/OpenSSL_Build_ID.txt
+++ b/src/BuildFiles/Library/OpenSSL_Build_ID.txt
@@ -1 +1 @@
-crosslib_win32_v2_220323_01

+crosslib_win32_v3_221102_01

diff --git a/src/BuildFiles/Library/Win32_Debug/libeay32.lib b/src/BuildFiles/Library/Win32_Debug/libeay32.lib
deleted file mode 100644
index dd73258e..00000000
--- a/src/BuildFiles/Library/Win32_Debug/libeay32.lib
+++ /dev/null
diff --git a/src/BuildFiles/Library/Win32_Debug/libintelaes.lib b/src/BuildFiles/Library/Win32_Debug/libintelaes.lib
deleted file mode 100644
index 12fb8a01..00000000
--- a/src/BuildFiles/Library/Win32_Debug/libintelaes.lib
+++ /dev/null
diff --git a/src/BuildFiles/Library/Win32_Debug/ssleay32.lib b/src/BuildFiles/Library/Win32_Debug/ssleay32.lib
deleted file mode 100644
index f1364628..00000000
--- a/src/BuildFiles/Library/Win32_Debug/ssleay32.lib
+++ /dev/null
diff --git a/src/BuildFiles/Library/Win32_Debug/zlib.lib b/src/BuildFiles/Library/Win32_Debug/zlib.lib
deleted file mode 100644
index 19b6c0b4..00000000
--- a/src/BuildFiles/Library/Win32_Debug/zlib.lib
+++ /dev/null
diff --git a/src/BuildFiles/Library/Win32_Release/libeay32.lib b/src/BuildFiles/Library/Win32_Release/libeay32.lib
index bb887f28..c6580c07 100644
--- a/src/BuildFiles/Library/Win32_Release/libeay32.lib
+++ b/src/BuildFiles/Library/Win32_Release/libeay32.lib
diff --git a/src/BuildFiles/Library/Win32_Release/ssleay32.lib b/src/BuildFiles/Library/Win32_Release/ssleay32.lib
index 848cf10b..904cd6ec 100644
--- a/src/BuildFiles/Library/Win32_Release/ssleay32.lib
+++ b/src/BuildFiles/Library/Win32_Release/ssleay32.lib
diff --git a/src/BuildFiles/Library/x64_Debug/libeay32.lib b/src/BuildFiles/Library/x64_Debug/libeay32.lib
deleted file mode 100644
index 1fe5a2e0..00000000
--- a/src/BuildFiles/Library/x64_Debug/libeay32.lib
+++ /dev/null
diff --git a/src/BuildFiles/Library/x64_Debug/libintelaes.lib b/src/BuildFiles/Library/x64_Debug/libintelaes.lib
deleted file mode 100644
index 9d2f4c4d..00000000
--- a/src/BuildFiles/Library/x64_Debug/libintelaes.lib
+++ /dev/null
diff --git a/src/BuildFiles/Library/x64_Debug/ssleay32.lib b/src/BuildFiles/Library/x64_Debug/ssleay32.lib
deleted file mode 100644
index 538b7231..00000000
--- a/src/BuildFiles/Library/x64_Debug/ssleay32.lib
+++ /dev/null
diff --git a/src/BuildFiles/Library/x64_Debug/zlib.lib b/src/BuildFiles/Library/x64_Debug/zlib.lib
deleted file mode 100644
index 356a8b1d..00000000
--- a/src/BuildFiles/Library/x64_Debug/zlib.lib
+++ /dev/null
diff --git a/src/BuildFiles/Library/x64_Release/libeay32.lib b/src/BuildFiles/Library/x64_Release/libeay32.lib
index 31b7cc06..68a6df6a 100644
--- a/src/BuildFiles/Library/x64_Release/libeay32.lib
+++ b/src/BuildFiles/Library/x64_Release/libeay32.lib
diff --git a/src/BuildFiles/Library/x64_Release/ssleay32.lib b/src/BuildFiles/Library/x64_Release/ssleay32.lib
index 04144867..3f84299a 100644
--- a/src/BuildFiles/Library/x64_Release/ssleay32.lib
+++ b/src/BuildFiles/Library/x64_Release/ssleay32.lib
diff --git a/src/BuildUtil/VpnBuilderConfig.cs b/src/BuildUtil/VpnBuilderConfig.cs
index 9bf3fcf3..787ce1b1 100644
--- a/src/BuildUtil/VpnBuilderConfig.cs
+++ b/src/BuildUtil/VpnBuilderConfig.cs
@@ -421,7 +421,7 @@ namespace BuildUtil
 	{

 		// Windows

 		public static readonly OS Windows = new OS("windows", "Windows",

-			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2 / Server 2016 / Server 2019",

+			"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / 11 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2 / Server 2016 / Server 2019 / Server 2022",

 			new Cpu[]

 			{

 				CpuList.intel,

diff --git a/src/Cedar/CM.c b/src/Cedar/CM.c
index 97bd28e4..9bd01a44 100644
--- a/src/Cedar/CM.c
+++ b/src/Cedar/CM.c
@@ -526,7 +526,7 @@ void CmEasyDlgOnKey(HWND hWnd, CM_EASY_DLG *d, bool ctrl, bool alt, UINT key)
 			break;

 		case 'O':

 			// Option settings

-			Command(hWnd, CMD_TRAFFIC);

+			Command(hWnd, CMD_OPTION);

 			break;

 		case 'R':

 			// Certificate management

@@ -4387,7 +4387,10 @@ UINT CmMainWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, void *p
 		switch (wParam)

 		{

 		case 1:

-			CmSetForegroundProcessToCnService();

+			if (MsIsWindows11() == false)

+			{

+				CmSetForegroundProcessToCnService();

+			}

 			break;

 		case 2:

 			CmPollingTray(hWnd);

@@ -5164,7 +5167,7 @@ void CmOnKey(HWND hWnd, bool ctrl, bool alt, UINT key)
 			break;

 		case 'O':

 			// Option settings

-			Command(hWnd, CMD_TRAFFIC);

+			Command(hWnd, CMD_OPTION);

 			break;

 		case 'R':

 			// Certificate management

@@ -11184,7 +11187,10 @@ void CmMainWindowOnInit(HWND hWnd)
 	CmInitNotifyClientThread();

 

 	// Timer setting

-	SetTimer(hWnd, 1, 128, NULL);

+	if (MsIsWindows11() == false)

+	{

+		SetTimer(hWnd, 1, 128, NULL);

+	}

 	SetTimer(hWnd, 6, 5000, NULL);

 

 	// Initialize the task tray

diff --git a/src/Cedar/Cedar.c b/src/Cedar/Cedar.c
index 01f33723..048c7998 100644
--- a/src/Cedar/Cedar.c
+++ b/src/Cedar/Cedar.c
@@ -1680,6 +1680,7 @@ CEDAR *NewCedar(X *server_x, K *server_k)
 	char tmp[MAX_SIZE];

 	char tmp2[MAX_SIZE];

 	char *beta_str;

+	char ssl_lib_ver[MAX_PATH] = CLEAN;

 

 	CedarForceLink();

 

@@ -1798,8 +1799,10 @@ CEDAR *NewCedar(X *server_x, K *server_k)
 

 	c->VerString = CopyStr(tmp);

 

-	Format(tmp, sizeof(tmp), "Compiled %04u/%02u/%02u %02u:%02u:%02u by %s at %s",

-		BUILD_DATE_Y, BUILD_DATE_M, BUILD_DATE_D, BUILD_DATE_HO, BUILD_DATE_MI, BUILD_DATE_SE, BUILDER_NAME, BUILD_PLACE);

+	GetSslLibVersion(ssl_lib_ver, sizeof(ssl_lib_ver));

+

+	Format(tmp, sizeof(tmp), "Compiled %04u/%02u/%02u %02u:%02u:%02u by %s at %s with %s",

+		BUILD_DATE_Y, BUILD_DATE_M, BUILD_DATE_D, BUILD_DATE_HO, BUILD_DATE_MI, BUILD_DATE_SE, BUILDER_NAME, BUILD_PLACE, ssl_lib_ver);

 

 	c->BuildInfo = CopyStr(tmp);

 

diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index a95e3e1d..d50023f0 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -126,10 +126,10 @@
 

 

 // Version number

-#define	CEDAR_VER					439

+#define	CEDAR_VER					441

 

 // Build Number

-#define	CEDAR_BUILD					9772

+#define	CEDAR_BUILD					9782

 

 // Beta number

 //#define	BETA_NUMBER					3

@@ -149,11 +149,11 @@
 

 // Specifies the build date

 #define	BUILD_DATE_Y		2022

-#define	BUILD_DATE_M		4

-#define	BUILD_DATE_D		26

-#define	BUILD_DATE_HO		17

-#define	BUILD_DATE_MI		40

-#define	BUILD_DATE_SE		1

+#define	BUILD_DATE_M		11

+#define	BUILD_DATE_D		17

+#define	BUILD_DATE_HO		16

+#define	BUILD_DATE_MI		15

+#define	BUILD_DATE_SE		51

 

 // Tolerable time difference

 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

diff --git a/src/Cedar/Command.c b/src/Cedar/Command.c
index 5b2c67e8..4009948d 100644
--- a/src/Cedar/Command.c
+++ b/src/Cedar/Command.c
@@ -23417,7 +23417,7 @@ void CmdPrintAbout(CONSOLE *c)
 	GetExeName(exe, sizeof(exe));

 

 	UniFormat(tmp, sizeof(tmp), _UU("CMD_VPNCMD_ABOUT"),

-		cedar->VerString, cedar->BuildInfo);

+		cedar->VerString, cedar->BuildInfo, BUILD_DATE_Y);

 

 	c->Write(c, tmp);

 

diff --git a/src/Cedar/Session.c b/src/Cedar/Session.c
index c0374ed8..a98b1f46 100644
--- a/src/Cedar/Session.c
+++ b/src/Cedar/Session.c
@@ -1730,7 +1730,13 @@ void ClientThread(THREAD *t, void *param)
 				StrCpy(p.ServerName, sizeof(p.ServerName), s->ClientOption->Hostname);

 			}

 

-			p.RetryIntervalSec = s->RetryInterval / 1000;

+			if(s->CurrentRetryCount < s->ClientOption->NumRetry){

+				p.RetryIntervalSec = s->RetryInterval / 1000;

+			}else{

+				// Disable the retry timeout if retries exceeds the limit

+				p.RetryIntervalSec = 0;

+			}

+

 			p.Type = s->ClientAuth->AuthType;

 

 			// Display the password re-entry dialog

diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt
index 1b367fde..b38eda53 100644
--- a/src/CurrentBuild.txt
+++ b/src/CurrentBuild.txt
@@ -1,4 +1,4 @@
-BUILD_NUMBER 9772

-VERSION 439

+BUILD_NUMBER 9782

+VERSION 441

 BUILD_NAME beta

-BUILD_DATE 20220426_174001

+BUILD_DATE 20221117_161551

diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c
index df58f052..7d29a050 100644
--- a/src/Mayaqua/Encrypt.c
+++ b/src/Mayaqua/Encrypt.c
@@ -5066,6 +5066,8 @@ void InitCryptLibrary()
 	ossl_provider_default = OSSL_PROVIDER_load(NULL, "default");

 #endif

 

+	GetSslLibVersion(NULL, 0);

+

 	ERR_load_crypto_strings();

 	SSL_load_error_strings();

 

@@ -6947,6 +6949,60 @@ crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
 	return ret;

 }

 

+static char ssl_version_cache[MAX_PATH] = CLEAN;

+

+void GetSslLibVersion(char *str, UINT size)

+{

+	if (IsEmptyStr(ssl_version_cache))

+	{

+		GetSslLibVersion_Internal(ssl_version_cache, sizeof(ssl_version_cache));

+	}

+

+	StrCpy(str, size, ssl_version_cache);

+}

+

+void GetSslLibVersion_Internal(char *str, UINT size)

+{

+	char tmp[MAX_PATH] = CLEAN;

+	UINT verint = 0;

+	UINT ver_major = 0;

+	UINT ver_minor = 0;

+	UINT ver_fix = 0;

+	UINT ver_patch = 0;

+	if (str == NULL)

+	{

+		return;

+	}

+

+#if OPENSSL_VERSION_NUMBER < 0x10100000L

+	Format(tmp, sizeof(tmp), "OpenSSL <= 1.0.2");

+#else	// OPENSSL_VERSION_NUMBER

+	verint = OpenSSL_version_num();

+

+	ver_major = (verint >> 28) & 0x0F;

+	ver_minor = (verint >> 20) & 0xFF;

+	ver_fix = (verint >> 12) & 0xFF;

+	ver_patch = (verint >> 4) & 0xFF;

+

+	if (ver_major >= 3)

+	{

+		Format(tmp, sizeof(tmp), "OpenSSL %u.%u.%u", ver_major, ver_minor, ver_patch);

+	}

+	else

+	{

+		char c = 0;

+		if (ver_patch >= 1)

+		{

+			c = 'a' + (ver_patch - 1);

+		}

+		Format(tmp, sizeof(tmp), "OpenSSL %u.%u.%u%c", ver_major, ver_minor, ver_fix, c);

+	}

+

+#endif	// OPENSSL_VERSION_NUMBER

+

+	StrCpy(str, size, tmp);

+}

+

 // RFC 8439: ChaCha20-Poly1305-IETF Encryption with AEAD

 void Aead_ChaCha20Poly1305_Ietf_Encrypt(void *dst, void *src, UINT src_size,

 										void *key, void *nonce, void *aad, UINT aad_size)

diff --git a/src/Mayaqua/Encrypt.h b/src/Mayaqua/Encrypt.h
index 2fbcb637..4a22b428 100644
--- a/src/Mayaqua/Encrypt.h
+++ b/src/Mayaqua/Encrypt.h
@@ -665,6 +665,9 @@ bool Aead_ChaCha20Poly1305_Ietf_IsOpenSSL();
 void Aead_ChaCha20Poly1305_Ietf_Test();

 

 

+void GetSslLibVersion(char *str, UINT size);

+void GetSslLibVersion_Internal(char *str, UINT size);

+

 

 

 

diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h
index 2b28cb97..abd1037f 100644
--- a/src/Mayaqua/MayaType.h
+++ b/src/Mayaqua/MayaType.h
@@ -136,7 +136,7 @@ typedef struct x509_crl_st X509_CRL;
 #define	BUF_SIZE			512

 

 // Support Windows OS list

-#define	SUPPORTED_WINDOWS_LIST		"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2 / Server 2016 / Server 2019"

+#define	SUPPORTED_WINDOWS_LIST		"Windows 98 / 98 SE / ME / NT 4.0 SP6a / 2000 SP4 / XP SP2, SP3 / Vista SP1, SP2 / 7 SP1 / 8 / 8.1 / 10 / 11 / Server 2003 SP2 / Server 2008 SP1, SP2 / Hyper-V Server 2008 / Server 2008 R2 SP1 / Hyper-V Server 2008 R2 / Server 2012 / Hyper-V Server 2012 / Server 2012 R2 / Hyper-V Server 2012 R2 / Server 2016 / Server 2019 / Server 2022"

 

 // Infinite

 #ifndef	WINDOWS_H

@@ -343,9 +343,10 @@ typedef UINT_PTR SOCKET;
 #define	OSTYPE_WINDOWS_81						2701	// Windows 8.1

 #define	OSTYPE_WINDOWS_SERVER_81				2711	// Windows Server 2012 R2

 #define	OSTYPE_WINDOWS_10						2702	// Windows 10

-#define	OSTYPE_WINDOWS_SERVER_10				2712	// Windows Server 10

-#define	OSTYPE_WINDOWS_11						2800	// Windows 11 or later

-#define	OSTYPE_WINDOWS_SERVER_11				2810	// Windows Server 11 or later

+#define	OSTYPE_WINDOWS_SERVER_10				2712	// Windows Server 2016 / 2019 / 2022

+#define	OSTYPE_WINDOWS_11						2800	// Windows 11

+#define	OSTYPE_WINDOWS_12						2801	// Windows 12 or later

+#define	OSTYPE_WINDOWS_SERVER_11				2810	// newer than Windows Server 2022

 #define	OSTYPE_UNIX_UNKNOWN						3000	// Unknown UNIX

 #define	OSTYPE_LINUX							3100	// Linux

 #define	OSTYPE_SOLARIS							3200	// Solaris

diff --git a/src/Mayaqua/Mayaqua.vcproj b/src/Mayaqua/Mayaqua.vcproj
index 001b61e2..8e87870b 100644
--- a/src/Mayaqua/Mayaqua.vcproj
+++ b/src/Mayaqua/Mayaqua.vcproj
@@ -71,7 +71,7 @@
 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4006,4221"

 				AdditionalDependencies="libeay32.lib ssleay32.lib zlib.lib libintelaes.lib"

-				AdditionalLibraryDirectories="$(SolutionDir)BuildFiles\Library\$(PlatformName)_$(ConfigurationName)"

+				AdditionalLibraryDirectories="$(SolutionDir)BuildFiles\Library\$(PlatformName)_Release"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -142,7 +142,7 @@
 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4006,4221"

 				AdditionalDependencies="libeay32.lib ssleay32.lib zlib.lib libintelaes.lib"

-				AdditionalLibraryDirectories="$(SolutionDir)BuildFiles\Library\$(PlatformName)_$(ConfigurationName)"

+				AdditionalLibraryDirectories="$(SolutionDir)BuildFiles\Library\$(PlatformName)_Release"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -216,7 +216,7 @@
 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4006,4221"

 				AdditionalDependencies="libeay32.lib ssleay32.lib zlib.lib libintelaes.lib"

-				AdditionalLibraryDirectories="$(SolutionDir)BuildFiles\Library\$(PlatformName)_$(ConfigurationName)"

+				AdditionalLibraryDirectories="$(SolutionDir)BuildFiles\Library\$(PlatformName)_Release"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -291,7 +291,7 @@
 				Name="VCLibrarianTool"

 				AdditionalOptions="/IGNORE:4006,4221"

 				AdditionalDependencies="libeay32.lib ssleay32.lib zlib.lib libintelaes.lib"

-				AdditionalLibraryDirectories="$(SolutionDir)BuildFiles\Library\$(PlatformName)_$(ConfigurationName)"

+				AdditionalLibraryDirectories="$(SolutionDir)BuildFiles\Library\$(PlatformName)_Release"

 			/>

 			<Tool

 				Name="VCALinkTool"

diff --git a/src/Mayaqua/Microsoft.c b/src/Mayaqua/Microsoft.c
index 66ab9900..17539a85 100644
--- a/src/Mayaqua/Microsoft.c
+++ b/src/Mayaqua/Microsoft.c
@@ -9184,6 +9184,27 @@ bool MsIsWindows10()
 	return false;

 }

 

+// Determine whether it's Windows 11 or later

+bool MsIsWindows11()

+{

+	OS_INFO *info = GetOsInfo();

+

+	if (info == NULL)

+	{

+		return false;

+	}

+

+	if (OS_IS_WINDOWS_NT(info->OsType))

+	{

+		if (GET_KETA(info->OsType, 100) >= 8)

+		{

+			return true;

+		}

+	}

+

+	return false;

+}

+

 // Determine whether it's Windows 8.1 or later

 bool MsIsWindows81()

 {

diff --git a/src/Mayaqua/Microsoft.h b/src/Mayaqua/Microsoft.h
index 783d0dc1..53aefedb 100644
--- a/src/Mayaqua/Microsoft.h
+++ b/src/Mayaqua/Microsoft.h
@@ -1010,6 +1010,7 @@ bool MsIsIA64();
 void *MsDisableWow64FileSystemRedirection();

 void MsRestoreWow64FileSystemRedirection(void *p);

 void MsSetWow64FileSystemRedirectionEnable(bool enable);

+bool MsIsWindows11();

 bool MsIsWindows10();

 bool MsIsWindows81();

 bool MsIsWindows8();

diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c
index 89baa167..9a3b8f00 100644
--- a/src/Mayaqua/Network.c
+++ b/src/Mayaqua/Network.c
@@ -22873,6 +22873,7 @@ bool HttpSendNotImplemented(SOCK *s, char *method, char *target, char *version)
 	ReplaceStri(str, str_size, str, "$METHOD$", method);

 

 	// VERSION

+	ReplaceUnsafeCharInTarget(version);

 	ReplaceStri(str, str_size, str, "$VERSION$", version);

 

 	// Transmission

diff --git a/src/Mayaqua/OS.c b/src/Mayaqua/OS.c
index bec9d3de..8f7a9d62 100644
--- a/src/Mayaqua/OS.c
+++ b/src/Mayaqua/OS.c
@@ -191,11 +191,13 @@ char *OsTypeToStr(UINT type)
 	case OSTYPE_WINDOWS_10:

 		return "Windows 10\0\n";

 	case OSTYPE_WINDOWS_SERVER_10:

-		return "Windows Server 2016\0\n";

+		return "Windows Server 2016 / 2019 / 2022\0\n";

 	case OSTYPE_WINDOWS_11:

-		return "Newer than Windows 10\0\n";

+		return "Windows 11\0\n";

+	case OSTYPE_WINDOWS_12:

+		return "Windows 12 or later\0\n";

 	case OSTYPE_WINDOWS_SERVER_11:

-		return "Newer than Windows Server 2016\0\n";

+		return "Newer than Windows Server 2022\0\n";

 	case OSTYPE_UNIX_UNKNOWN:

 		return "UNIX System\0\n";

 	case OSTYPE_LINUX:

diff --git a/src/Mayaqua/Secure.h b/src/Mayaqua/Secure.h
index 40603f3d..7654acbf 100644
--- a/src/Mayaqua/Secure.h
+++ b/src/Mayaqua/Secure.h
@@ -302,6 +302,9 @@ SECURE_DEVICE SupportedList[] =
 	{22,	SECURE_USB_TOKEN,	"CryptoID",				"Longmai Technology",	"cryptoide_pkcs11.dll"},

 	{23,	SECURE_USB_TOKEN,	"RuToken",				"Aktiv Co.",			"rtPKCS11.dll"},

 	{24,	SECURE_IC_CARD,		"JPKI IC Card (64-bit)",	"Japanese Government",	"JPKIPKCS1164.DLL"},

+	{25,	SECURE_USB_TOKEN,	"SafeNet",				"SafeNet",				"IDPrimePKCS1164.dll "},

+	{26,	SECURE_USB_TOKEN,	"OpenSC",				"OpenSC",				"opensc-pkcs11.dll"},

+	{27,	SECURE_USB_TOKEN,	"SHALO AUTH",			"AXELL CORPORATION",	"slpkcs11-vc.dll"},

 };

 

 #ifdef	OS_WIN32

diff --git a/src/Mayaqua/Win32.c b/src/Mayaqua/Win32.c
index b48c27ec..1f6c54e8 100644
--- a/src/Mayaqua/Win32.c
+++ b/src/Mayaqua/Win32.c
@@ -1442,12 +1442,20 @@ UINT Win32GetOsType()
 				{

 					if (os.wProductType == VER_NT_WORKSTATION)

 					{

-						// Windows 10

-						return OSTYPE_WINDOWS_10;

+						if (os.dwBuildNumber < 21996)

+						{

+							// Windows 10

+							return OSTYPE_WINDOWS_10;

+						}

+						else

+						{

+							// Windows 11

+							return OSTYPE_WINDOWS_11;

+						}

 					}

 					else

 					{

-						// Windows Server 10

+						// Windows Server 2016 / 2019 / 2022

 						return OSTYPE_WINDOWS_SERVER_10;

 					}

 				}

@@ -1455,8 +1463,8 @@ UINT Win32GetOsType()
 				{

 					if (os.wProductType == VER_NT_WORKSTATION)

 					{

-						// Windows 11 or later

-						return OSTYPE_WINDOWS_11;

+						// Windows 12 or later

+						return OSTYPE_WINDOWS_12;

 					}

 					else

 					{

diff --git a/src/Mayaqua/win32_inc/openssl/bio.h b/src/Mayaqua/win32_inc/openssl/bio.h
index b455c47e..1578a77c 100644
--- a/src/Mayaqua/win32_inc/openssl/bio.h
+++ b/src/Mayaqua/win32_inc/openssl/bio.h
@@ -173,9 +173,9 @@ extern "C" {
 

 # ifndef OPENSSL_NO_KTLS

 #  define BIO_get_ktls_send(b)         \

-     BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL)

+     (BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL) > 0)

 #  define BIO_get_ktls_recv(b)         \

-     BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL)

+     (BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL) > 0)

 # else

 #  define BIO_get_ktls_send(b)  (0)

 #  define BIO_get_ktls_recv(b)  (0)

@@ -819,6 +819,7 @@ void BIO_copy_next_retry(BIO *b);
 

 # define ossl_bio__attr__(x)

 # if defined(__GNUC__) && defined(__STDC_VERSION__) \

+    && !defined(__MINGW32__) && !defined(__MINGW64__) \

     && !defined(__APPLE__)

     /*

      * Because we support the 'z' modifier, which made its appearance in C99,

diff --git a/src/Mayaqua/win32_inc/openssl/bnerr.h b/src/Mayaqua/win32_inc/openssl/bnerr.h
index 46779e07..2585f2d5 100644
--- a/src/Mayaqua/win32_inc/openssl/bnerr.h
+++ b/src/Mayaqua/win32_inc/openssl/bnerr.h
@@ -1,6 +1,6 @@
 /*

  * Generated by util/mkerr.pl DO NOT EDIT

- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.

+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.

  *

  * Licensed under the Apache License 2.0 (the "License").  You may not use

  * this file except in compliance with the License.  You can obtain a copy

@@ -36,6 +36,7 @@
 # define BN_R_NOT_A_SQUARE                                111

 # define BN_R_NOT_INITIALIZED                             107

 # define BN_R_NO_INVERSE                                  108

+# define BN_R_NO_PRIME_CANDIDATE                          121

 # define BN_R_NO_SOLUTION                                 116

 # define BN_R_NO_SUITABLE_DIGEST                          120

 # define BN_R_PRIVATE_KEY_TOO_LARGE                       117

diff --git a/src/Mayaqua/win32_inc/openssl/configuration.h b/src/Mayaqua/win32_inc/openssl/configuration.h
index 3b8a11d0..61b2e05f 100644
--- a/src/Mayaqua/win32_inc/openssl/configuration.h
+++ b/src/Mayaqua/win32_inc/openssl/configuration.h
@@ -1,6 +1,7 @@
 /*

  * WARNING: do not edit!

- * Generated by makefile from include\openssl\configuration.h.in

+ * Generated by configdata.pm from Configurations\common0.tmpl, Configurations\windows-makefile.tmpl

+ * via makefile.in

  *

  * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.

  *

diff --git a/src/Mayaqua/win32_inc/openssl/core_names.h b/src/Mayaqua/win32_inc/openssl/core_names.h
index 3d5780e7..fe644dee 100644
--- a/src/Mayaqua/win32_inc/openssl/core_names.h
+++ b/src/Mayaqua/win32_inc/openssl/core_names.h
@@ -1,5 +1,5 @@
 /*

- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.

+ * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.

  *

  * Licensed under the Apache License 2.0 (the "License").  You may not use

  * this file except in compliance with the License.  You can obtain a copy

@@ -21,9 +21,9 @@ extern "C" {
 #define OSSL_PROV_PARAM_CORE_MODULE_FILENAME "module-filename" /* utf8_ptr */

 

 /* Well known parameter names that Providers can define */

-#define OSSL_PROV_PARAM_NAME            "name"                /* utf8_string */

-#define OSSL_PROV_PARAM_VERSION         "version"             /* utf8_string */

-#define OSSL_PROV_PARAM_BUILDINFO       "buildinfo"           /* utf8_string */

+#define OSSL_PROV_PARAM_NAME            "name"                /* utf8_ptr */

+#define OSSL_PROV_PARAM_VERSION         "version"             /* utf8_ptr */

+#define OSSL_PROV_PARAM_BUILDINFO       "buildinfo"           /* utf8_ptr */

 #define OSSL_PROV_PARAM_STATUS          "status"              /* uint */

 #define OSSL_PROV_PARAM_SECURITY_CHECKS "security-checks"     /* uint */

 

diff --git a/src/Mayaqua/win32_inc/openssl/crypto.h b/src/Mayaqua/win32_inc/openssl/crypto.h
index e973cd58..d513f038 100644
--- a/src/Mayaqua/win32_inc/openssl/crypto.h
+++ b/src/Mayaqua/win32_inc/openssl/crypto.h
@@ -132,6 +132,8 @@ int OPENSSL_hexstr2buf_ex(unsigned char *buf, size_t buf_n, size_t *buflen,
                           const char *str, const char sep);

 unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen);

 int OPENSSL_hexchar2int(unsigned char c);

+int OPENSSL_strcasecmp(const char *s1, const char *s2);

+int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n);

 

 # define OPENSSL_MALLOC_MAX_NELEMS(type)  (((1U<<(sizeof(int)*8-1))-1)/sizeof(type))

 

diff --git a/src/Mayaqua/win32_inc/openssl/ecerr.h b/src/Mayaqua/win32_inc/openssl/ecerr.h
index d1e0269b..579c47ca 100644
--- a/src/Mayaqua/win32_inc/openssl/ecerr.h
+++ b/src/Mayaqua/win32_inc/openssl/ecerr.h
@@ -1,6 +1,6 @@
 /*

  * Generated by util/mkerr.pl DO NOT EDIT

- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.

+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.

  *

  * Licensed under the Apache License 2.0 (the "License").  You may not use

  * this file except in compliance with the License.  You can obtain a copy

@@ -35,6 +35,7 @@
 #  define EC_R_DECODE_ERROR                                142

 #  define EC_R_DISCRIMINANT_IS_ZERO                        118

 #  define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE                119

+#  define EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED               127

 #  define EC_R_FAILED_MAKING_PUBLIC_KEY                    166

 #  define EC_R_FIELD_TOO_LARGE                             143

 #  define EC_R_GF2M_NOT_SUPPORTED                          147

diff --git a/src/Mayaqua/win32_inc/openssl/err.h b/src/Mayaqua/win32_inc/openssl/err.h
index 2ca5b0ad..b1289ff4 100644
--- a/src/Mayaqua/win32_inc/openssl/err.h
+++ b/src/Mayaqua/win32_inc/openssl/err.h
@@ -1,5 +1,5 @@
 /*

- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.

+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.

  *

  * Licensed under the Apache License 2.0 (the "License").  You may not use

  * this file except in compliance with the License.  You can obtain a copy

@@ -323,15 +323,27 @@ static ossl_unused ossl_inline int ERR_COMMON_ERROR(unsigned long errcode)
 # define ERR_R_DSA_LIB          (ERR_LIB_DSA/* 10 */ | ERR_RFLAG_COMMON)

 # define ERR_R_X509_LIB         (ERR_LIB_X509/* 11 */ | ERR_RFLAG_COMMON)

 # define ERR_R_ASN1_LIB         (ERR_LIB_ASN1/* 13 */ | ERR_RFLAG_COMMON)

+# define ERR_R_CONF_LIB         (ERR_LIB_CONF/* 14 */ | ERR_RFLAG_COMMON)

 # define ERR_R_CRYPTO_LIB       (ERR_LIB_CRYPTO/* 15 */ | ERR_RFLAG_COMMON)

 # define ERR_R_EC_LIB           (ERR_LIB_EC/* 16 */ | ERR_RFLAG_COMMON)

+# define ERR_R_SSL_LIB          (ERR_LIB_SSL/* 20 */ | ERR_RFLAG_COMMON)

 # define ERR_R_BIO_LIB          (ERR_LIB_BIO/* 32 */ | ERR_RFLAG_COMMON)

 # define ERR_R_PKCS7_LIB        (ERR_LIB_PKCS7/* 33 */ | ERR_RFLAG_COMMON)

 # define ERR_R_X509V3_LIB       (ERR_LIB_X509V3/* 34 */ | ERR_RFLAG_COMMON)

+# define ERR_R_PKCS12_LIB       (ERR_LIB_PKCS12/* 35 */ | ERR_RFLAG_COMMON)

+# define ERR_R_RAND_LIB         (ERR_LIB_RAND/* 36 */ | ERR_RFLAG_COMMON)

+# define ERR_R_DSO_LIB          (ERR_LIB_DSO/* 37 */ | ERR_RFLAG_COMMON)

 # define ERR_R_ENGINE_LIB       (ERR_LIB_ENGINE/* 38 */ | ERR_RFLAG_COMMON)

 # define ERR_R_UI_LIB           (ERR_LIB_UI/* 40 */ | ERR_RFLAG_COMMON)

 # define ERR_R_ECDSA_LIB        (ERR_LIB_ECDSA/* 42 */ | ERR_RFLAG_COMMON)

 # define ERR_R_OSSL_STORE_LIB   (ERR_LIB_OSSL_STORE/* 44 */ | ERR_RFLAG_COMMON)

+# define ERR_R_CMS_LIB          (ERR_LIB_CMS/* 46 */ | ERR_RFLAG_COMMON)

+# define ERR_R_TS_LIB           (ERR_LIB_TS/* 47 */ | ERR_RFLAG_COMMON)

+# define ERR_R_CT_LIB           (ERR_LIB_CT/* 50 */ | ERR_RFLAG_COMMON)

+# define ERR_R_PROV_LIB         (ERR_LIB_PROV/* 57 */ | ERR_RFLAG_COMMON)

+# define ERR_R_ESS_LIB          (ERR_LIB_ESS/* 54 */ | ERR_RFLAG_COMMON)

+# define ERR_R_CMP_LIB          (ERR_LIB_CMP/* 58 */ | ERR_RFLAG_COMMON)

+# define ERR_R_OSSL_ENCODER_LIB (ERR_LIB_OSSL_ENCODER/* 59 */ | ERR_RFLAG_COMMON)

 # define ERR_R_OSSL_DECODER_LIB (ERR_LIB_OSSL_DECODER/* 60 */ | ERR_RFLAG_COMMON)

 

 /* Other common error codes, range 256..2^ERR_RFLAGS_OFFSET-1 */

diff --git a/src/Mayaqua/win32_inc/openssl/opensslv.h b/src/Mayaqua/win32_inc/openssl/opensslv.h
index 3eee5eff..4d8af160 100644
--- a/src/Mayaqua/win32_inc/openssl/opensslv.h
+++ b/src/Mayaqua/win32_inc/openssl/opensslv.h
@@ -29,7 +29,7 @@ extern "C" {
  */

 # define OPENSSL_VERSION_MAJOR  3

 # define OPENSSL_VERSION_MINOR  0

-# define OPENSSL_VERSION_PATCH  2

+# define OPENSSL_VERSION_PATCH  7

 

 /*

  * Additional version information

@@ -74,21 +74,21 @@ extern "C" {
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and

  * OPENSSL_VERSION_BUILD_METADATA_STR appended.

  */

-# define OPENSSL_VERSION_STR "3.0.2"

-# define OPENSSL_FULL_VERSION_STR "3.0.2"

+# define OPENSSL_VERSION_STR "3.0.7"

+# define OPENSSL_FULL_VERSION_STR "3.0.7"

 

 /*

  * SECTION 3: ADDITIONAL METADATA

  *

  * These strings are defined separately to allow them to be parsable.

  */

-# define OPENSSL_RELEASE_DATE "15 Mar 2022"

+# define OPENSSL_RELEASE_DATE "1 Nov 2022"

 

 /*

  * SECTION 4: BACKWARD COMPATIBILITY

  */

 

-# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.2 15 Mar 2022"

+# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.7 1 Nov 2022"

 

 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */

 # ifdef OPENSSL_VERSION_PRE_RELEASE

diff --git a/src/Mayaqua/win32_inc/openssl/ssl.h b/src/Mayaqua/win32_inc/openssl/ssl.h
index bb0f47b0..16bcde27 100644
--- a/src/Mayaqua/win32_inc/openssl/ssl.h
+++ b/src/Mayaqua/win32_inc/openssl/ssl.h
@@ -1381,6 +1381,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 # define SSL_CTRL_GET_TMP_KEY                    133

 # define SSL_CTRL_GET_NEGOTIATED_GROUP           134

 # define SSL_CTRL_SET_RETRY_VERIFY               136

+# define SSL_CTRL_GET_VERIFY_CERT_STORE          137

+# define SSL_CTRL_GET_CHAIN_CERT_STORE           138

 # define SSL_CERT_SET_FIRST                      1

 # define SSL_CERT_SET_NEXT                       2

 # define SSL_CERT_SET_SERVER                     3

@@ -1442,10 +1444,14 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))

 # define SSL_CTX_set1_verify_cert_store(ctx,st) \

         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))

+# define SSL_CTX_get0_verify_cert_store(ctx,st) \

+        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))

 # define SSL_CTX_set0_chain_cert_store(ctx,st) \

         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))

 # define SSL_CTX_set1_chain_cert_store(ctx,st) \

         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))

+# define SSL_CTX_get0_chain_cert_store(ctx,st) \

+        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))

 # define SSL_set0_chain(s,sk) \

         SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))

 # define SSL_set1_chain(s,sk) \

@@ -1468,10 +1474,15 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
         SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))

 # define SSL_set1_verify_cert_store(s,st) \

         SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))

+#define SSL_get0_verify_cert_store(s,st) \

+        SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))

 # define SSL_set0_chain_cert_store(s,st) \

         SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))

 # define SSL_set1_chain_cert_store(s,st) \

         SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))

+#define SSL_get0_chain_cert_store(s,st) \

+        SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))

+

 # define SSL_get1_groups(s, glist) \

         SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))

 # define SSL_CTX_set1_groups(ctx, glist, glistlen) \

diff --git a/src/Mayaqua/win32_inc/openssl/x509.h b/src/Mayaqua/win32_inc/openssl/x509.h
index 41a1e905..6a4b1e0f 100644
--- a/src/Mayaqua/win32_inc/openssl/x509.h
+++ b/src/Mayaqua/win32_inc/openssl/x509.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!

  * Generated by makefile from include\openssl\x509.h.in

  *

- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.

+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.

  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved

  *

  * Licensed under the Apache License 2.0 (the "License").  You may not use

@@ -552,11 +552,11 @@ int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
 X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);

 X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);

 # ifndef OPENSSL_NO_DEPRECATED_3_0

-#  include <openssl/ocsp.h> /* OCSP_REQ_CTX_nbio_d2i */

+#  include <openssl/http.h> /* OSSL_HTTP_REQ_CTX_nbio_d2i */

 #  define X509_http_nbio(rctx, pcert) \

-      OCSP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509))

+      OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509))

 #  define X509_CRL_http_nbio(rctx, pcrl) \

-      OCSP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL))

+      OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL))

 # endif

 

 # ifndef OPENSSL_NO_STDIO

diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb
index a3ccd520..597c8e9c 100644
--- a/src/bin/hamcore/strtable_cn.stb
+++ b/src/bin/hamcore/strtable_cn.stb
@@ -1050,7 +1050,8 @@ VGC_VER_DIFF			VPN Gate 客户端插件的版本与 SoftEther VPN 客户端相�
 

 VGS_STOP				VPN Gate 服务将在您点击 确定 按钮后停止。\r\n\r\n在 VPN Gate 服务被停止后，这台计算机将不会接受新的 VPN 连接请求，但是，仍然活跃的 VPN 会话可能会残留。\r\n (这类 VPN 会话有时在枚举中不可见。) \r\n\r\n要想彻底终止所有仍然活跃的 VPN 会话，重启 SoftEther VPN Server 或者 SoftEther VPN Client 服务，或者重新启动这台计算机。

 

-VGS_START				This will activate the VPN Gate Relay Service function.\r\n\r\nVPN Gate Relay Service function must be activated by your own risk.\r\nSome countries prohibit using of encrypted VPN by laws.\r\nFor more details about VPN Gate Relay Service please visit http://www.vpngate.net/en/join.aspx.\r\n\r\nThe VPN Gate Academic Experiment Service is operated as a research project at the graduate school on University of Tsukuba, Japan. The service is governed under the Japanese laws. Other countries' laws are none of our concerns nor responsibilities.\r\n\r\nBy nature, there are almost 200 countries in the World, with different laws. It is impossible to verify every countries' laws and regulations and make the software comply with all countries' laws in advance to release the software. If a user uses VPN Gate service in a specific country, and damaged by public servants of the authority, the developer of either the service or software will never be liable to recover or compensate such damages or criminal responsibilities. By using this software and service, the user must observe all concerned laws and rules with user's own responsibility. The user will be completely liable to any damages and responsibilities which are results of using this software and service, regardless of either inside or outside of Japan's territory. VPN Gate Relay Service will be installed on your computer as system services. System services always run in the background. After you terminate these management GUI tools, this system service will continue to run in the background. System services consume CPU time, computer power, memory and disk space. If you don't agree nor understand the above warnings, do not use any of VPN Gate Academic Experiment Service functions.

+VGS_START				This will activate the VPN Gate Relay Service function.\r\n\r\nAfter the VPN Gate Relay Service will be enabled and you are participating in the VPN Gate experiment as a volunteer, the VPN Gate Relay Service will relay VPN communications and packets from any VPN Gate clients via the Internet. Therefore, the source IP address of the communication via a VPN tunnel will be replaced to the IP address of the computer running the VPN Gate Relay Service. Since VPN communications are encrypted, the communication between the VPN client and the VPN Gate Relay Service will be able to avoid censorship by government censorship firewalls. The VPN Gate Relay Service runs as a Windows background program, even before the user logs on.\r\n\r\nIt is assumed that users will use VPN Gate primarily to circumvent censorship; VPN Gate Relay Service records VPN connection logs and packet logs; note that unlike Tor, VPN Gate has no anonymizing effect.\r\n\r\nRunning the VPN Gate Relay Service and offering it to other VPN Gate users over the Internet has the same technical effect as running Public WiFi at airports, town squares, or other public spaces, etc. As Public WiFi also saves communication logs, the VPN Gate Relay Service does save communication logs. It is stored on the disk of the computer running the VPN Gate Relay Service. Both administrators of VPN Gate Relay Services and VPN users may encounter legal problems as a result of their communications through the VPN Gate Relay Service. In this case, it may be necessary for the administrator of the VPN Gate Relay Service to disclose the communication logs to the police, courts, lawyers, etc. If the administrator is requested or ordered to disclose the logs in accordance with the applicated laws, the administrator is obligated to cooperate lawfully in order to maintain the public safety of the Internet. Please understand the above before activating the VPN Gate Relay Service.\r\n\r\nVPN Gate Relay Service function must be activated by your own risk.\r\nSome countries prohibit using of encrypted VPN by laws.\r\n\r\nFor more details about VPN Gate Relay Service please visit http://www.vpngate.net/en/join.aspx.\r\n\r\nThe VPN Gate Academic Experiment Service is operated as a research project at the graduate school on University of Tsukuba, Japan. The service is governed under the Japanese laws. Other countries' laws are none of our concerns nor responsibilities.\r\n\r\nBy nature, there are almost 200 countries in the World, with different laws. It is impossible to verify every countries' laws and regulations and make the software comply with all countries' laws in advance to release the software. If a user uses VPN Gate service in a specific country, and damaged by public servants of the authority, the developer of either the service or software will never be liable to recover or compensate such damages or criminal responsibilities. By using this software and service, the user must observe all concerned laws and rules with user's own responsibility. The user will be completely liable to any damages and responsibilities which are results of using this software and service, regardless of either inside or outside of Japan's territory. VPN Gate Relay Service will be installed on your computer as system services. System services always run in the background. After you terminate these management GUI tools, this system service will continue to run in the background. System services consume CPU time, computer power, memory and disk space. If you don't agree nor understand the above warnings, do not use any of VPN Gate Academic Experiment Service functions.\r\n

+VGS_START2				Enables the VPN Gate Relay Service function. Are you sure?

 

 

 

@@ -4465,7 +4466,7 @@ CMD_VPNCMD_HOST_2			指定的主机名或正在运行的目标 VPN Client 计算
 CMD_VPNCMD_HOST_3			目标 IP 地址的主机名:

 CMD_VPNCMD_HUB_1			如果通过虚拟 HUB 管理模式连接到服务器，请输入虚拟 HUB 的名称。\n如果通过服务器管理模式连接，无须输入任何内容请按回车键。\n

 CMD_VPNCMD_HUB_2			指定虚拟 HUB 名称:

-CMD_VPNCMD_ABOUT			SoftEther VPN 命令行管理工具 (vpncmd 命令)\n%S\n%S\nCopyright (c) SoftEther VPN Project. All Rights Reserved.\n

+CMD_VPNCMD_ABOUT			SoftEther VPN 命令行管理工具 (vpncmd 命令)\n%S\n%S\nCopyright (c) 2012-%u SoftEther VPN Project. All Rights Reserved.\n

 CMD_VPNCMD_PASSWORD_1		访问被拒绝。可能是密码不正确，或者是您以不正确的管理模式连接。您可以尝试再次输入密码。要取消，请按 Ctrl + D。

 CMD_VPNCMD_PASSWORD_2		密码: 

 CMD_VPNCMD_ERROR			发生错误。(错误代码: %u)\n%s

diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb
index feb84425..6ea6b58c 100644
--- a/src/bin/hamcore/strtable_en.stb
+++ b/src/bin/hamcore/strtable_en.stb
@@ -1040,7 +1040,8 @@ VGS_NO_HUB_YET			In order to set the message, first you have to commit enabling
 

 VGS_STOP				VPN Gate Service will stop after you click the OK button.\r\n\r\nAfter VPN Gate Service will be stopped, this computer will never accept new VPN connection requests, however, still-alive VPN Sessions might remain.\r\n (Such VPN sessions sometimes hidden from the enumeration.) \r\n\r\nTo terminate all of still-alive VPN Sessions completely, restart SoftEther VPN Server or SoftEther VPN Client service, or reboot the computer.

 

-VGS_START				This will activate the VPN Gate Relay Service function.\r\n\r\nVPN Gate Relay Service function must be activated by your own risk.\r\nSome countries prohibit using of encrypted VPN by laws.\r\nFor more details about VPN Gate Relay Service please visit http://www.vpngate.net/en/join.aspx.\r\n\r\nThe VPN Gate Academic Experiment Service is operated as a research project at the graduate school on University of Tsukuba, Japan. The service is governed under the Japanese laws. Other countries' laws are none of our concerns nor responsibilities.\r\n\r\nBy nature, there are almost 200 countries in the World, with different laws. It is impossible to verify every countries' laws and regulations and make the software comply with all countries' laws in advance to release the software. If a user uses VPN Gate service in a specific country, and damaged by public servants of the authority, the developer of either the service or software will never be liable to recover or compensate such damages or criminal responsibilities. By using this software and service, the user must observe all concerned laws and rules with user's own responsibility. The user will be completely liable to any damages and responsibilities which are results of using this software and service, regardless of either inside or outside of Japan's territory. VPN Gate Relay Service will be installed on your computer as system services. System services always run in the background. After you terminate these management GUI tools, this system service will continue to run in the background. System services consume CPU time, computer power, memory and disk space. If you don't agree nor understand the above warnings, do not use any of VPN Gate Academic Experiment Service functions.

+VGS_START				This will activate the VPN Gate Relay Service function.\r\n\r\nAfter the VPN Gate Relay Service will be enabled and you are participating in the VPN Gate experiment as a volunteer, the VPN Gate Relay Service will relay VPN communications and packets from any VPN Gate clients via the Internet. Therefore, the source IP address of the communication via a VPN tunnel will be replaced to the IP address of the computer running the VPN Gate Relay Service. Since VPN communications are encrypted, the communication between the VPN client and the VPN Gate Relay Service will be able to avoid censorship by government censorship firewalls. The VPN Gate Relay Service runs as a Windows background program, even before the user logs on.\r\n\r\nIt is assumed that users will use VPN Gate primarily to circumvent censorship; VPN Gate Relay Service records VPN connection logs and packet logs; note that unlike Tor, VPN Gate has no anonymizing effect.\r\n\r\nRunning the VPN Gate Relay Service and offering it to other VPN Gate users over the Internet has the same technical effect as running Public WiFi at airports, town squares, or other public spaces, etc. As Public WiFi also saves communication logs, the VPN Gate Relay Service does save communication logs. It is stored on the disk of the computer running the VPN Gate Relay Service. Both administrators of VPN Gate Relay Services and VPN users may encounter legal problems as a result of their communications through the VPN Gate Relay Service. In this case, it may be necessary for the administrator of the VPN Gate Relay Service to disclose the communication logs to the police, courts, lawyers, etc. If the administrator is requested or ordered to disclose the logs in accordance with the applicated laws, the administrator is obligated to cooperate lawfully in order to maintain the public safety of the Internet. Please understand the above before activating the VPN Gate Relay Service.\r\n\r\nVPN Gate Relay Service function must be activated by your own risk.\r\nSome countries prohibit using of encrypted VPN by laws.\r\n\r\nFor more details about VPN Gate Relay Service please visit http://www.vpngate.net/en/join.aspx.\r\n\r\nThe VPN Gate Academic Experiment Service is operated as a research project at the graduate school on University of Tsukuba, Japan. The service is governed under the Japanese laws. Other countries' laws are none of our concerns nor responsibilities.\r\n\r\nBy nature, there are almost 200 countries in the World, with different laws. It is impossible to verify every countries' laws and regulations and make the software comply with all countries' laws in advance to release the software. If a user uses VPN Gate service in a specific country, and damaged by public servants of the authority, the developer of either the service or software will never be liable to recover or compensate such damages or criminal responsibilities. By using this software and service, the user must observe all concerned laws and rules with user's own responsibility. The user will be completely liable to any damages and responsibilities which are results of using this software and service, regardless of either inside or outside of Japan's territory. VPN Gate Relay Service will be installed on your computer as system services. System services always run in the background. After you terminate these management GUI tools, this system service will continue to run in the background. System services consume CPU time, computer power, memory and disk space. If you don't agree nor understand the above warnings, do not use any of VPN Gate Academic Experiment Service functions.\r\n

+VGS_START2				Enables the VPN Gate Relay Service function. Are you sure?

 

 

 # Concerning services (Win32)

@@ -4449,7 +4450,7 @@ CMD_VPNCMD_HOST_2		Specify the host name or IP address of the computer that the
 CMD_VPNCMD_HOST_3		Hostname of IP Address of Destination: 

 CMD_VPNCMD_HUB_1		If connecting to the server by Virtual Hub Admin Mode, please input the Virtual Hub name. \nIf connecting by server admin mode, please press Enter without inputting anything.

 CMD_VPNCMD_HUB_2		Specify Virtual Hub Name: 

-CMD_VPNCMD_ABOUT		SoftEther VPN Command Line Management Utility (vpncmd command)\n%S\n%S\nCopyright (c) SoftEther VPN Project. All Rights Reserved.\n

+CMD_VPNCMD_ABOUT		SoftEther VPN Command Line Management Utility (vpncmd command)\n%S\n%S\nCopyright (c) 2012-%u SoftEther VPN Project. All Rights Reserved.\n

 CMD_VPNCMD_PASSWORD_1	Access has been denied. Possibly the password is incorrect, or perhaps you are connecting by an incorrect admin mode. You can try inputting the password again. To cancel, press Ctrl+D.

 CMD_VPNCMD_PASSWORD_2	Password: 

 CMD_VPNCMD_ERROR		Error occurred. (Error code: %u)\n%s

diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb
index 1c11149b..19144048 100644
--- a/src/bin/hamcore/strtable_ja.stb
+++ b/src/bin/hamcore/strtable_ja.stb
@@ -1045,7 +1045,8 @@ VGS_NO_HUB_YET			メッセージを設定するには、最初にまず VPN Gate
 

 VGS_STOP				VPN Gate サービスを停止します。\r\n\r\nVPN Gate サービスを停止すると、このコンピュータは新たな VPN 接続を受付けなくなりますが、現在アクティブな VPN セッションは残る場合があります。\r\n(それらの VPN セッションは列挙されない場合があります。)\r\n\r\nアクティブな VPN セッションを削除するためには、VPN Gate サービスを停止した後は直ちに SoftEther VPN Server または SoftEther VPN Client サービスを再起動するか、コンピュータを再起動してください。

 

-VGS_START				VPN Gate 中継サービス機能を有効にします。\r\nこのコンピュータで VPN Gate 中継サービス機能を有効にすると、このコンピュータは、任意の VPN Gate ユーザーからの VPN 接続を受け付け、通信を中継することができるようになります。\r\n\r\nVPN Gate 中継サービス機能は、ユーザーの責任で有効にしてください。\r\n法令によって VPN による暗号化通信が禁止されている国があります。\r\nVPN Gate 中継サービス機能について詳しくは http://www.vpngate.net/ja/join.aspx をお読みください。\r\n\r\nVPN Gate 学術実験サービスは、日本国に所在する筑波大学大学院における研究プロジェクトとして運営されているサービスです。本サービスは日本国の法令にのみ準拠して運用されており、日本国以外の国・地域の法令については一切関知しておりません。\r\n\r\nそもそも世界には 200 カ国近くの国が存在しており、それぞれの国における法律は互いに異なります。すべての国の法律を調査した上でそれらすべてに適合することを保証したソフトウェアを開発することは事実上不可能です。万一ユーザーが本サービスを特定の国・地域の領域内で利用したことによって公務員により法的なペナルティを科せられるなどの損害が発生した場合であっても、プロジェクト実施者は一切責任を負いません。本ソフトウェアまたはサービスを使用する際には、ユーザーが適用されるすべての法令をユーザーの責任により遵守してください。本ソフトウェアまたはサービスを日本国内・国外を問わず使用された場合に発生するすべての損害と責任は、ユーザーに帰責します。本学術実験の運営者およびソフトウェアの供給者は、一切責任を負いません。VPN Gate 中継サービスは、バックグラウンドで動作するシステムサービスとしてコンピュータにインストールされます。これらの管理 GUI ツールを終了しても、システムサービスは継続してバックグラウンドで動作し続けます。システムサービスは、CPU 時間、コンピュータの消費電力、メモリおよびディスクの容量を消費します。これらの注意事項に同意いただけない場合は、VPN Gate 学術実験サービスに関連する機能を使用しないでください。

+VGS_START				VPN Gate 中継サービス機能 (VPN Gate Relay Service) を有効にします。\r\nこのコンピュータで VPN Gate 中継サービス機能を有効にすると、このコンピュータは、任意の VPN Gate ユーザーからの VPN 接続を受け付け、通信を中継することができるようになります。\r\n\r\nVPN Gate Relay Service を有効にしてボランティアとして VPN Gate 実験に参加している場合、VPN Gate Relay Service は、インターネットを経由して、VPN Gate クライアントからの VPN 通信とパケットの中継を行ないます。この場合、VPN 経由の通信のソース IP アドレスは VPN Gate Relay Service を稼働させているコンピュータの IP アドレスに変化します。また、VPN 通信は暗号化されることため、VPN クライアントと VPN Gate Relay Service との間の通信は、政府の検閲用ファイアウォールによる検閲を回避することができます。VPN Gate Relay Service は、Windows のバックグラウンドプログラムとして動作し、ユーザーがログオンする前でも稼働します。\r\n\r\nユーザーは VPN Gate を主に検閲回避のために使用することが想定されています。VPN Gate Relay Service では VPN 接続ログおよびパケットログが記録されます。Tor と異なり、VPN Gate では、匿名化の効果はありませんので、注意してください。\r\n\r\nVPN Gate Relay Service を稼働させることで、インターネットを介して、他の VPN Gate ユーザーに提供することは、空港や市街地などの公共の場所で Public WiFi を稼働させることと、技術的に均しい効果を生じさせます。Public WiFi でも通信ログが保存されているように、VPN Gate Relay Service でも通信ログが自動的に保存されます。これは VPN Gate Relay Service を稼働させているコンピュータのディスクに保存されます。ユーザーが VPN Gate Relay Service を経由して通信を行なった結果、法的な問題が発生することがあります。この場合は、VPN Gate Relay Service の管理者としては、通信ログを警察や裁判所、弁護士等に提出することが必要になる場合もあります。管理者は、法律に従ってログの提出を依頼または命令された場合は、インターネットの治安維持のために、適法に協力する義務を負います。上記のことを理解した上で、VPN Gate Relay Service を有効にしてください。\r\n\r\nVPN Gate 中継サービス機能は、ユーザーの責任で有効にしてください。\r\n法令によって VPN による暗号化通信が禁止されている国があります。\r\n\r\nVPN Gate 中継サービス機能について詳しくは http://www.vpngate.net/ja/join.aspx をお読みください。\r\n\r\nVPN Gate 学術実験サービスは、日本国に所在する筑波大学大学院における研究プロジェクトとして運営されているサービスです。本サービスは日本国の法令にのみ準拠して運用されており、日本国以外の国・地域の法令については一切関知しておりません。\r\n\r\nそもそも世界には 200 カ国近くの国が存在しており、それぞれの国における法律は互いに異なります。すべての国の法律を調査した上でそれらすべてに適合することを保証したソフトウェアを開発することは事実上不可能です。万一ユーザーが本サービスを特定の国・地域の領域内で利用したことによって公務員により法的なペナルティを科せられるなどの損害が発生した場合であっても、プロジェクト実施者は一切責任を負いません。本ソフトウェアまたはサービスを使用する際には、ユーザーが適用されるすべての法令をユーザーの責任により遵守してください。本ソフトウェアまたはサービスを日本国内・国外を問わず使用された場合に発生するすべての損害と責任は、ユーザーに帰責します。本学術実験の運営者およびソフトウェアの供給者は、一切責任を負いません。VPN Gate 中継サービスは、バックグラウンドで動作するシステムサービスとしてコンピュータにインストールされます。これらの管理 GUI ツールを終了しても、システムサービスは継続してバックグラウンドで動作し続けます。システムサービスは、CPU 時間、コンピュータの消費電力、メモリおよびディスクの容量を消費します。これらの注意事項に同意いただけない場合は、VPN Gate 学術実験サービスに関連する機能を使用しないでください。\r\n

+VGS_START2				VPN Gate 中継サービス機能 (VPN Gate Relay Service) を有効にします。よろしいですか?

 

 

 # サービス関係 (Win32)

@@ -4454,7 +4455,7 @@ CMD_VPNCMD_HOST_2		接続先の VPN Client が動作しているコンピュー�
 CMD_VPNCMD_HOST_3		接続先のホスト名または IP アドレス: 

 CMD_VPNCMD_HUB_1		サーバーに仮想 HUB 管理モードで接続する場合は、仮想 HUB 名を入力してください。\nサーバー管理モードで接続する場合は、何も入力せずに Enter を押してください。

 CMD_VPNCMD_HUB_2		接続先の仮想 HUB 名を入力: 

-CMD_VPNCMD_ABOUT		SoftEther VPN コマンドライン管理ユーティリティ (vpncmd コマンド)\n%S\n%S\nCopyright (c) SoftEther VPN Project. All Rights Reserved.\n

+CMD_VPNCMD_ABOUT		SoftEther VPN コマンドライン管理ユーティリティ (vpncmd コマンド)\n%S\n%S\nCopyright (c) 2012-%u SoftEther VPN Project. All Rights Reserved.\n

 CMD_VPNCMD_PASSWORD_1	アクセスが拒否されました。パスワードが間違っているか、接続する管理モードが正しくない可能性があります。パスワードをもう一度入力することができます。キャンセルする場合は、Ctrl + D を押してください。

 CMD_VPNCMD_PASSWORD_2	パスワード: 

 CMD_VPNCMD_ERROR		エラーが発生しました。(エラーコード: %u)\n%s

diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab
index 0403d6c0..b813d194 100644
--- a/src/bin/vpnweb.cab
+++ b/src/bin/vpnweb.cab
diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx
index 335e0ef9..3f868e94 100644
--- a/src/bin/vpnweb.ocx
+++ b/src/bin/vpnweb.ocx
diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h
index 4020154a..e32d8409 100644
--- a/src/vpnweb/vpnweb.h
+++ b/src/vpnweb/vpnweb.h
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Tue Apr 26 17:40:18 2022

+/* at Thu Nov 17 16:16:08 2022

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_i.c b/src/vpnweb/vpnweb_i.c
index 4560a468..b994cc43 100644
--- a/src/vpnweb/vpnweb_i.c
+++ b/src/vpnweb/vpnweb_i.c
@@ -6,7 +6,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Tue Apr 26 17:40:18 2022

+/* at Thu Nov 17 16:16:08 2022

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)

diff --git a/src/vpnweb/vpnweb_p.c b/src/vpnweb/vpnweb_p.c
index 61ebb76a..bdbb5e3e 100644
--- a/src/vpnweb/vpnweb_p.c
+++ b/src/vpnweb/vpnweb_p.c
@@ -4,7 +4,7 @@
 

 

  /* File created by MIDL compiler version 7.00.0500 */

-/* at Tue Apr 26 17:40:18 2022

+/* at Thu Nov 17 16:16:08 2022

  */

 /* Compiler settings for .\vpnweb.idl:

     Oicf, W1, Zp8, env=Win32 (32b run)