v4.23-9647-betav4.23-9647-beta

8 files changed, 170 insertions, 155 deletions

diff --git a/src/bin/hamcore/authors.txt b/src/bin/hamcore/authors.txt
index 8a1f2561..44fdbcfd 100644
--- a/src/bin/hamcore/authors.txt
+++ b/src/bin/hamcore/authors.txt
@@ -6,7 +6,7 @@ AUTHORS OF SOFTETHER VPN
 

 CORE DEVELOPERS:

 

-  - Daiyuu Nobori

+  - Daiyuu Nobori, Ph.D.

     Computer Science, Graduate School of University of Tsukuba

     SoftEther Corporation

     E-mail: daiyuu-nobori [at] softether.org

@@ -18,16 +18,16 @@ CORE DEVELOPERS:
     Risk Engineering, Graduate School of University of Tsukuba

     SoftEther Corporation

 

-  - Takao Ito

+  - Takao Ito, Ph.D.

     Computer Science, Graduate School of University of Tsukuba

     SoftEther Corporation

 

+  - Mei Sharie Ann Yamaguchi, Ph.D.

+    Life and Environmental Sciences, Graduate School of University of Tsukuba

+

   - Christopher Smith

     College of Information Science, University of Tsukuba

 

-  - Mei Sharie Ann Yamaguchi

-    Life and Environmental Sciences, Graduate School of University of Tsukuba

-

 

 WEB-SITE DESIGNER:

 

@@ -118,6 +118,26 @@ CONTRIBUTORS on GitHub:
   - Sacha Bernstein

     https://github.com/sacha

 

+  - cm0x4D

+    https://github.com/cm0x4D

+

+  - DDGo

+    https://github.com/DDGo

+

+  - Noah O'Donoghue

+    https://github.com/NoahO

+

+  - Moataz Elmasry

+    https://github.com/moatazelmasry2

+

+  - Zulyandri Zardi

+    https://github.com/zulzardi

+

+  - rel22

+    https://github.com/rel22

+

+  - Guanzhong Chen

+    https://github.com/quantum5

 

 JOIN THE SOFTETHER VPN DEVELOPMENT

 ----------------------------------

@@ -127,8 +147,3 @@ Want to become a contributor? Please send us a patch.
 See also: SoftEther VPN Patch Acceptance Policy

 http://www.softether.org/5-download/src/9.patch

 

-

-Developed by SoftEther VPN Project at University of Tsukuba in Japan.

-Department of Computer Science has dozens of overly-enthusiastic geeks.

-Join us: http://www.tsukuba.ac.jp/english/admission/

-

diff --git a/src/bin/hamcore/eula.txt b/src/bin/hamcore/eula.txt
index b9d60973..8070f492 100644
--- a/src/bin/hamcore/eula.txt
+++ b/src/bin/hamcore/eula.txt
@@ -1,8 +1,8 @@
 SoftEther VPN Server, Client and Bridge are free software, and released as open-source. You can redistribute them and/or modify them under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.

 

-Copyright (c) 2012-2016 Daiyuu Nobori.

-Copyright (c) 2012-2016 SoftEther Project at University of Tsukuba, Japan.

-Copyright (c) 2012-2016 SoftEther Corporation.

+Copyright (c) Daiyuu Nobori.

+Copyright (c) SoftEther Project at University of Tsukuba, Japan.

+Copyright (c) SoftEther Corporation.

 All Rights Reserved.

 http://www.softether.org/

 

diff --git a/src/bin/hamcore/openvpn_sample.ovpn b/src/bin/hamcore/openvpn_sample.ovpn
index 0ae75863..83bc3df3 100644
--- a/src/bin/hamcore/openvpn_sample.ovpn
+++ b/src/bin/hamcore/openvpn_sample.ovpn
@@ -1,137 +1,137 @@
-###############################################################################

-# OpenVPN 2.0 Sample Configuration File

-# for PacketiX VPN / SoftEther VPN Server

-# 

-# !!! AUTO-GENERATED BY SOFTETHER VPN SERVER MANAGEMENT TOOL !!!

-# 

-# !!! YOU HAVE TO REVIEW IT BEFORE USE AND MODIFY IT AS NECESSARY !!!

-# 

-# This configuration file is auto-generated. You might use this config file

-# in order to connect to the PacketiX VPN / SoftEther VPN Server.

-# However, before you try it, you should review the descriptions of the file

-# to determine the necessity to modify to suitable for your real environment.

-# If necessary, you have to modify a little adequately on the file.

-# For example, the IP address or the hostname as a destination VPN Server

-# should be confirmed.

-# 

-# Note that to use OpenVPN 2.0, you have to put the certification file of

-# the destination VPN Server on the OpenVPN Client computer when you use this

-# config file. Please refer the below descriptions carefully.

-

-

-###############################################################################

-# Specify the type of the layer of the VPN connection.

-# 

-# To connect to the VPN Server as a "Remote-Access VPN Client PC",

-#  specify 'dev tun'. (Layer-3 IP Routing Mode)

-#

-# To connect to the VPN Server as a bridging equipment of "Site-to-Site VPN",

-#  specify 'dev tap'. (Layer-2 Ethernet Bridgine Mode)

-

-dev $TAG_TUN_TAP$

-

-

-###############################################################################

-# Specify the underlying protocol beyond the Internet.

-# Note that this setting must be correspond with the listening setting on

-# the VPN Server.

-# 

-# Specify either 'proto tcp' or 'proto udp'.

-

-proto $TAG_PROTO$

-

-

-###############################################################################

-# The destination hostname / IP address, and port number of

-# the target VPN Server.

-# 

-# You have to specify as 'remote <HOSTNAME> <PORT>'. You can also

-# specify the IP address instead of the hostname.

-# 

-# Note that the auto-generated below hostname are a "auto-detected

-# IP address" of the VPN Server. You have to confirm the correctness

-# beforehand.

-# 

-# When you want to connect to the VPN Server by using TCP protocol,

-# the port number of the destination TCP port should be same as one of

-# the available TCP listeners on the VPN Server.

-# 

-# When you use UDP protocol, the port number must same as the configuration

-# setting of "OpenVPN Server Compatible Function" on the VPN Server.

-

-$TAG_BEFORE_REMOTE$remote $TAG_HOSTNAME$ $TAG_PORT$

-

-

-###############################################################################

-# The HTTP/HTTPS proxy setting.

-# 

-# Only if you have to use the Internet via a proxy, uncomment the below

-# two lines and specify the proxy address and the port number.

-# In the case of using proxy-authentication, refer the OpenVPN manual.

-

-;http-proxy-retry

-;http-proxy [proxy server] [proxy port]

-

-

-###############################################################################

-# The encryption and authentication algorithm.

-# 

-# Default setting is good. Modify it as you prefer.

-# When you specify an unsupported algorithm, the error will occur.

-# 

-# The supported algorithms are as follows:

-#  cipher: [NULL-CIPHER] NULL AES-128-CBC AES-192-CBC AES-256-CBC BF-CBC

-#          CAST-CBC CAST5-CBC DES-CBC DES-EDE-CBC DES-EDE3-CBC DESX-CBC

-#          RC2-40-CBC RC2-64-CBC RC2-CBC CAMELLIA-128-CBC CAMELLIA-192-CBC CAMELLIA-256-CBC

-#  auth:   SHA SHA1 SHA256 SHA384 SHA512 MD5 MD4 RMD160

-

-cipher AES-128-CBC

-auth SHA1

-

-

-###############################################################################

-# Other parameters necessary to connect to the VPN Server.

-# 

-# It is not recommended to modify it unless you have a particular need.

-

-resolv-retry infinite

-nobind

-persist-key

-persist-tun

-client

-verb 3

-auth-user-pass

-

-

-###############################################################################

-# The certificate file of the destination VPN Server.

-# 

-# The CA certificate file is embedded in the inline format.

-# You can replace this CA contents if necessary.

-# Please note that if the server certificate is not a self-signed, you have to

-# specify the signer's root certificate (CA) here.

-

-<ca>

-$CA$

-</ca>

-

-

-###############################################################################

-# The client certificate file (dummy).

-# 

-# In some implementations of OpenVPN Client software

-# (for example: OpenVPN Client for iOS),

-# a pair of client certificate and private key must be included on the

-# configuration file due to the limitation of the client.

-# So this sample configuration file has a dummy pair of client certificate

-# and private key as follows.

-

-<cert>

-$CERT$

-</cert>

-

-<key>

-$KEY$

-</key>

-

-

+###############################################################################
+# OpenVPN 2.0 Sample Configuration File
+# for PacketiX VPN / SoftEther VPN Server
+# 
+# !!! AUTO-GENERATED BY SOFTETHER VPN SERVER MANAGEMENT TOOL !!!
+# 
+# !!! YOU HAVE TO REVIEW IT BEFORE USE AND MODIFY IT AS NECESSARY !!!
+# 
+# This configuration file is auto-generated. You might use this config file
+# in order to connect to the PacketiX VPN / SoftEther VPN Server.
+# However, before you try it, you should review the descriptions of the file
+# to determine the necessity to modify to suitable for your real environment.
+# If necessary, you have to modify a little adequately on the file.
+# For example, the IP address or the hostname as a destination VPN Server
+# should be confirmed.
+# 
+# Note that to use OpenVPN 2.0, you have to put the certification file of
+# the destination VPN Server on the OpenVPN Client computer when you use this
+# config file. Please refer the below descriptions carefully.
+
+
+###############################################################################
+# Specify the type of the layer of the VPN connection.
+# 
+# To connect to the VPN Server as a "Remote-Access VPN Client PC",
+#  specify 'dev tun'. (Layer-3 IP Routing Mode)
+#
+# To connect to the VPN Server as a bridging equipment of "Site-to-Site VPN",
+#  specify 'dev tap'. (Layer-2 Ethernet Bridgine Mode)
+
+dev $TAG_TUN_TAP$
+
+
+###############################################################################
+# Specify the underlying protocol beyond the Internet.
+# Note that this setting must be correspond with the listening setting on
+# the VPN Server.
+# 
+# Specify either 'proto tcp' or 'proto udp'.
+
+proto $TAG_PROTO$
+
+
+###############################################################################
+# The destination hostname / IP address, and port number of
+# the target VPN Server.
+# 
+# You have to specify as 'remote <HOSTNAME> <PORT>'. You can also
+# specify the IP address instead of the hostname.
+# 
+# Note that the auto-generated below hostname are a "auto-detected
+# IP address" of the VPN Server. You have to confirm the correctness
+# beforehand.
+# 
+# When you want to connect to the VPN Server by using TCP protocol,
+# the port number of the destination TCP port should be same as one of
+# the available TCP listeners on the VPN Server.
+# 
+# When you use UDP protocol, the port number must same as the configuration
+# setting of "OpenVPN Server Compatible Function" on the VPN Server.
+
+$TAG_BEFORE_REMOTE$remote $TAG_HOSTNAME$ $TAG_PORT$
+
+
+###############################################################################
+# The HTTP/HTTPS proxy setting.
+# 
+# Only if you have to use the Internet via a proxy, uncomment the below
+# two lines and specify the proxy address and the port number.
+# In the case of using proxy-authentication, refer the OpenVPN manual.
+
+;http-proxy-retry
+;http-proxy [proxy server] [proxy port]
+
+
+###############################################################################
+# The encryption and authentication algorithm.
+# 
+# Default setting is good. Modify it as you prefer.
+# When you specify an unsupported algorithm, the error will occur.
+# 
+# The supported algorithms are as follows:
+#  cipher: [NULL-CIPHER] NULL AES-128-CBC AES-192-CBC AES-256-CBC BF-CBC
+#          CAST-CBC CAST5-CBC DES-CBC DES-EDE-CBC DES-EDE3-CBC DESX-CBC
+#          RC2-40-CBC RC2-64-CBC RC2-CBC CAMELLIA-128-CBC CAMELLIA-192-CBC CAMELLIA-256-CBC
+#  auth:   SHA SHA1 SHA256 SHA384 SHA512 MD5 MD4 RMD160
+
+cipher AES-128-CBC
+auth SHA1
+
+
+###############################################################################
+# Other parameters necessary to connect to the VPN Server.
+# 
+# It is not recommended to modify it unless you have a particular need.
+
+resolv-retry infinite
+nobind
+persist-key
+persist-tun
+client
+verb 3
+auth-user-pass
+
+
+###############################################################################
+# The certificate file of the destination VPN Server.
+# 
+# The CA certificate file is embedded in the inline format.
+# You can replace this CA contents if necessary.
+# Please note that if the server certificate is not a self-signed, you have to
+# specify the signer's root certificate (CA) here.
+
+<ca>
+$CA$
+</ca>
+
+
+###############################################################################
+# The client certificate file (dummy).
+# 
+# In some implementations of OpenVPN Client software
+# (for example: OpenVPN Client for iOS),
+# a pair of client certificate and private key must be included on the
+# configuration file due to the limitation of the client.
+# So this sample configuration file has a dummy pair of client certificate
+# and private key as follows.
+
+<cert>
+$CERT$
+</cert>
+
+<key>
+$KEY$
+</key>
+
+
diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb
index eb036a75..7d86c2f7 100644
--- a/src/bin/hamcore/strtable_cn.stb
+++ b/src/bin/hamcore/strtable_cn.stb
@@ -1654,7 +1654,7 @@ SM_DDNS_OK_MSG2		动态 DNS 主机名被更改为'%S'。\r\n\r\n单击提示读�
 SM_DDNS_KEY_TITLE		动态 DNS 密钥

 SM_DDNS_KEY_MSG			动态 DNS 密钥: %s\r\n\r\n此密钥与当前的 DDNS 名称相关联。如果你的 VPN 服务器电脑损坏，丢失了密钥，当前的 DDNS 名称将被永远占用，且其他 VPN 服务器将无法使用相同的名称。\r\n如果你想继续使用相同的名称，请在互联网服务上、或另一台电脑上、或在便笺纸上保留密钥。\r\n当在新的 VPN 服务器设置密钥时，编辑 VPN 服务器的配置文件。请在 "declare DDnsClient" 指令下，用跟随 "byte Key" 的值替换​字符串的密钥。\r\n请不要同时在两个或多个 VPN 服务器上设置相同的密钥。

 SM_DDNS_KEY_ERR			无法读取 DNS 密钥。

-SM_IPSEC_PSK_TOO_LONG		预共享密钥(PSK)有 10 个或更多的字母。\r\n\r\n据报道谷歌安卓的几个版本有一个 10 个或更多字母作为预共享密钥的严重故障。\r\n因此 9 个或少于 9 个字母被推荐作为预共享密钥。\r\n\r\n您要修改预共享密钥吗？

+SM_IPSEC_PSK_TOO_LONG		预共享密钥(PSK)有 10 个或更多的字母。\r\n\r\n据报道谷歌安卓的几个版本有一个 10 个或更多字母作为预共享密钥的严重故障。\r\n因此 9 个或少于 9 个字母被推荐作为预共享密钥。\r\n\r\n您要尝试其他预共享密钥吗？

 SM_ADVANCED_REDIRECT_URL_HINT_TITLE	如何使用高级 HTTP 重定向功能

 SM_ADVANCED_REDIRECT_URL_HINT	高级 HTTP 重定向(为专家)\r\n\r\n此字符串“<INFO>”是一个占位符。它可以嵌入重定向的 URL 中。\r\n\r\n嵌入 URL 示例：\r\nhttp://www.google.com/search?q=<INFO>|secret\r\n\r\n当客户端将被重定向，重定向的实际 URL 目的地将被取代如下。\r\n\r\n用户名|会话ID|IP 地址|日期和时间|哈希值\r\n\r\n替换后示例：zurukko|SID-ZURUKKO-123|219.117.219.154|20131117100354|99707160AFE7A454042B2C47B064112D652452D7\r\n\r\n各字段的详情描述如下。\r\n\r\n用户名：当前 VPN 会话的用户名将被放置。\r\n\r\n会话ID：VPN 会话的会话 ID 将被放置\r\n\r\n日期和时间：14 位数字将以'YYYYMMDDHHMMSS’格式放置(时区是 UTC)\r\n\r\n哈希值：代表 20 个字节二进制数据的一个 40 字符的十六进制字符串。二进制数据是 SHA-1 哈希函数至临时字符串的结果。在重定向 URL 中“|”符号后，临时字符串是上述字段的位阵列加上秘密字符串的结合。(在上面的例子中，“秘密”是秘密字符串)。如果在 URL 中没有“|”符号，没有哈希值将被添加。\r\n\r\n哈希值的目的：秘密字符串如密钥般有效。感谢密钥。在重定向 URL 中接收重定向查询字符串的 CGI 程序，可以验证包含在 URL 中参数的完整性。\r\n

 SM_ADVANCED_REDIRECT_URL_MSG	URL 必须以“http://”或“https://”开始

@@ -2448,7 +2448,7 @@ STATIC7						保持互联网连接功能(&K)
 

 PREFIX						D_ABOUT

 S_INFO1					SoftEther VPN %u.0 (Ver %u.%02u, Build %u)

-S_INFO2				An 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: http://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 (eay@cryptsoft.com). / 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 是日本政府的研究和开发项目的一项工作，由日本的经济、贸易和工业部资助，由信息化推进机构管理。

 IDCANCEL				确定(&O)

diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb
index b2ecc47d..16e6b08f 100644
--- a/src/bin/hamcore/strtable_en.stb
+++ b/src/bin/hamcore/strtable_en.stb
@@ -1636,7 +1636,7 @@ SM_DDNS_OK_MSG2			The Dynamic DNS hostname has been changed to '%S'.\r\n\r\nClic
 SM_DDNS_KEY_TITLE		Dynamic DNS Key

 SM_DDNS_KEY_MSG			Your Dynamic DNS Private Key: %s\r\n\r\nThis is the private key which is associated with your current DDNS name. If your VPN Server PC damaged and lost the key, the current DDNS name will be occupied forever and other VPN Server will not be able to use the same name.\r\nIf you want to continue to use the same name, keep the key on a safe place, such as an Internet storage, an another PC or a notepad.\r\nWhen applying the key to the new VPN Server, edit the configuration file of the VPN Server to replace the key by the string in the value following to "byte Key" in the "declare DDnsClient" directive.\r\nDo not use the duplicated key to two or more VPN Servers at the same time.

 SM_DDNS_KEY_ERR			Failed to read the DNS key.

-SM_IPSEC_PSK_TOO_LONG	The pre-shared key (PSK) has 10 or more letters.\r\n\r\nIt is reported that several versions of Google Android has a serious bug with 10 or more letters pre-shared key.\r\nTherefore 9 or less letters are recommended for pre-shared key.\r\n\r\nDo you want to modify the pre-shared key?

+SM_IPSEC_PSK_TOO_LONG	The pre-shared key (PSK) has 10 or more letters.\r\n\r\nIt is reported that several versions of Google Android has a serious bug with 10 or more letters pre-shared key.\r\nTherefore 9 or less letters are recommended for pre-shared key.\r\n\r\nDo you want to try another pre-shared key?

 SM_ADVANCED_REDIRECT_URL_HINT_TITLE	How to Use Advanced HTTP Redirection Function

 SM_ADVANCED_REDIRECT_URL_HINT	Advanced HTTP Redirection (For Experts)\r\n\r\nThe string "<INFO>" is a place holder. It can embedded on the URL of redirection.\r\n\r\nEmbedded URL Example:\r\nhttp://www.google.com/search?q=<INFO>|secret\r\n\r\nWhen the client is being redirected, the actual destination URL of redirection will be replaced as follows.\r\n\r\nUsername|Session ID|IP Address|Date and Time|Hash Value\r\n\r\\nAfter Replacement Example: zurukko|SID-ZURUKKO-123|219.117.219.154|20131117100354|99707160AFE7A454042B2C47B064112D652452D7\r\n\r\nThe details of each fields are described as following.\r\n\r\nUsername: The username using for the current VPN Session will be placed.\r\n\r\nSession ID: The Session ID of the VPN Session will be placed.\r\n\r\nDate and Time: 14-digits will be placed as 'YYYYMMDDHHMMSS' format (Time zone is UTC).\r\n\r\nHash Value: A 40-characters hexadecimal strings which represent 20 bytes binary data. The binary data is the result of SHA-1 hash function to the temporary string. The temporary string is the combination of the bit-array of the above fields plus the secret string after the '|' symbol in the redirection URL. (In the above example, "secret" is the secret string.) If there are no '|' symbols in the URL, no hash value will be appended.\r\n\r\nThe Purpose of Hash Value: The secret string is effective as the secret key. Thanks to the secret key, the CGI program which receives the query strings on the redirected URL can verify the integrity of the parameters included in the URL.\r\n

 SM_ADVANCED_REDIRECT_URL_MSG	An URL must start with "http://" or "https://"

@@ -2428,7 +2428,7 @@ STATIC7					&Keep Alive Internet Connection Function:
 

 PREFIX					D_ABOUT

 S_INFO1					SoftEther VPN %u.0 (Ver %u.%02u, Build %u)

-S_INFO2				An 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: http://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 (eay@cryptsoft.com). / 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

diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb
index d1f4a4dd..720fdb89 100644
--- a/src/bin/hamcore/strtable_ja.stb
+++ b/src/bin/hamcore/strtable_ja.stb
@@ -2433,7 +2433,7 @@ STATIC7					インターネット接続の維持機能(&N)
 

 PREFIX					D_ABOUT

 S_INFO1					SoftEther VPN %u.0 (Ver %u.%02u, Build %u)

-S_INFO2				An 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: http://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 (eay@cryptsoft.com). / 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

diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab
index da59f346..662b2508 100644
--- a/src/bin/vpnweb.cab
+++ b/src/bin/vpnweb.cab
diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx
index 013df20c..b9114dc0 100644
--- a/src/bin/vpnweb.ocx
+++ b/src/bin/vpnweb.ocx