From scmnotify ＠ osdn.net  Sat Jan  1 17:56:30 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 01 Jan 2022 17:56:30 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjBdIOODieOCreODpeODoeODs+ODiA==?=
 =?utf-8?b?44KSIExpYnJlU1NMIOOBq+WvvuW/nA==?=
Message-ID: <1641027390.473829.32743.nullmailer@users.osdn.me>

Revision: 9660
          https://osdn.net/projects/ttssh2/scm/svn/commits/9660
Author:   nmaya
Date:     2022-01-01 17:56:30 +0900 (Sat, 01 Jan 2022)
Log Message:
-----------
ドキュメントを LibreSSL に対応

- 使用しているライブラリを OpenSSL から LibreSSL に変更
- LibreSSL のライセンス表記
  「OpenSSL License(Apache License 1.0)」と「SSLeay License(四条項BSDライセンス)」と「ISC ライセンス」と「パブリックドメイン」
- ライセンスファイルを差し替え
- 変更履歴

Modified Paths:
--------------
    branches/libressl_3_4_2/doc/convtext.bat
    branches/libressl_3_4_2/doc/en/html/about/copyright.html
    branches/libressl_3_4_2/doc/en/html/about/history.html
    branches/libressl_3_4_2/doc/en/html/index.html
    branches/libressl_3_4_2/doc/en/html/reference/.gitignore
    branches/libressl_3_4_2/doc/en/html/reference/develop.txt
    branches/libressl_3_4_2/doc/en/html/reference/sourcecode.html
    branches/libressl_3_4_2/doc/en/teraterm.hhc
    branches/libressl_3_4_2/doc/en/teraterm.hhp
    branches/libressl_3_4_2/doc/ja/html/about/copyright.html
    branches/libressl_3_4_2/doc/ja/html/about/history.html
    branches/libressl_3_4_2/doc/ja/html/index.html
    branches/libressl_3_4_2/doc/ja/html/reference/.gitignore
    branches/libressl_3_4_2/doc/ja/html/reference/develop.txt
    branches/libressl_3_4_2/doc/ja/html/reference/sourcecode.html
    branches/libressl_3_4_2/doc/ja/teraterm.hhc
    branches/libressl_3_4_2/doc/ja/teraterm.hhp

-------------- next part --------------
Modified: branches/libressl_3_4_2/doc/convtext.bat
===================================================================
--- branches/libressl_3_4_2/doc/convtext.bat	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/convtext.bat	2022-01-01 08:56:30 UTC (rev 9660)
@@ -6,8 +6,8 @@
 %TOSJIS% -i ..\libs\oniguruma\COPYING   -o %REF_J%\Oniguruma-LICENSE.txt -l unix
 %TOSJIS% -i ..\libs\oniguruma\doc\RE    -o %REF_E%\RE.txt                -l unix
 %TOSJIS% -i ..\libs\oniguruma\doc\RE.ja -o %REF_J%\RE.txt      -c utf8   -l unix
-%TOSJIS% -i ..\libs\openssl\LICENSE     -o %REF_E%\OpenSSL-LICENSE.txt   -l unix
-%TOSJIS% -i ..\libs\openssl\LICENSE     -o %REF_J%\OpenSSL-LICENSE.txt   -l unix
+%TOSJIS% -i ..\libs\libressl\COPYING    -o %REF_E%\LibreSSL-LICENSE.txt  -l unix
+%TOSJIS% -i ..\libs\libressl\COPYING    -o %REF_J%\LibreSSL-LICENSE.txt  -l unix
 %TOSJIS% -i ..\libs\putty\LICENCE       -o %REF_E%\PuTTY-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\putty\LICENCE       -o %REF_J%\PuTTY-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\SFMT\LICENSE.txt    -o %REF_E%\SFMT-LICENSE.txt      -l unix

Modified: branches/libressl_3_4_2/doc/en/html/about/copyright.html
===================================================================
--- branches/libressl_3_4_2/doc/en/html/about/copyright.html	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/en/html/about/copyright.html	2022-01-01 08:56:30 UTC (rev 9660)
@@ -29,7 +29,7 @@
   <li><a href="https://github.com/kkos/oniguruma">Oniguruma</a> ... <a href="../reference/Oniguruma-LICENSE.txt">2-clause BSD license</a></li>
   <li><a href="http://www.math.sci.hiroshima-u.ac.jp/m-mat/MT/SFMT/index.html">SFMT</a> ... <a href="../reference/SFMT-LICENSE.txt">3-clause BSD license</a></li>
   <li><a href="https://www.openssh.com">OpenSSH</a> ... <a href="../reference/OpenSSH-LICENSE.txt">BSD style license</a></li>
-  <li><a href="https://www.openssl.org">OpenSSL</a> ... <a href="../reference/OpenSSL-LICENSE.txt">Dual(both) license, OpenSSL License(Apache License 1.0) and SSLeay License(4-clause BSD license)</a></li>
+  <li><a href="https://www.libressl.org">LibreSSL</a> ... <a href="../reference/LibreSSL-LICENSE.txt">OpenSSL License(Apache License 1.0)" and "SSLeay License(4-clause BSD license)" and "ISC license" and "public domain"</a></li>
   <li><a href="https://zlib.net">zlib</a> ... <a href="../reference/zlib-LICENSE.txt">zlib License</a></li>
   <li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">PuTTY</a> ... <a href="../reference/PuTTY-LICENSE.txt">MIT License</a></li>
   <li><a href="https://github.com/P-H-C/phc-winner-argon2">The reference C implementation of Argon2</a> ... <a href="../reference/argon2-LICENSE.txt">Creative Commons CC0 1.0 License/Waiver or the Apache License 2.0</a></li>
@@ -153,8 +153,8 @@
 
   Copyright of original TTSSH belongs to Robert O'Callahan.
   Copyright of TTSSH supporting SSH2 belongs to Yutaka Hirata.
-  Copyright of OpenSSL belongs to OpenSSL project. Please see <a href="../reference/OpenSSL-LICENSE.txt">OpenSSL-LICENSE.txt</a> for more information about license.
-    OpenSSL is linked to this program statically.
+  Copyright of LibreSSL belongs to OpenBSD project. Please see <a href="../reference/LibreSSL-LICENSE.txt">LibreSSL-LICENSE.txt</a> for more information about license.
+    LibreSSL is linked to this program statically.
   Copyright of zlib belongs to Greg Roelofs and Jean-loup Gaill. Please see <a href="../reference/zlib-LICENSE.txt">OpenSSL-LICENSE.txt</a> for more information about license.
     zlib is linked to this program statically.
   Copyright of OpenSSH belongs to each developers. Please see <a href="../reference/OpenSSH-LICENSE.txt">OpenSSH-LICENSE.txt</a> for more information.

Modified: branches/libressl_3_4_2/doc/en/html/about/history.html
===================================================================
--- branches/libressl_3_4_2/doc/en/html/about/history.html	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/en/html/about/history.html	2022-01-01 08:56:30 UTC (rev 9660)
@@ -47,6 +47,7 @@
 
   <li>Misc
     <ul>
+      <li>Upgraded TTSSH to <a href="#ttssh_2.93">2.93</a>.</li>
       <li>Added about EAR(Export Administration Regulations) to Frequently asked questions.</li>
     </ul>
   </li>
@@ -3298,6 +3299,25 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
+<h3 id="ttssh_2.93">2022.xx.xx (Ver 2.93 not released)</h3>
+<ul class="history">
+  <!--li>Changes
+    <ul>
+    </ul>
+  </li-->
+
+  <!--li>Bug fixes
+    <ul>
+    </ul>
+  </li-->
+
+  <li>Misc
+    <ul>
+      <li>Changed cryptography library from OpenSSL to LibreSSL 3.4.2.</li>
+    </ul>
+  </li>
+</ul>
+
 <h3 id="ttssh_2.92">2021.6.5 (Ver 2.92)</h3>
 <ul class="history">
   <li>Changes

Modified: branches/libressl_3_4_2/doc/en/html/index.html
===================================================================
--- branches/libressl_3_4_2/doc/en/html/index.html	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/en/html/index.html	2022-01-01 08:56:30 UTC (rev 9660)
@@ -142,7 +142,7 @@
  <LI><A HREF="reference/Oniguruma-LICENSE.txt">License of Oniguruma</A></LI>
  <LI><A HREF="reference/SFMT-LICENSE.txt">License of SFMT</A></LI>
  <LI><A HREF="reference/OpenSSH-LICENSE.txt">License of OpenSSH</A></LI>
- <LI><A HREF="reference/OpenSSL-LICENSE.txt">License of OpenSSL</A></LI>
+ <LI><A HREF="reference/LibreSSL-LICENSE.txt">License of LibreSSL</A></LI>
  <LI><A HREF="reference/zlib-LICENSE.txt">License of zlib</A></LI>
  <LI><A HREF="reference/PuTTY-LICENSE.txt">License of PuTTY</A></LI>
  <LI><A HREF="reference/argon2-LICENSE.txt">License of The reference C implementation of Argon2</A></LI>

Modified: branches/libressl_3_4_2/doc/en/html/reference/.gitignore
===================================================================
--- branches/libressl_3_4_2/doc/en/html/reference/.gitignore	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/en/html/reference/.gitignore	2022-01-01 08:56:30 UTC (rev 9660)
@@ -1,6 +1,7 @@
 CygTerm+-LICENSE.txt
 Oniguruma-LICENSE.txt
 OpenSSL-LICENSE.txt
+LibreSSL-LICENSE.txt
 PuTTY-LICENSE.txt
 RE.txt
 SFMT-LICENSE.txt

Modified: branches/libressl_3_4_2/doc/en/html/reference/develop.txt
===================================================================
--- branches/libressl_3_4_2/doc/en/html/reference/develop.txt	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/en/html/reference/develop.txt	2022-01-01 08:56:30 UTC (rev 9660)
@@ -77,7 +77,7 @@
 
 * Libraries
 - Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.1k (http://www.openssl.org/)
+- LibreSSL 3.4.2 (https://www.libressl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)
@@ -163,11 +163,10 @@
      (2) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
      (3) Move 'libs' directory on the command prompt. And run buildoniguruma6.bat.
 
-  3. OpenSSL (used by TTSSH)
-     (1) Extract openssl source into libs/openssl directory.
-     (2) When the libs/openssl/Makefile.bak file exists on the OpenSSL 1.0.0e or later, delete the file only once
-     (3) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
-     (4) Move 'libs' directory on the command prompt. And run buildopenssl11.bat.
+  3. LibreSSL (used by TTSSH)
+     (1) Extract LibreSSL source into libs/libressl directory.
+     (2) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
+     (3) Move 'libs' directory on the command prompt. And run buildlibressl.bat.
 
   4. Zlib (used by TTSSH)
      (1) Extract zlib source into libs/zlib directory.
@@ -317,8 +316,8 @@
        http://www.jrsoftware.org/isdl.php
      Oniguruma
        https://github.com/kkos/oniguruma
-     OpenSSL
-       http://www.openssl.org/
+     LibreSSL
+       https://www.libressl.org/
      zlib
        http://www.zlib.net/
      PuTTY

Modified: branches/libressl_3_4_2/doc/en/html/reference/sourcecode.html
===================================================================
--- branches/libressl_3_4_2/doc/en/html/reference/sourcecode.html	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/en/html/reference/sourcecode.html	2022-01-01 08:56:30 UTC (rev 9660)
@@ -99,7 +99,7 @@
   The macro program is linked to pseudorandom number generator "SFMT", which allows to generate random number in "random" macro command.
 </p>
 <p>
-  "TTSSH" module is linkd to "OpenSSL" library to perform cryptography related operations. One may think that OpenSSL library contains only Secure Socket Layer (SSL) protocol related functions used for secure web access, however that is wrong assumption. OpenSSL library also supports basic cipher algorithms, which are utilized by "TTSSH" module. Since Secure Layer related functions of the library are not used, it is very unlikely that "TTSSH" module will be compromised if a SSL related security hole is found in OpenSSL library.
+  "TTSSH" module is linkd to "LibreSSL" library to perform cryptography related operations. One may think that LibreSSL library contains only Secure Socket Layer (SSL) protocol related functions used for secure web access, however that is wrong assumption. LibreSSL library also supports basic cipher algorithms, which are utilized by "TTSSH" module. Since Secure Layer related functions of the library are not used, it is very unlikely that "TTSSH" module will be compromised if a SSL related security hole is found in LibreSSL library.
 </p>
 <p>
   "TTSSH" module is linkd to compression Library "zlib" to compress SSH packets. Packet compression is effective on low speed networks like for example with dial-up connections, however in high speed networks it may slow down communication. That's why packet compression function is disabled by default. <br>

Modified: branches/libressl_3_4_2/doc/en/teraterm.hhc
===================================================================
--- branches/libressl_3_4_2/doc/en/teraterm.hhc	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/en/teraterm.hhc	2022-01-01 08:56:30 UTC (rev 9660)
@@ -578,8 +578,8 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="License of OpenSSL">
-			<param name="Local" value="html\reference\OpenSSL-LICENSE.txt">
+			<param name="Name" value="License of LibreSSL">
+			<param name="Local" value="html\reference\LibreSSL-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">

Modified: branches/libressl_3_4_2/doc/en/teraterm.hhp
===================================================================
--- branches/libressl_3_4_2/doc/en/teraterm.hhp	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/en/teraterm.hhp	2022-01-01 08:56:30 UTC (rev 9660)
@@ -170,7 +170,7 @@
 HlpSetupLang=html\setup\lng.html
 HlpRefKeycode=html\reference\keycode.txt
 HlpRefRe=html\reference\RE.txt
-HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
+HlpRefOpenssl=html\reference\LibreSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
 HlpRefDev=html\reference\develop.txt
 HlpRefPutty=html\reference\PuTTY-LICENSE.txt

Modified: branches/libressl_3_4_2/doc/ja/html/about/copyright.html
===================================================================
--- branches/libressl_3_4_2/doc/ja/html/about/copyright.html	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/ja/html/about/copyright.html	2022-01-01 08:56:30 UTC (rev 9660)
@@ -29,7 +29,7 @@
   <li><a href="https://github.com/kkos/oniguruma">Oniguruma</a> ... <a href="../reference/Oniguruma-LICENSE.txt">\x93\xF1\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="http://www.math.sci.hiroshima-u.ac.jp/m-mat/MT/SFMT/index-jp.html">SFMT</a> ... <a href="../reference/SFMT-LICENSE.txt">\x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://www.openssh.com">OpenSSH</a> ... <a href="../reference/OpenSSH-LICENSE.txt">BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
-  <li><a href="https://www.openssl.org">OpenSSL</a> ... <a href="../reference/OpenSSL-LICENSE.txt">OpenSSL License(Apache License 1.0) \x82\xC6 SSLeay License(\x8El\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X) \x82̃f\x83\x85\x83A\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X(\x97\xBC\x95\xFB\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82\xE9)</a></li>
+  <li><a href="https://www.libressl.org">LibreSSL</a> ... <a href="../reference/LibreSSL-LICENSE.txt">\x81uOpenSSL License(Apache License 1.0)\x81v\x82ƁuSSLeay License(\x8El\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X)\x81v\x82ƁuISC \x83\x89\x83C\x83Z\x83\x93\x83X\x81v\x82Ɓu\x83p\x83u\x83\x8A\x83b\x83N\x83h\x83\x81\x83C\x83\x93\x81v</a></li>
   <li><a href="https://zlib.net">zlib</a> ... <a href="../reference/zlib-LICENSE.txt">zlib\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">PuTTY</a> ... <a href="../reference/PuTTY-LICENSE.txt">MIT\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://github.com/P-H-C/phc-winner-argon2">The reference C implementation of Argon2</a> ... <a href="../reference/argon2-LICENSE.txt">Creative Commons CC0 1.0 License/Waiver \x82܂\xBD\x82\xCD Apache License 2.0</a></li>
@@ -146,8 +146,8 @@
 
   TTSSH\x82\xCDRobert O'Callahan\x8E\x81\x82̒\x98\x8D앨\x82ł\xB7\x81B
   TTSSH\x82\xCCSSH2\x89\xBB\x82̃R\x81[\x83h\x82ɂ‚\xA2\x82ẮA\x92\x98\x8D쌠\x82͕\xBD\x93c\x96L\x82ɂ\xA0\x82\xE8\x82܂\xB7\x81B
-  OpenSSL\x82\xCDOpenSSL Project\x82̒\x98\x8D앨\x82ł\xB7\x81B\x83\x89\x83C\x83Z\x83\x93\x83X\x8F\xEE\x95\xF1\x82ɂ‚\xA2\x82Ă͓\xAF\x8D\xAB\x82\xCC<a href="../reference/OpenSSL-LICENSE.txt">OpenSSL-LICENSE.txt</a>\x82\xF0\x82\xB2\x97\x97\x89\xBA\x82\xB3\x82\xA2\x81B
-    \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́AOpenSSL\x82ƐÓI\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
+  LibreSSL\x82\xCDOpenBSD Project\x82̒\x98\x8D앨\x82ł\xB7\x81B\x83\x89\x83C\x83Z\x83\x93\x83X\x8F\xEE\x95\xF1\x82ɂ‚\xA2\x82Ă͓\xAF\x8D\xAB\x82\xCC<a href="../reference/LibreSSL-LICENSE.txt">LibreSSL-LICENSE.txt</a>\x82\xF0\x82\xB2\x97\x97\x89\xBA\x82\xB3\x82\xA2\x81B
+    \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́ALibreSSL\x82ƐÓI\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
   zlib\x82\xCDGreg Roelofs\x82\xC6Jean-loup Gailly\x8E\x81\x82̒\x98\x8D앨\x82ł\xB7\x81B\x83\x89\x83C\x83Z\x83\x93\x83X\x8F\xEE\x95\xF1\x82ɂ‚\xA2\x82Ă͓\xAF\x8D\xAB\x82\xCC<a href="../reference/zlib-LICENSE.txt">zlib-LICENSE.txt</a>\x82\xF0\x82\xB2\x97\x97\x89\xBA\x82\xB3\x82\xA2\x81B
     \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́Azlib\x82ƐÓI\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
   OpenSSH\x82̒\x98\x8D쌠\x82́A\x8Ae\x8AJ\x94\xAD\x8E҂ɂ\xA0\x82\xE8\x82܂\xB7\x81B\x8Fڂ\xB5\x82\xAD\x82͓\xAF\x8D\xAB\x82\xCC<a href="../reference/OpenSSH-LICENSE.txt">OpenSSH-LICENSE.txt</a>\x82\xF0\x82\xB2\x97\x97\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B

Modified: branches/libressl_3_4_2/doc/ja/html/about/history.html
===================================================================
--- branches/libressl_3_4_2/doc/ja/html/about/history.html	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/ja/html/about/history.html	2022-01-01 08:56:30 UTC (rev 9660)
@@ -47,6 +47,7 @@
 
   <li>\x82\xBB\x82̑\xBC
     <ul>
+      <li><a href="#ttssh_2.93">TTSSH(2.93)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
       <li>Q & A\x8FW\x82ɗA\x8Fo\x8BK\x90\xA7(EAR)\x82ɂ‚\xA2\x82ĒNjL\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
@@ -3304,6 +3305,25 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
+<h3 id="ttssh_2.93">2022.xx.xx (Ver 2.93 not released)</h3>
+<ul class="history">
+  <!--li>\x95ύX
+    <ul>
+    </ul>
+  </li-->
+
+  <!--li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+    </ul>
+  </li-->
+
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>\x88Í\x86\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0 OpenSSL \x82\xA9\x82\xE7 LibreSSL 3.4.2 \x82֕ύX\x82\xB5\x82\xBD\x81B</li>
+    </ul>
+  </li>
+</ul>
+
 <h3 id="ttssh_2.92">2021.6.5 (Ver 2.92)</h3>
 <ul class="history">
   <li>\x95ύX

Modified: branches/libressl_3_4_2/doc/ja/html/index.html
===================================================================
--- branches/libressl_3_4_2/doc/ja/html/index.html	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/ja/html/index.html	2022-01-01 08:56:30 UTC (rev 9660)
@@ -144,7 +144,7 @@
  <LI><A HREF="reference/Oniguruma-LICENSE.txt">\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/SFMT-LICENSE.txt">SFMT \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/OpenSSH-LICENSE.txt">OpenSSH \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
- <LI><A HREF="reference/OpenSSL-LICENSE.txt">OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/LibreSSL-LICENSE.txt">LibreSSL \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/zlib-LICENSE.txt">zlib \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/PuTTY-LICENSE.txt">PuTTY \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/argon2-LICENSE.txt">The reference C implementation of Argon2 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>

Modified: branches/libressl_3_4_2/doc/ja/html/reference/.gitignore
===================================================================
--- branches/libressl_3_4_2/doc/ja/html/reference/.gitignore	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/ja/html/reference/.gitignore	2022-01-01 08:56:30 UTC (rev 9660)
@@ -1,6 +1,7 @@
 CygTerm+-LICENSE.txt
 Oniguruma-LICENSE.txt
 OpenSSL-LICENSE.txt
+LibreSSL-LICENSE.txt
 PuTTY-LICENSE.txt
 RE.txt
 SFMT-LICENSE.txt

Modified: branches/libressl_3_4_2/doc/ja/html/reference/develop.txt
===================================================================
--- branches/libressl_3_4_2/doc/ja/html/reference/develop.txt	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/ja/html/reference/develop.txt	2022-01-01 08:56:30 UTC (rev 9660)
@@ -70,7 +70,7 @@
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
 - Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.1k (http://www.openssl.org/)
+- LibreSSL 3.4.2 (https://www.libressl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html)
@@ -159,11 +159,10 @@
      (2) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
      (3) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildoniguruma6.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
 
-  3. OpenSSL (used by TTSSH)
-     (1) openssl \x82̃\\x81[\x83X\x82\xF0 libs/openssl \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B
-     (2) OpenSSL 1.0.0e \x88ȍ~\x82ŁAlibs/openssl/Makefile.bak \x82\xAA\x8Dŏ\x89\x82\xA9\x82瑶\x8D݂\xB7\x82\xE9\x8Fꍇ\x82́A\x88\xEA\x93x\x82\xBE\x82\xAF\x8E蓮\x82ō폜\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-     (3) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
-     (4) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildopenssl11.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
+  3. LibreSSL (used by TTSSH)
+     (1) LibreSSL \x82̃\\x81[\x83X\x82\xF0 libs/libressl \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B
+     (2) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
+     (3) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildlibressl.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
 
   4. Zlib (used by TTSSH)
      (1) zlib \x82̃\\x81[\x83X\x82\xF0 libs/zlib \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B
@@ -316,8 +315,8 @@
        http://www.jrsoftware.org/isdl.php
      Oniguruma
        https://github.com/kkos/oniguruma
-     OpenSSL
-       http://www.openssl.org/
+     LibreSSL
+       https://www.libressl.org/
      zlib
        http://www.zlib.net/
      PuTTY

Modified: branches/libressl_3_4_2/doc/ja/html/reference/sourcecode.html
===================================================================
--- branches/libressl_3_4_2/doc/ja/html/reference/sourcecode.html	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/ja/html/reference/sourcecode.html	2022-01-01 08:56:30 UTC (rev 9660)
@@ -95,7 +95,7 @@
   Tera Term\x83}\x83N\x83\x8D\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́A\x8B^\x8E\x97\x97\x90\x90\x94\x90\xB6\x90\xAC\x8A\xED"SFMT"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B"random"\x83R\x83}\x83\x93\x83h\x82ɂ\xA8\x82\xA2\x82ė\x90\x90\x94\x82̐\xB6\x90\xAC\x82ɗ\x98\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
 </p>
 <p>
-  SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82́A\x88Í\x86\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82߂\xC9"OpenSSL"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81BOpenSSL\x82Ƃ\xA2\x82\xA4\x83l\x81[\x83~\x83\x93\x83O\x82\xA9\x82\xE7Web\x83A\x83N\x83Z\x83X\x82Ɏg\x82\xED\x82\xEA\x82\xE9SSL(Secure Socket Layer)\x83v\x83\x8D\x83g\x83R\x83\x8B\x90\xEA\x97p\x82̃\x89\x83C\x83u\x83\x89\x83\x8A\x82\xA9\x82Ǝv\x82\xED\x82ꂪ\x82\xBF\x82ł\xB7\x82\xAA\x81A\x82\xBB\x82\xA4\x82ł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81BOpenSSL\x82͊\xEE\x96{\x93I\x82ȈÍ\x86\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA8\x82\xE8\x81ATTSSH\x82ł\xCDOpenSSL\x82Ɋ܂܂\xEA\x82\xE9\x88Í\x86\x89\xBB/\x95\x9C\x8D\x86\x83\x8B\x81[\x83`\x83\x93\x82݂̂𗘗p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B\x82\xB1\x82̂\xB1\x82Ƃ́A\x82\xB7\x82Ȃ킿OpenSSL\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xC9SSL\x8A֘A\x82̃Z\x83L\x83\x85\x83\x8A\x83e\x83B\x83z\x81[\x83\x
 8B\x82\xAA\x94\xAD\x8C\xA9\x82\xB3\x82ꂽ\x82Ƃ\xB5\x82Ă\xE0\x81ATTSSH\x82ւ̉e\x8B\xBF\x82͋ɂ߂ĒႢ\x82Ƃ\xA2\x82\xA4\x82\xB1\x82Ƃł\xB7\x81B
+  SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82́A\x88Í\x86\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82߂\xC9"LibreSSL"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81BLibreSSL\x82Ƃ\xA2\x82\xA4\x83l\x81[\x83~\x83\x93\x83O\x82\xA9\x82\xE7Web\x83A\x83N\x83Z\x83X\x82Ɏg\x82\xED\x82\xEA\x82\xE9SSL(Secure Socket Layer)\x83v\x83\x8D\x83g\x83R\x83\x8B\x90\xEA\x97p\x82̃\x89\x83C\x83u\x83\x89\x83\x8A\x82\xA9\x82Ǝv\x82\xED\x82ꂪ\x82\xBF\x82ł\xB7\x82\xAA\x81A\x82\xBB\x82\xA4\x82ł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81BLibreSSL\x82͊\xEE\x96{\x93I\x82ȈÍ\x86\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA8\x82\xE8\x81ATTSSH\x82ł\xCDLibreSSL\x82Ɋ܂܂\xEA\x82\xE9\x88Í\x86\x89\xBB/\x95\x9C\x8D\x86\x83\x8B\x81[\x83`\x83\x93\x82݂̂𗘗p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B\x82\xB1\x82̂\xB1\x82Ƃ́A\x82\xB7\x82Ȃ킿LibreSSL\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xC9SSL\x8A֘A\x82̃Z\x83L\x83\x85\x83\x8A\x83e\x83B\x83z\x81[\
 x83\x8B\x82\xAA\x94\xAD\x8C\xA9\x82\xB3\x82ꂽ\x82Ƃ\xB5\x82Ă\xE0\x81ATTSSH\x82ւ̉e\x8B\xBF\x82͋ɂ߂ĒႢ\x82Ƃ\xA2\x82\xA4\x82\xB1\x82Ƃł\xB7\x81B
 </p>
 <p>
   SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82́ASSH\x83p\x83P\x83b\x83g\x82̈\xB3\x8Fk\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82߂Ɉ\xB3\x8Fk\x83\x89\x83C\x83u\x83\x89\x83\x8A"zlib"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B\x82\xBD\x82\xBE\x82\xB5\x81A\x83_\x83C\x83\x84\x83\x8B\x83A\x83b\x83v\x89\xF1\x90\xFC\x82Ȃǂ̒ᑬ\x93x\x82ȃl\x83b\x83g\x83\x8F\x81[\x83N\x82ɂ\xA8\x82\xA2\x82ẮA\x83p\x83P\x83b\x83g\x88\xB3\x8Fk\x82͗L\x8C\xF8\x82ł\xB7\x82\xAA\x81A\x8D\xF0\x8D\xA1\x82̍\x82\x91\xAC\x89\xF1\x90\xFC\x82ł͂ނ\xB5\x82둬\x93x\x92ቺ\x82\xF0\x8F\xB5\x82\xAD\x91\xAB\x82\xA9\x82\xB9\x82ƂȂ\xE8\x82܂\xB7\x81B\x82䂦\x82ɁA\x83f\x83t\x83H\x83\x8B\x83g\x82ł̓p\x83P\x83b\x83g\x88\xB3\x8Fk\x8B@\x94\\x82͖\xB3\x8C\x{27B0B3}\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B

Modified: branches/libressl_3_4_2/doc/ja/teraterm.hhc
===================================================================
--- branches/libressl_3_4_2/doc/ja/teraterm.hhc	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/ja/teraterm.hhc	2022-01-01 08:56:30 UTC (rev 9660)
@@ -616,8 +616,8 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X">
-			<param name="Local" value="html\reference\OpenSSL-LICENSE.txt">
+			<param name="Name" value="LibreSSL \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\LibreSSL-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">

Modified: branches/libressl_3_4_2/doc/ja/teraterm.hhp
===================================================================
--- branches/libressl_3_4_2/doc/ja/teraterm.hhp	2021-12-31 14:43:31 UTC (rev 9659)
+++ branches/libressl_3_4_2/doc/ja/teraterm.hhp	2022-01-01 08:56:30 UTC (rev 9660)
@@ -178,7 +178,7 @@
 HlpSetupLang=html\setup\lng.html
 HlpRefKeycode=html\reference\keycode.txt
 HlpRefRe=html\reference\RE.txt
-HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
+HlpRefOpenssl=html\reference\LibreSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
 HlpRefDev=html\reference\develop.txt
 HlpRefPutty=html\reference\PuTTY-LICENSE.txt

From scmnotify ＠ osdn.net  Sat Jan  1 17:58:28 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 01 Jan 2022 17:58:28 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjFdIOODieOCreODpeODoeODs+ODiA==?=
 =?utf-8?b?44KSIE9wZW5TU0wgMyDjgavlr77lv5w=?=
Message-ID: <1641027508.286067.8898.nullmailer@users.osdn.me>

Revision: 9661
          https://osdn.net/projects/ttssh2/scm/svn/commits/9661
Author:   nmaya
Date:     2022-01-01 17:58:28 +0900 (Sat, 01 Jan 2022)
Log Message:
-----------
ドキュメントを OpenSSL 3 に対応

- OpenSSL のライセンス表記
  「Apache License 2.0」
- ライセンスファイルを差し替え

Modified Paths:
--------------
    branches/openssl_3_0_1/doc/convtext.bat
    branches/openssl_3_0_1/doc/en/html/about/copyright.html
    branches/openssl_3_0_1/doc/en/html/reference/develop.txt
    branches/openssl_3_0_1/doc/ja/html/about/copyright.html
    branches/openssl_3_0_1/doc/ja/html/reference/develop.txt

-------------- next part --------------
Modified: branches/openssl_3_0_1/doc/convtext.bat
===================================================================
--- branches/openssl_3_0_1/doc/convtext.bat	2022-01-01 08:56:30 UTC (rev 9660)
+++ branches/openssl_3_0_1/doc/convtext.bat	2022-01-01 08:58:28 UTC (rev 9661)
@@ -6,8 +6,8 @@
 %TOSJIS% -i ..\libs\oniguruma\COPYING   -o %REF_J%\Oniguruma-LICENSE.txt -l unix
 %TOSJIS% -i ..\libs\oniguruma\doc\RE    -o %REF_E%\RE.txt                -l unix
 %TOSJIS% -i ..\libs\oniguruma\doc\RE.ja -o %REF_J%\RE.txt      -c utf8   -l unix
-%TOSJIS% -i ..\libs\openssl\LICENSE     -o %REF_E%\OpenSSL-LICENSE.txt   -l unix
-%TOSJIS% -i ..\libs\openssl\LICENSE     -o %REF_J%\OpenSSL-LICENSE.txt   -l unix
+%TOSJIS% -i ..\libs\openssl\LICENSE.txt -o %REF_E%\OpenSSL-LICENSE.txt   -l unix
+%TOSJIS% -i ..\libs\openssl\LICENSE.txt -o %REF_J%\OpenSSL-LICENSE.txt   -l unix
 %TOSJIS% -i ..\libs\putty\LICENCE       -o %REF_E%\PuTTY-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\putty\LICENCE       -o %REF_J%\PuTTY-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\SFMT\LICENSE.txt    -o %REF_E%\SFMT-LICENSE.txt      -l unix

Modified: branches/openssl_3_0_1/doc/en/html/about/copyright.html
===================================================================
--- branches/openssl_3_0_1/doc/en/html/about/copyright.html	2022-01-01 08:56:30 UTC (rev 9660)
+++ branches/openssl_3_0_1/doc/en/html/about/copyright.html	2022-01-01 08:58:28 UTC (rev 9661)
@@ -29,7 +29,7 @@
   <li><a href="https://github.com/kkos/oniguruma">Oniguruma</a> ... <a href="../reference/Oniguruma-LICENSE.txt">2-clause BSD license</a></li>
   <li><a href="http://www.math.sci.hiroshima-u.ac.jp/m-mat/MT/SFMT/index.html">SFMT</a> ... <a href="../reference/SFMT-LICENSE.txt">3-clause BSD license</a></li>
   <li><a href="https://www.openssh.com">OpenSSH</a> ... <a href="../reference/OpenSSH-LICENSE.txt">BSD style license</a></li>
-  <li><a href="https://www.openssl.org">OpenSSL</a> ... <a href="../reference/OpenSSL-LICENSE.txt">Dual(both) license, OpenSSL License(Apache License 1.0) and SSLeay License(4-clause BSD license)</a></li>
+  <li><a href="https://www.openssl.org">OpenSSL</a> ... <a href="../reference/OpenSSL-LICENSE.txt">Apache License 2.0</a></li>
   <li><a href="https://zlib.net">zlib</a> ... <a href="../reference/zlib-LICENSE.txt">zlib License</a></li>
   <li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">PuTTY</a> ... <a href="../reference/PuTTY-LICENSE.txt">MIT License</a></li>
   <li><a href="https://github.com/P-H-C/phc-winner-argon2">The reference C implementation of Argon2</a> ... <a href="../reference/argon2-LICENSE.txt">Creative Commons CC0 1.0 License/Waiver or the Apache License 2.0</a></li>

Modified: branches/openssl_3_0_1/doc/en/html/reference/develop.txt
===================================================================
--- branches/openssl_3_0_1/doc/en/html/reference/develop.txt	2022-01-01 08:56:30 UTC (rev 9660)
+++ branches/openssl_3_0_1/doc/en/html/reference/develop.txt	2022-01-01 08:58:28 UTC (rev 9661)
@@ -77,7 +77,7 @@
 
 * Libraries
 - Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.1k (http://www.openssl.org/)
+- OpenSSL 3.0.1 (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)
@@ -167,7 +167,7 @@
      (1) Extract openssl source into libs/openssl directory.
      (2) When the libs/openssl/Makefile.bak file exists on the OpenSSL 1.0.0e or later, delete the file only once
      (3) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
-     (4) Move 'libs' directory on the command prompt. And run buildopenssl11.bat.
+     (4) Move 'libs' directory on the command prompt. And run buildopenssl3.bat.
 
   4. Zlib (used by TTSSH)
      (1) Extract zlib source into libs/zlib directory.

Modified: branches/openssl_3_0_1/doc/ja/html/about/copyright.html
===================================================================
--- branches/openssl_3_0_1/doc/ja/html/about/copyright.html	2022-01-01 08:56:30 UTC (rev 9660)
+++ branches/openssl_3_0_1/doc/ja/html/about/copyright.html	2022-01-01 08:58:28 UTC (rev 9661)
@@ -29,7 +29,7 @@
   <li><a href="https://github.com/kkos/oniguruma">Oniguruma</a> ... <a href="../reference/Oniguruma-LICENSE.txt">\x93\xF1\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="http://www.math.sci.hiroshima-u.ac.jp/m-mat/MT/SFMT/index-jp.html">SFMT</a> ... <a href="../reference/SFMT-LICENSE.txt">\x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://www.openssh.com">OpenSSH</a> ... <a href="../reference/OpenSSH-LICENSE.txt">BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
-  <li><a href="https://www.openssl.org">OpenSSL</a> ... <a href="../reference/OpenSSL-LICENSE.txt">OpenSSL License(Apache License 1.0) \x82\xC6 SSLeay License(\x8El\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X) \x82̃f\x83\x85\x83A\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X(\x97\xBC\x95\xFB\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82\xE9)</a></li>
+  <li><a href="https://www.openssl.org">OpenSSL</a> ... <a href="../reference/OpenSSL-LICENSE.txt">Apache \x83\x89\x83C\x83Z\x83\x93\x83X 2.0</a></li>
   <li><a href="https://zlib.net">zlib</a> ... <a href="../reference/zlib-LICENSE.txt">zlib\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">PuTTY</a> ... <a href="../reference/PuTTY-LICENSE.txt">MIT\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://github.com/P-H-C/phc-winner-argon2">The reference C implementation of Argon2</a> ... <a href="../reference/argon2-LICENSE.txt">Creative Commons CC0 1.0 License/Waiver \x82܂\xBD\x82\xCD Apache License 2.0</a></li>

Modified: branches/openssl_3_0_1/doc/ja/html/reference/develop.txt
===================================================================
--- branches/openssl_3_0_1/doc/ja/html/reference/develop.txt	2022-01-01 08:56:30 UTC (rev 9660)
+++ branches/openssl_3_0_1/doc/ja/html/reference/develop.txt	2022-01-01 08:58:28 UTC (rev 9661)
@@ -70,7 +70,7 @@
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
 - Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.1k (http://www.openssl.org/)
+- OpenSSL 3.0.1 (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html)
@@ -163,7 +163,7 @@
      (1) openssl \x82̃\\x81[\x83X\x82\xF0 libs/openssl \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B
      (2) OpenSSL 1.0.0e \x88ȍ~\x82ŁAlibs/openssl/Makefile.bak \x82\xAA\x8Dŏ\x89\x82\xA9\x82瑶\x8D݂\xB7\x82\xE9\x8Fꍇ\x82́A\x88\xEA\x93x\x82\xBE\x82\xAF\x8E蓮\x82ō폜\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
      (3) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
-     (4) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildopenssl11.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
+     (4) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildopenssl3.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
 
   4. Zlib (used by TTSSH)
      (1) zlib \x82̃\\x81[\x83X\x82\xF0 libs/zlib \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B

From scmnotify ＠ osdn.net  Mon Jan  3 14:46:41 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 03 Jan 2022 14:46:41 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjJdIFB1VFRZIDAuNzYg44Gr44Ki44OD?=
 =?utf-8?b?44OX44OH44O844OI?=
Message-ID: <1641188801.189121.17318.nullmailer@users.osdn.me>

Revision: 9662
          https://osdn.net/projects/ttssh2/scm/svn/commits/9662
Author:   nmaya
Date:     2022-01-03 14:46:40 +0900 (Mon, 03 Jan 2022)
Log Message:
-----------
PuTTY 0.76 にアップデート

merge from putty_0_76:
r9626,r9635,r9636,r9644

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9626
    https://osdn.net/projects/ttssh2/scm/svn/commits/9635
    https://osdn.net/projects/ttssh2/scm/svn/commits/9636
    https://osdn.net/projects/ttssh2/scm/svn/commits/9644

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/reference/develop.txt
    trunk/libs/putty.cmake
    trunk/ttssh2/putty/CMakeLists.txt
    trunk/ttssh2/putty/libputty.c
    trunk/ttssh2/putty/libputty.h
    trunk/ttssh2/putty/putty.v16.vcxproj
    trunk/ttssh2/putty/putty.v16.vcxproj.filters
    trunk/ttssh2/ttxssh/ssh.c

Added Paths:
-----------
    trunk/ttssh2/putty/putty-import.c

Property Changed:
----------------
    trunk/
    trunk/TTProxy/
    trunk/TTXKanjiMenu/
    trunk/TTXSamples/
    trunk/cygterm/
    trunk/teraterm/
    trunk/ttpmenu/

-------------- next part --------------
Index: trunk
===================================================================
--- trunk	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk	2022-01-03 05:46:40 UTC (rev 9662)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,7 ##
 /branches/openssl_1_1_1_v2:7785-7786,7788-7808,7811-7812,7814-7815,7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7873-7877,7880-7881,7884-7888,7890-7892,7894-7895,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980,8019,8208,8256
 /branches/openssl_1_1_1_v3:8258,8264-8265
 /branches/portfwd_memleak:7732,7736-7737,7764
+/branches/putty_0_76:9626,9635-9636,9644
 /branches/serial_port_improved:8119,8140-8141,8144,8150,8158-8160,8163,8170-8172,8183,8185,8204,8209,8212-8215
 /branches/ssh_chacha20poly1305:9209-9212,9217,9229,9248-9253
 /branches/ssh_ed25519:5495-5544
Index: trunk/TTProxy
===================================================================
--- trunk/TTProxy	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/TTProxy	2022-01-03 05:46:40 UTC (rev 9662)

Property changes on: trunk/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,7 ##
 /branches/4-stable/TTProxy:9256-9257
 /branches/openssl_1_1_1_v2/TTProxy:7785-7786,7788-7808,7861-7863,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980
 /branches/openssl_1_1_1_v3/TTProxy:8258
+/branches/putty_0_76/TTProxy:9626,9635-9636,9644
 /branches/ssh_chacha20poly1305/TTProxy:9209-9212,9217,9229,9248-9253
 /branches/ttproxy_improved/TTProxy:8041,8055-8056
 /branches/ttssh_improved/TTProxy:8040
Index: trunk/TTXKanjiMenu
===================================================================
--- trunk/TTXKanjiMenu	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/TTXKanjiMenu	2022-01-03 05:46:40 UTC (rev 9662)

Property changes on: trunk/TTXKanjiMenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/TTXKanjiMenu:9256-9257
+/branches/putty_0_76/TTXKanjiMenu:9626,9635-9636,9644
 /branches/ssh_chacha20poly1305/TTXKanjiMenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXKanjiMenu:6194-6285
\ No newline at end of property
Index: trunk/TTXSamples
===================================================================
--- trunk/TTXSamples	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/TTXSamples	2022-01-03 05:46:40 UTC (rev 9662)

Property changes on: trunk/TTXSamples
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/TTXSamples:9256-9257
+/branches/putty_0_76/TTXSamples:9626,9635-9636,9644
 /branches/ssh_chacha20poly1305/TTXSamples:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXSamples:6194-6285
\ No newline at end of property
Index: trunk/cygterm
===================================================================
--- trunk/cygterm	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/cygterm	2022-01-03 05:46:40 UTC (rev 9662)

Property changes on: trunk/cygterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/cygterm:9256-9257
 /branches/openssl_1_1_1_v3/cygterm:8284
+/branches/putty_0_76/cygterm:9626,9635-9636,9644
 /branches/ssh_chacha20poly1305/cygterm:9209-9212,9217,9229,9248-9253
\ No newline at end of property
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/doc/en/html/about/history.html	2022-01-03 05:46:40 UTC (rev 9662)
@@ -47,6 +47,7 @@
 
   <li>Misc
     <ul>
+      <li>Upgraded TTSSH to <a href="#ttssh_2.93">2.93</a>.</li>
       <li>Added about EAR(Export Administration Regulations) to Frequently asked questions.</li>
     </ul>
   </li>
@@ -3298,6 +3299,25 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
+<h3 id="ttssh_2.93">202x.x.x (Ver 2.93 not released)</h3>
+<ul class="history">
+  <!--li>Changes
+    <ul>
+    </ul>
+  </li-->
+
+  <!--li>Bug fixes
+    <ul>
+    </ul>
+  </li-->
+
+  <li>Misc
+    <ul>
+      <li>Upgraded PuTTY to PuTTY 0.76.</li>
+    </ul>
+  </li>
+</ul>
+
 <h3 id="ttssh_2.92">2021.6.5 (Ver 2.92)</h3>
 <ul class="history">
   <li>Changes

Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/doc/en/html/reference/develop.txt	2022-01-03 05:46:40 UTC (rev 9662)
@@ -79,7 +79,7 @@
 - Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)
 - OpenSSL 1.1.1k (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
-- PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
+- PuTTY 0.76 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)
 - cJSON 1.7.14 (https://github.com/DaveGamble/cJSON/)
 - The reference C implementation of Argon2 20190702 (https://github.com/P-H-C/phc-winner-argon2)

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/doc/ja/html/about/history.html	2022-01-03 05:46:40 UTC (rev 9662)
@@ -47,6 +47,7 @@
 
   <li>\x82\xBB\x82̑\xBC
     <ul>
+      <li><a href="#ttssh_2.93">TTSSH(2.93)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
       <li>Q & A\x8FW\x82ɗA\x8Fo\x8BK\x90\xA7(EAR)\x82ɂ‚\xA2\x82ĒNjL\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
@@ -3304,6 +3305,25 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
+<h3 id="ttssh_2.93">202x.x.x (Ver 2.93 not released)</h3>
+<ul class="history">
+  <!--li>\x95ύX
+    <ul>
+    </ul>
+  </li-->
+
+  <!--li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+    </ul>
+  </li-->
+
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>PuTTY 0.76 \x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+    </ul>
+  </li>
+</ul>
+
 <h3 id="ttssh_2.92">2021.6.5 (Ver 2.92)</h3>
 <ul class="history">
   <li>\x95ύX

Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/doc/ja/html/reference/develop.txt	2022-01-03 05:46:40 UTC (rev 9662)
@@ -72,7 +72,7 @@
 - Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)
 - OpenSSL 1.1.1k (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
-- PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
+- PuTTY 0.76 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html)
 - cJSON 1.7.14 (https://github.com/DaveGamble/cJSON/)
 - The reference C implementation of Argon2 20190702 (https://github.com/P-H-C/phc-winner-argon2)

Modified: trunk/libs/putty.cmake
===================================================================
--- trunk/libs/putty.cmake	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/libs/putty.cmake	2022-01-03 05:46:40 UTC (rev 9662)
@@ -1,9 +1,9 @@
 # cmake -P putty.cmake
 
-set(SRC_DIR_BASE "putty-0.70")
-set(SRC_ARC "putty-0.70.tar.gz")
-set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.70/putty-0.70.tar.gz")
-set(SRC_ARC_HASH_SHA256 bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be)
+set(SRC_DIR_BASE "putty-0.76")
+set(SRC_ARC "putty-0.76.tar.gz")
+set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.76/putty-0.76.tar.gz")
+set(SRC_ARC_HASH_SHA256 547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f)
 
 set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/putty")
 set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/putty/src")

Index: trunk/teraterm
===================================================================
--- trunk/teraterm	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/teraterm	2022-01-03 05:46:40 UTC (rev 9662)

Property changes on: trunk/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -4,6 +4,7 ##
 /branches/move_code_script/teraterm:9026-9185
 /branches/openssl_1_1_1_v2/teraterm:7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7979-7980
 /branches/openssl_1_1_1_v3/teraterm:8258
+/branches/putty_0_76/teraterm:9626,9635-9636,9644
 /branches/serial_port_improved/teraterm:8119,8140-8141,8144,8150,8158-8160,8163,8170,8172,8183,8185,8204,8209,8212-8215
 /branches/ssh_chacha20poly1305/teraterm:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/teraterm:6194-6285
\ No newline at end of property
Index: trunk/ttpmenu
===================================================================
--- trunk/ttpmenu	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/ttpmenu	2022-01-03 05:46:40 UTC (rev 9662)

Property changes on: trunk/ttpmenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/ttpmenu:9256-9257
+/branches/putty_0_76/ttpmenu:9626,9635-9636,9644
 /branches/ssh_chacha20poly1305/ttpmenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/ttpmenu:6194-6285
\ No newline at end of property
Modified: trunk/ttssh2/putty/CMakeLists.txt
===================================================================
--- trunk/ttssh2/putty/CMakeLists.txt	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/ttssh2/putty/CMakeLists.txt	2022-01-03 05:46:40 UTC (rev 9662)
@@ -7,20 +7,24 @@
 endif()
 
 set(PUTTY_SRC
-  ../../libs/putty/putty.h
-  ../../libs/putty/pageant.h
-  ../../libs/putty/conf.c
-  ../../libs/putty/misc.h
-  ../../libs/putty/misc.c
-  ../../libs/putty/tree234.h
+  ../../libs/putty/aqsync.c
+  ../../libs/putty/callback.c
+  ../../libs/putty/errsock.c
+  ../../libs/putty/marshal.c
+  ../../libs/putty/memory.c
+  ../../libs/putty/mpint.c
+  ../../libs/putty/sshsh256.c
   ../../libs/putty/tree234.c
-  ../../libs/putty/version.h
+  ../../libs/putty/utils.c
   ../../libs/putty/version.c
+  ../../libs/putty/windows/wincapi.c
+  ../../libs/putty/windows/winhandl.c
+  ../../libs/putty/windows/winhsock.c
   ../../libs/putty/windows/winmisc.c
+  ../../libs/putty/windows/winnpc.c
   ../../libs/putty/windows/winpgntc.c
-  ../../libs/putty/windows/winsecur.h
   ../../libs/putty/windows/winsecur.c
-  )
+	  )
 
 source_group(
   "putty"
@@ -31,6 +35,7 @@
 set(SRC
   libputty.c
   libputty.h
+  putty-import.c
   )
 
 include_directories(

Modified: trunk/ttssh2/putty/libputty.c
===================================================================
--- trunk/ttssh2/putty/libputty.c	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/ttssh2/putty/libputty.c	2022-01-03 05:46:40 UTC (rev 9662)
@@ -1,4 +1,3 @@
-// PuTTY is copyright 1997-2007 Simon Tatham.
 /*
  * Copyright (C) 1994-1998 T. Teranishi
  * (C) 2004- TeraTerm Project
@@ -27,31 +26,59 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+// PuTTY is copyright 1997-2021 Simon Tatham.
 
 /*
  * putty \x83v\x83\x8D\x83W\x83F\x83N\x83g\x82\xCD
- * - PuTTY \x82̃\\x81[\x83X\x83t\x83@\x83C\x83\x8B (\x83v\x83\x8D\x83W\x83F\x83N\x83g\x82ɓǂݍ\x9E\x82ރt\x83@\x83C\x83\x8B\x82͍ŏ\xAC\x8C\xC0)
- * - libputty.c/h 
+ * - libputty.c/h
  *   PuTTY \x82̋@\x94\\x82𗘗p\x82\xB7\x82\xE9\x83C\x83\x93\x83^\x81[\x83t\x83F\x81[\x83X
- *   PuTTY \x82̃\\x81[\x83X\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x95K\x97v\x82Ȋ֐\x94\x82݂̂\xF0\x83R\x83s\x81[
+ *     PuTTY \x82̓\xE0\x95\x94\x8C^\x82Ƃ̕ϊ\xB7
+ * - PuTTY \x82̃\\x81[\x83X\x83R\x81[\x83h (\x83v\x83\x8D\x83W\x83F\x83N\x83g\x82ɓǂݍ\x9E\x82ރt\x83@\x83C\x83\x8B\x82͍ŏ\xAC\x8C\xC0)
+ * -- \x93W\x8AJ\x82\xB5\x82\xBD PuTTY \x82̃\\x81[\x83X\x83t\x83@\x83C\x83\x8B\x82\xF0\x82\xBB\x82̂܂ܓǂݍ\x9E\x82񂾂\xE0\x82\xCC (Putty Files \x83O\x83\x8B\x81[\x83v\x93\xE0)
+ * -- putty \x83v\x83\x8D\x83W\x83F\x83N\x83g\x91\xA4\x82ɃR\x83s\x81[\x82\xB5\x82\xBD\x83\\x81[\x83X\x83R\x81[\x83h (putty-import.c)
+ *    static \x82Ȃ\xBD\x82߂ɌĂяo\x82\xB9\x82Ȃ\xA2\x8A֐\x94\x82\xCC static \x82\xF0\x8AO\x82\xB7
+ *    putty \x82Ŏg\x82\xA4\x95\x94\x95\xAA\x82\xBE\x82\xAF\x82𔲐\x88 (putty \x82Ŏg\x82\xED\x82Ȃ\xA2\x95\x94\x95\xAA\x82ő\x9D\x82\xA6\x82Ă\xB5\x82܂\xA4\x88ˑ\xB6\x82\xF0\x97}\x90\xA7)
  * \x82\xA9\x82\xE7\x90ÓI\x83\x89\x83C\x83u\x83\x89\x83\x8A libputty.lib \x82𐶐\xAC\x82\xB5\x81ATTXSSH \x82\xA9\x82烊\x83\x93\x83N\x82\xB3\x82\xEA\x82ė\x98\x97p\x82\xB3\x82\xEA\x82\xE9\x81B
  * \x82\xBB\x82̂\xBD\x82߁ATTXSSH \x91\xA4\x82̒\xE8\x8B`\x82͎\x9D\x82\xBF\x8D\x9E\x82܂Ȃ\xA2\x81B
  */
 
+#include <stdio.h>
 #include <windows.h>
 #include <assert.h>
 
-#include "sshbn.h"
-
-// from SSHBN.C (ver 0.60)
-#define BIGNUM_INTERNAL
-typedef BignumInt *Bignum;
-
 #include "ssh.h"
+#include "mpint.h"
 
 #include "libputty.h"
 
 
+// pageant.c
+typedef struct KeyListEntry {
+    ptrlen blob, comment;
+    uint32_t flags;
+} KeyListEntry;
+typedef struct KeyList {
+    strbuf *raw_data;
+    KeyListEntry *keys;
+    size_t nkeys;
+    bool broken;
+} KeyList;
+
+// putty.h
+//   aqsync.c
+extern void agent_query_synchronous(strbuf *in, void **out, int *outlen);
+
+// pageant.c
+extern void keylist_free(KeyList *kl);
+
+// pageant.c
+extern KeyList *pageant_get_keylist(unsigned ssh_version);
+
+// putty.h
+//   windows/winpgntc.c
+extern bool agent_exists(void);
+
+
 /*
  * for SSH2
  *   \x8C\xAE\x82̈ꗗ\x82𓾂\xE9
@@ -58,20 +85,47 @@
  */
 int putty_get_ssh2_keylist(unsigned char **keylist)
 {
-	int keylistlen;
+	KeyList *kl;
+	int keylistlen = 0;
+	strbuf *sb_keylist = strbuf_new();
+	size_t i;
 
-	*keylist = get_keylist2(&keylistlen);
-	if (*keylist == NULL){
-		// \x8E擾\x82Ɏ\xB8\x94s
-		return 0;
+	kl = pageant_get_keylist(2);
+	if (kl) {
+		if (kl->broken) {
+			keylist_free(kl);
+			strbuf_free(sb_keylist);
+			return 0;
+		}
+
+		put_uint32(sb_keylist, kl->nkeys);
+		keylistlen += 4;
+		for (i = 0; i < kl->nkeys; i++) {
+			put_uint32(sb_keylist, kl->keys[i].blob.len);
+			keylistlen += 4;
+			put_datapl(sb_keylist, kl->keys[i].blob);
+			keylistlen += kl->keys[i].blob.len;
+			put_uint32(sb_keylist, kl->keys[i].comment.len);
+			keylistlen += 4;
+			put_datapl(sb_keylist, kl->keys[i].comment);
+			keylistlen += kl->keys[i].comment.len;
+		}
+		keylist_free(kl);
+
+		*keylist = strbuf_to_str(sb_keylist);
+
+		return keylistlen;
 	}
-	return keylistlen;
+
+	strbuf_free(sb_keylist);
+	return 0;
 }
 
 /*
  * for SSH2
  *   \x8C\xF6\x8AJ\x8C\xAE\x82ƃf\x81[\x83^\x82\xF0\x93n\x82\xB5\x81A
- *   \x94閧\x8C\xAE\x82ɂ\xE6\x82\xC1\x82ď\x90\x96\xBC\x82\xB3\x82ꂽ\x83f\x81[\x83^\x82𓾂\xE9
+ *   \x94閧\x8C\xAE\x82ɂ\xE6\x82鏐\x96\xBC\x82𓾂\xE9
+ *   ssh2userauth.c (PuTTY 0.76) \x82\xA9\x82\xE7\x8Dč\\x90\xAC
  */
 void *putty_sign_ssh2_key(unsigned char *pubkey /* length(4byte) + data */,
                           unsigned char *data,
@@ -80,43 +134,34 @@
 {
 	void *ret;
 
-	unsigned char *request, *response;
+	unsigned char *response;
 	void *vresponse;
-	int resplen;
-	int pubkeylen, reqlen;
-	int flags = 0;
+	int response_len;
+	int pubkeylen;
+	strbuf *agentreq = strbuf_new_for_agent_query();
+	int signflags = 0;
 
-	pubkeylen = GET_32BIT(pubkey);
-	reqlen = 4 + 1 + (4 + pubkeylen) + (4 + datalen) + 4;
-	request = (unsigned char *)malloc(reqlen);
+	put_byte(agentreq, SSH2_AGENTC_SIGN_REQUEST);
+	pubkeylen = GET_32BIT_MSB_FIRST(pubkey);
+	put_data(agentreq, pubkey, 4 + pubkeylen);
+	put_uint32(agentreq, datalen);
+	put_data(agentreq, data, datalen);
+	put_uint32(agentreq, signflags);
+	agent_query_synchronous(agentreq, &vresponse, &response_len);
+	strbuf_free(agentreq);
 
-	// request length
-	PUT_32BIT(request, reqlen);
-	// request type
-	request[4] = SSH2_AGENTC_SIGN_REQUEST;
-	// public key (length + data)
-	memcpy(request + 5, pubkey, 4 + pubkeylen);
-	// sign data length
-	PUT_32BIT(request + 5 + 4 + pubkeylen, datalen);
-	// sign data
-	memcpy(request + 5 + 4 + pubkeylen + 4, data, datalen);
-	// flags word
-	PUT_32BIT(request + 5 + 4 + pubkeylen + 4 + datalen, flags);
-
-	agent_query(request, reqlen, &vresponse, &resplen, NULL, NULL);
-
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH2_AGENT_SIGN_RESPONSE) {
+	if (response_len < 5 || response[4] != SSH2_AGENT_SIGN_RESPONSE) {
 		sfree(response);
 		return NULL;
 	}
 
-	ret = snewn(resplen-5, unsigned char);
-	memcpy(ret, response+5, resplen-5);
+	ret = snewn(response_len-5, unsigned char);
+	memcpy(ret, response+5, response_len-5);
 	sfree(response);
 
 	if (outlen)
-		*outlen = resplen-5;
+		*outlen = response_len-5;
 
 	return ret;
 }
@@ -127,14 +172,38 @@
  */
 int putty_get_ssh1_keylist(unsigned char **keylist)
 {
-	int keylistlen;
+	KeyList *kl;
+	int keylistlen = 0;
+	strbuf *sb_keylist = strbuf_new();
+	size_t i;
 
-	*keylist = get_keylist1(&keylistlen);
-	if (*keylist == NULL){
-		// \x8E擾\x82Ɏ\xB8\x94s
-		return 0;
+	kl = pageant_get_keylist(1);
+	if (kl) {
+		if (kl->broken) {
+			keylist_free(kl);
+			strbuf_free(sb_keylist);
+			return 0;
+		}
+
+		put_uint32(sb_keylist, kl->nkeys);
+		keylistlen += 4;
+		for (i = 0; i < kl->nkeys; i++) {
+			put_data(sb_keylist, kl->keys[i].blob.ptr, kl->keys[i].blob.len);
+			keylistlen += kl->keys[i].blob.len;
+			put_uint32(sb_keylist, kl->keys[i].comment.len);
+			keylistlen += 4;
+			put_datapl(sb_keylist, kl->keys[i].comment);
+			keylistlen += kl->keys[i].comment.len;
+		}
+		keylist_free(kl);
+
+		*keylist = strbuf_to_str(sb_keylist);
+
+		return keylistlen;
 	}
-	return keylistlen;
+
+	strbuf_free(sb_keylist);
+	return 0;
 }
 
 /*
@@ -141,6 +210,7 @@
  * for SSH1
  *   \x8C\xF6\x8AJ\x8C\xAE\x82ƈÍ\x86\x89\xBB\x83f\x81[\x83^\x82\xF0\x93n\x82\xB5
  *   \x95\x9C\x8D\x86\x83f\x81[\x83^\x82̃n\x83b\x83V\x83\x85\x82𓾂\xE9
+ *   ssh1login.c (PuTTY 0.76) \x82\xA9\x82\xE7\x8Dč\\x90\xAC
  */
 void *putty_hash_ssh1_challenge(unsigned char *pubkey,
                                 int pubkeylen,
@@ -151,47 +221,31 @@
 {
 	void *ret;
 
-	unsigned char *request, *response, *p;
+	unsigned char *response;
 	void *vresponse;
-	int resplen;
-	int reqlen;
+	int response_len;
+	strbuf *agentreq = strbuf_new_for_agent_query();
 
-	reqlen = 4 + 1 + pubkeylen + datalen + 16 + 4;
-	request = (unsigned char *)malloc(reqlen);
-	p = request;
+	put_byte(agentreq, SSH1_AGENTC_RSA_CHALLENGE);
+	put_data(agentreq, pubkey, pubkeylen);
+	put_data(agentreq, data, datalen);
+	put_data(agentreq, session_id, 16);
+	put_uint32(agentreq, 1); // response format
+	agent_query_synchronous(agentreq, &vresponse, &response_len);
+	strbuf_free(agentreq);
 
-	// request length
-	PUT_32BIT(request, reqlen);
-	// request type
-	request[4] = SSH1_AGENTC_RSA_CHALLENGE;
-	p += 5;
-
-	// public key
-	memcpy(p, pubkey, pubkeylen);
-	p += pubkeylen;
-	// challange from server
-	memcpy(p, data, datalen);
-	p += datalen;
-	// session_id
-	memcpy(p, session_id, 16);
-	p += 16;
-	// response format
-	PUT_32BIT(p, 1);
-
-	agent_query(request, reqlen, &vresponse, &resplen, NULL, NULL);
-
 	response = vresponse;
-	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_RESPONSE) {
+	if (response_len < 5+16 || response[4] != SSH1_AGENT_RSA_RESPONSE) {
 		sfree(response);
 		return NULL;
 	}
 
-	ret = snewn(resplen-5, unsigned char);
-	memcpy(ret, response+5, resplen-5);
+	ret = snewn(response_len-5, unsigned char);
+	memcpy(ret, response+5, response_len-5);
 	sfree(response);
 
 	if (outlen)
-		*outlen = resplen-5;
+		*outlen = response_len-5;
 
 	return ret;
 }
@@ -198,7 +252,7 @@
 
 int putty_get_ssh1_keylen(unsigned char *key, int maxlen)
 {
-	return rsa_public_blob_len(key, maxlen);
+	return rsa_ssh1_public_blob_len(make_ptrlen(key, maxlen));
 }
 
 const char *putty_get_version()
@@ -207,173 +261,15 @@
 	return ver;
 }
 
-/*
- * Following functions are copied from putty source.
- */
-
-// from SSHBN.C (ver 0.63)
-static Bignum newbn(int length)
+void putty_agent_query_synchronous(void *in, int inlen, void **out, int *outlen)
 {
-	Bignum b;
+	strbuf *buf = strbuf_new();
 
-	assert(length >= 0 && length < INT_MAX / BIGNUM_INT_BITS);
-
-	b = snewn(length + 1, BignumInt);
-	if (!b)
-		abort();		       /* FIXME */
-	memset(b, 0, (length + 1) * sizeof(*b));
-	b[0] = length;
-	return b;
+	put_data(buf, in, inlen);
+	agent_query_synchronous(buf, out, outlen);
+	strbuf_free(buf);
 }
 
-// from SSHBN.C (ver 0.65)
-Bignum bignum_from_bytes(const unsigned char *data, int nbytes)
-{
-	Bignum result;
-	int w, i;
-
-	assert(nbytes >= 0 && nbytes < INT_MAX / 8);
-
-	w = (nbytes + BIGNUM_INT_BYTES - 1) / BIGNUM_INT_BYTES; /* bytes->words */
-
-	result = newbn(w);
-	for (i = 1; i <= w; i++)
-		result[i] = 0;
-	for (i = nbytes; i--;) {
-		unsigned char byte = *data++;
-		result[1 + i / BIGNUM_INT_BYTES] |=
-			(BignumInt)byte << (8 * i % BIGNUM_INT_BITS);
-	}
-
-	while (result[0] > 1 && result[result[0]] == 0)
-		result[0]--;
-	return result;
-}
-
-// from SSHBN.C (ver 0.60)
-/*
-* Read an SSH-1-format bignum from a data buffer. Return the number
-* of bytes consumed, or -1 if there wasn't enough data.
-*/
-int ssh1_read_bignum(const unsigned char *data, int len, Bignum * result)
-{
-	const unsigned char *p = data;
-	int i;
-	int w, b;
-
-	if (len < 2)
-		return -1;
-
-	w = 0;
-	for (i = 0; i < 2; i++)
-		w = (w << 8) + *p++;
-	b = (w + 7) / 8;		       /* bits -> bytes */
-
-	if (len < b + 2)
-		return -1;
-
-	if (!result)		       /* just return length */
-		return b + 2;
-
-	*result = bignum_from_bytes(p, b);
-
-	return p + b - data;
-}
-
-// from SSHRSA.C (putty 0.60)
-/* Given a public blob, determine its length. */
-int rsa_public_blob_len(void *data, int maxlen)
-{
-	unsigned char *p = (unsigned char *)data;
-	int n;
-
-	if (maxlen < 4)
-		return -1;
-	p += 4;			       /* length word */
-	maxlen -= 4;
-
-	n = ssh1_read_bignum(p, maxlen, NULL);    /* exponent */
-	if (n < 0)
-		return -1;
-	p += n;
-
-	n = ssh1_read_bignum(p, maxlen, NULL);    /* modulus */
-	if (n < 0)
-		return -1;
-	p += n;
-
-	return p - (unsigned char *)data;
-}
-
-// from WINDOWS\WINPGNT.C (putty 0.63)
-/*
- * Acquire a keylist1 from the primary Pageant; this means either
- * calling make_keylist1 (if that's us) or sending a message to the
- * primary Pageant (if it's not).
- */
-static void *get_keylist1(int *length)
-{
-	void *ret;
-
-	unsigned char request[5], *response;
-	void *vresponse;
-	int resplen;
-	request[4] = SSH1_AGENTC_REQUEST_RSA_IDENTITIES;
-	PUT_32BIT(request, 1);
-
-	agent_query(request, 5, &vresponse, &resplen, NULL, NULL);
-
-	response = vresponse;
-	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER) {
-		sfree(response);
-		return NULL;
-	}
-
-	ret = snewn(resplen-5, unsigned char);
-	memcpy(ret, response+5, resplen-5);
-	sfree(response);
-
-	if (length)
-		*length = resplen-5;
-
-	return ret;
-}
-
-// from WINDOWS\WINPGNT.C (putty 0.63)
-/*
- * Acquire a keylist2 from the primary Pageant; this means either
- * calling make_keylist2 (if that's us) or sending a message to the
- * primary Pageant (if it's not).
- */
-static void *get_keylist2(int *length)
-{
-	void *ret;
-
-	unsigned char request[5], *response;
-	void *vresponse;
-	int resplen;
-
-	request[4] = SSH2_AGENTC_REQUEST_IDENTITIES;
-	PUT_32BIT(request, 1);
-
-	agent_query(request, 5, &vresponse, &resplen, NULL, NULL);
-
-	response = vresponse;
-	if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER) {
-		sfree(response);
-		return NULL;
-	}
-
-	ret = snewn(resplen-5, unsigned char);
-	memcpy(ret, response+5, resplen-5);
-	sfree(response);
-
-	if (length)
-		*length = resplen-5;
-
-	return ret;
-}
-
 BOOL putty_agent_exists()
 {
 	if (agent_exists()) {
@@ -382,20 +278,3 @@
 	return FALSE;
 }
 
-// from WINDOWS\WINDOW.C (putty 0.60)
-/*
- * Print a modal (Really Bad) message box and perform a fatal exit.
- */
-void modalfatalbox(char *fmt, ...)
-{
-	va_list ap;
-	char *stuff, morestuff[100];
-
-	va_start(ap, fmt);
-	stuff = dupvprintf(fmt, ap);
-	va_end(ap);
-	sprintf(morestuff, "%.70s Fatal Error", "TTSSH");
-	MessageBox(NULL, stuff, morestuff,
-	           MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
-	sfree(stuff);
-}

Modified: trunk/ttssh2/putty/libputty.h
===================================================================
--- trunk/ttssh2/putty/libputty.h	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/ttssh2/putty/libputty.h	2022-01-03 05:46:40 UTC (rev 9662)
@@ -25,24 +25,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-// PuTTY is copyright 1997-2007 Simon Tatham.
+// PuTTY is copyright 1997-2021 Simon Tatham.
 
-// pageant.h
-// \x96{\x93\x96\x82\xCD pageant.h \x82\xF0 include \x8Fo\x97\x88\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x95\x{30AA0A2}\x82\xA2\x82̂\xA9\x82\xE0\x82\xB5\x82\xEA\x82Ȃ\xA2\x82\xAF\x82\xEA\x82\xC7
-// \x8A֐\x94\x82̃v\x83\x8D\x83g\x83^\x83C\x83v\x90錾\x82\xE0\x82\xB1\x82\xB1\x82ɂ\xA0\x82\xE9\x82̂Ŏ\xE6\x82肠\x82\xA6\x82\xB8\x82\xB1\x82\xB1\x82ŁB
-#define AGENT_MAX_MSGLEN 8192
-
-// \x83G\x83\x89\x81[\x89\x9E\x93\x9A\x97p
-#define SSH_AGENT_FAILURE_MSG "\x00\x00\x00\x01\x05"
-
-// MISC.C
-extern void safefree(void *);
-
-// WINDOWS\WINPGNTC.C
-extern int agent_exists(void);
-extern void *agent_query(void *in, int inlen, void **out, int *outlen,
-                       void (*callback)(void *, void *, int), void *callback_ctx);
-
 int putty_get_ssh2_keylist(unsigned char **keylist);
 void *putty_sign_ssh2_key(unsigned char *pubkey,
                           unsigned char *data,
@@ -57,7 +41,16 @@
                                 int *outlen);
 int putty_get_ssh1_keylen(unsigned char *key, int maxlen);
 const char *putty_get_version();
+void putty_agent_query_synchronous(void *in, int inlen, void **out, int *outlen);
 BOOL putty_agent_exists();
 
-static void *get_keylist1(int *length);
-static void *get_keylist2(int *length);
+// \x83G\x83\x89\x81[\x89\x9E\x93\x9A\x97p
+#define SSH_AGENT_FAILURE_MSG "\x00\x00\x00\x01\x05"
+
+// pageant.h
+#define AGENT_MAX_MSGLEN 262144
+
+// puttymen.h
+//   memory.c
+extern void safefree(void *);
+

Copied: trunk/ttssh2/putty/putty-import.c (from rev 9626, branches/putty_0_76/ttssh2/putty/putty-import.c)
===================================================================
--- trunk/ttssh2/putty/putty-import.c	                        (rev 0)
+++ trunk/ttssh2/putty/putty-import.c	2022-01-03 05:46:40 UTC (rev 9662)
@@ -0,0 +1,446 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004- TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+// PuTTY is copyright 1997-2021 Simon Tatham.
+
+/* 
+ * \x83\\x81[\x83X\x91S\x91̂\xF0\x82\xBB\x82̂܂܃v\x83\x8D\x83W\x83F\x83N\x83g\x82ɒlj\xC1\x82\xB7\x82\xE9\x82ƁA
+ * \x8Eg\x82\xED\x82Ȃ\xA2\x95\x94\x95\xAA\x82ňˑ\xB6\x90悪\x91\x9D\x82\xA6\x81A\x82\xB3\x82\xE7\x82ɂ\xBB\x82̈ˑ\xB6\x90悪\x91\x9D\x82\xA6\x82\xBD\x82苣\x8D\x87\x82\xAA\x8BN\x82\xAB\x82\xE9\x82̂ŁA
+ * PuTTY \x82̃\\x81[\x83X\x82\xA9\x82\xE7\x83R\x83s\x81[\x82\xB5\x82Ă\xAB\x82\xBD\x83R\x81[\x83h
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "ssh.h"
+#include "mpint.h"
+#include "putty.h"
+#include "network.h"
+#include "sshcr.h"
+#include "pageant.h"
+
+
+// from pageant.c (PuTTY 0.76)
+#define DECL_EXT_ENUM(id, name) id,
+enum Extension { KNOWN_EXTENSIONS(DECL_EXT_ENUM) EXT_UNKNOWN };
+#define DEF_EXT_NAMES(id, name) PTRLEN_DECL_LITERAL(name),
+static const ptrlen extension_names[] = { KNOWN_EXTENSIONS(DEF_EXT_NAMES) };
+
+// from pageant.c (PuTTY 0.76)
+typedef struct PageantClientOp {
+    strbuf *buf;
+    bool request_made;
+    BinarySink_DELEGATE_IMPLEMENTATION;
+    BinarySource_IMPLEMENTATION;
+} PageantClientOp;
+
+// from pageant.c (PuTTY 0.76)
+typedef struct KeyListEntry {
+    ptrlen blob, comment;
+    uint32_t flags;
+} KeyListEntry;
+
+// from pageant.c (PuTTY 0.76)
+typedef struct KeyList {
+    strbuf *raw_data;
+    KeyListEntry *keys;
+    size_t nkeys;
+    bool broken;
+} KeyList;
+
+// from pageant.c (PuTTY 0.76)
+static PageantClientOp *pageant_client_op_new(void)
+{
+    PageantClientOp *pco = snew(PageantClientOp);
+    pco->buf = strbuf_new_for_agent_query();
+    pco->request_made = false;
+    BinarySink_DELEGATE_INIT(pco, pco->buf);
+    BinarySource_INIT(pco, "", 0);
+    return pco;
+}
+
+// from pageant.c (PuTTY 0.76)
+static void pageant_client_op_free(PageantClientOp *pco)
+{
+    if (pco->buf)
+        strbuf_free(pco->buf);
+    sfree(pco);
+}
+
+// from pageant.c (PuTTY 0.76)
+static unsigned pageant_client_op_query(PageantClientOp *pco)
+{
+    /* Since we use the same strbuf for the request and the response,
+     * check by assertion that we aren't embarrassingly sending a
+     * previous response back to the agent */
+    assert(!pco->request_made);
+    pco->request_made = true;
+
+    void *response_raw;
+    int resplen_raw;
+    agent_query_synchronous(pco->buf, &response_raw, &resplen_raw);
+    strbuf_clear(pco->buf);
+    put_data(pco->buf, response_raw, resplen_raw);
+    sfree(response_raw);
+
+    /* The data coming back from agent_query_synchronous will have
+        * its length field prepended. So we start by parsing it as an
+        * SSH-formatted string, and then reinitialise our
+        * BinarySource with the interior of that string. */
+    BinarySource_INIT_PL(pco, ptrlen_from_strbuf(pco->buf));
+    BinarySource_INIT_PL(pco, get_string(pco));
+
+    /* Strip off and directly return the type byte, which every client
+     * will need, to save a boilerplate get_byte at each call site */
+    unsigned reply_type = get_byte(pco);
+    if (get_err(pco))
+        reply_type = 256;              /* out-of-range code */
+    return reply_type;
+}
+
+// from pageant.c (PuTTY 0.76)
+void keylist_free(KeyList *kl)
+{
+    sfree(kl->keys);
+    strbuf_free(kl->raw_data);
+    sfree(kl);
+}
+
+// from pageant.c (PuTTY 0.76)
+static PageantClientOp *pageant_request_keylist_1(void)
+{
+    PageantClientOp *pco = pageant_client_op_new();
+    put_byte(pco, SSH1_AGENTC_REQUEST_RSA_IDENTITIES);
+    if (pageant_client_op_query(pco) == SSH1_AGENT_RSA_IDENTITIES_ANSWER)
+        return pco;
+    pageant_client_op_free(pco);
+    return NULL;
+}
+
+// from pageant.c (PuTTY 0.76)
+static PageantClientOp *pageant_request_keylist_2(void)
+{
+    PageantClientOp *pco = pageant_client_op_new();
+    put_byte(pco, SSH2_AGENTC_REQUEST_IDENTITIES);
+    if (pageant_client_op_query(pco) == SSH2_AGENT_IDENTITIES_ANSWER)
+        return pco;
+    pageant_client_op_free(pco);
+    return NULL;
+}
+
+// from pageant.c (PuTTY 0.76)
+static PageantClientOp *pageant_request_keylist_extended(void)
+{
+    PageantClientOp *pco = pageant_client_op_new();
+    put_byte(pco, SSH2_AGENTC_EXTENSION);
+    put_stringpl(pco, extension_names[EXT_LIST_EXTENDED]);
+    if (pageant_client_op_query(pco) == SSH_AGENT_SUCCESS)
+        return pco;
+    pageant_client_op_free(pco);
+    return NULL;
+}
+
+// from pageant.c (PuTTY 0.76)
+KeyList *pageant_get_keylist(unsigned ssh_version)
+{
+    PageantClientOp *pco;
+    bool list_is_extended = false;
+
+    if (ssh_version == 1) {
+        pco = pageant_request_keylist_1();
+    } else {
+        if ((pco = pageant_request_keylist_extended()) != NULL)
+            list_is_extended = true;
+        else
+            pco = pageant_request_keylist_2();
+    }
+
+    if (!pco)
+        return NULL;
+
+    KeyList *kl = snew(KeyList);
+    kl->nkeys = get_uint32(pco);
+    kl->keys = snewn(kl->nkeys, struct KeyListEntry);
+    kl->broken = false;
+
+    for (size_t i = 0; i < kl->nkeys && !get_err(pco); i++) {
+        if (ssh_version == 1) {
+            int bloblen = rsa_ssh1_public_blob_len(
+                make_ptrlen(get_ptr(pco), get_avail(pco)));
+            if (bloblen < 0) {
+                kl->broken = true;
+                bloblen = 0;
+            }
+            kl->keys[i].blob = get_data(pco, bloblen);
+        } else {
+            kl->keys[i].blob = get_string(pco);
+        }
+        kl->keys[i].comment = get_string(pco);
+
+        if (list_is_extended) {
+            ptrlen key_ext_info = get_string(pco);
+            BinarySource src[1];
+            BinarySource_BARE_INIT_PL(src, key_ext_info);
+
+            kl->keys[i].flags = get_uint32(src);
+        } else {
+            kl->keys[i].flags = 0;
+        }
+    }
+
+    if (get_err(pco))
+        kl->broken = true;
+    kl->raw_data = pco->buf;
+    pco->buf = NULL;
+    pageant_client_op_free(pco);
+    return kl;
+}
+
+// from sshrsa.c (PuTTY 0.76)
+/* Given an SSH-1 public key blob, determine its length. */
+int rsa_ssh1_public_blob_len(ptrlen data)
+{
+    BinarySource src[1];
+
+    BinarySource_BARE_INIT_PL(src, data);
+
+    /* Expect a length word, then exponent and modulus. (It doesn't
+     * even matter which order.) */
+    get_uint32(src);
+    mp_free(get_mp_ssh1(src));
+    mp_free(get_mp_ssh1(src));
+
+    if (get_err(src))
+        return -1;
+
+    /* Return the number of bytes consumed. */
+    return src->pos;
+}
+
+// from windows/winmiscs.c (PuTTY 0.76)
+/*
+ * Windows implementation of smemclr (see misc.c) using SecureZeroMemory.
+ */
+void smemclr(void *b, size_t n) {
+    if (b && n > 0)
+        SecureZeroMemory(b, n);
+}
+
+// from be_misc.c (PuTTY 0.76)
+void log_proxy_stderr(Plug *plug, ProxyStderrBuf *psb,
+                      const void *vdata, size_t len)
+{
+    const char *data = (const char *)vdata;
+
+    /*
+     * This helper function allows us to collect the data written to a
+     * local proxy command's standard error in whatever size chunks we
+     * happen to get from its pipe, and whenever we have a complete
+     * line, we pass it to plug_log.
+     *
+     * (We also do this when the buffer in psb fills up, to avoid just
+     * allocating more and more memory forever, and also to keep Event
+     * Log lines reasonably bounded in size.)
+     *
+     * Prerequisites: a plug to log to, and a ProxyStderrBuf stored
+     * somewhere to collect any not-yet-output partial line.
+     */
+
+    while (len > 0) {
+        /*
+         * Copy as much data into psb->buf as will fit.
+         */
+        assert(psb->size < lenof(psb->buf));
+        size_t to_consume = lenof(psb->buf) - psb->size;
+        if (to_consume > len)
+            to_consume = len;
+        memcpy(psb->buf + psb->size, data, to_consume);
+        data += to_consume;
+        len -= to_consume;
+        psb->size += to_consume;
+
+        /*
+         * Output any full lines in psb->buf.
+         */
+        size_t pos = 0;
+        while (pos < psb->size) {
+            char *nlpos = memchr(psb->buf + pos, '\n', psb->size - pos);
+            if (!nlpos)
+                break;
+
+            /*
+             * Found a newline in the buffer, so we can output a line.
+             */
+            size_t endpos = nlpos - psb->buf;
+            while (endpos > pos && (psb->buf[endpos-1] == '\n' ||
+                                    psb->buf[endpos-1] == '\r'))
+                endpos--;
+            char *msg = dupprintf(
+                "proxy: %.*s", (int)(endpos - pos), psb->buf + pos);
+            plug_log(plug, PLUGLOG_PROXY_MSG, NULL, 0, msg, 0);
+            sfree(msg);
+
+            pos = nlpos - psb->buf + 1;
+            assert(pos <= psb->size);
+        }
+
+        /*
+         * If the buffer is completely full and we didn't output
+         * anything, then output the whole thing, flagging it as a
+         * truncated line.
+         */
+        if (pos == 0 && psb->size == lenof(psb->buf)) {
+            char *msg = dupprintf(
+                "proxy (partial line): %.*s", (int)psb->size, psb->buf);
+            plug_log(plug, PLUGLOG_PROXY_MSG, NULL, 0, msg, 0);
+            sfree(msg);
+
+            pos = psb->size = 0;
+        }
+
+        /*
+         * Now move any remaining data up to the front of the buffer.
+         */
+        size_t newsize = psb->size - pos;
+        if (newsize)
+            memmove(psb->buf, psb->buf + pos, newsize);
+        psb->size = newsize;
+
+        /*
+         * And loop round again if there's more data to be read from
+         * our input.
+         */
+    }
+}
+
+// from be_misc.c (PuTTY 0.76)
+void psb_init(ProxyStderrBuf *psb)
+{
+    psb->size = 0;
+}
+
+// from windows/winpgnt.c (PuTTY 0.76)
+void noise_ultralight(NoiseSourceId id, unsigned long data)
+{
+    /* Pageant doesn't use random numbers, so we ignore this */
+}
+
+// from windows/window.c (PuTTY 0.76)
+/*
+ * Print a modal (Really Bad) message box and perform a fatal exit.
+ */
+void modalfatalbox(const char *fmt, ...)
+{
+    va_list ap;
+    char *message, *title;
+
+    va_start(ap, fmt);
+    message = dupvprintf(fmt, ap);
+    va_end(ap);
+    title = dupprintf("%s Fatal Error", "TTSSH");
+    MessageBox(NULL, message, title,
+               MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
+    sfree(message);
+    sfree(title);
+}
+
+// from misc.c (PuTTY 0.76)
+void out_of_memory(void)
+{
+    modalfatalbox("Out of memory");
+}
+
+
+/*
+putty_get_ssh1_keylen()@libputty.c
+	rsa_ssh1_public_blob_len()@sshrsa.c ... import
+
+memory.c / mpint.c / utils.c
+	smemclr()@windows/winmiscs.c ... import
+
+safemalloc()@memory.c
+	out_of_memory()@misc.c ... import
+		modalfatalbox()@windows/window.c ... import
+
+wm_copydata_agent_query()@windows\winpgnt.c
+	got_advapi()@windows\winsecur.c ... include winsecur.c
+
+agent_named_pipe_name()@windows\winpgnt.c
+	get_username()@windows\winmisc.c ... include winmisc.c
+
+agent_connect()@windows\winpgnt.c
+	new_named_pipe_client()@winnpc.c ... include winnpc.c
+		connect_to_named_pipe()@winnpc.c
+		new_error_socket_consume_string()@errsock.c ... include errsock.c
+		make_handle_socket()@winsocket.c ... include winsocket.c
+			handle_input_new()@winhandl.c ... include winhandl.c
+			handle_output_new()@winhandl.c
+			psb_init()@be_misc.c ... import
+			handle_stderr()@winhsock.c
+				log_proxy_stderr()@be_misc.c ... import
+
+agent_named_pipe_name()@windows\winpgnt.c
+	capi_obfuscate_string()@windows\wincapi.c ... include wincapi.c
+		ssh_sha256 ＠ sshsh256.c ... include sshsh256.c
+
+handle_got_event()@windows\winhandl.c
+	noise_ultralight()@windows/winpgnt.c
+
+sk_handle_set_frozen()@windows\winhsock.c
+	queue_toplevel_callback()@callback.c ... include callback.c
+sk_handle_close()@windows\winhsock.c
+	delete_callbacks_for_context()@callback.c
+
+winmisc.c refers to tree234 ... include tree234.c
+
+
+
+if include be_misc.c ...
+backend_socket_log()@be_misc.c
+	sk_getaddr()@windows\winnet.c
+	sk_addr_needs_port()@windows\winnet.c
+	conf_get_int()@conf.c
+	logevent()@logging.c
+
+if include sshrsa.c ...
+rsa_components()@sshrsa.c
+	key_components_new()@sshpubk.c
+	key_components_add_text()@sshpubk.c
+	key_components_add_mp()@sshpubk.c
+ssh_rsakex_encrypt()@sshrsa.c
+	hash_simple()@sshauxcrypt.c
+ssh_rsakex_decrypt()@sshrsa.c
+	hash_simple()@sshauxcrypt.c
+rsa_ssh1_encrypt()@sshrsa.c
+	random_read()@sshrand.c
+
+if include sshauxcropt.c ...
+mac_simple()@sshauxcropt.c coflicts mac_simple()@keyfiles-putty.c
+*/

Modified: trunk/ttssh2/putty/putty.v16.vcxproj
===================================================================
--- trunk/ttssh2/putty/putty.v16.vcxproj	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/ttssh2/putty/putty.v16.vcxproj	2022-01-03 05:46:40 UTC (rev 9662)
@@ -71,14 +71,25 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\libs\putty\CONF.C" />
-    <ClCompile Include="..\..\libs\putty\MISC.C" />
-    <ClCompile Include="..\..\libs\putty\TREE234.C" />
-    <ClCompile Include="..\..\libs\putty\VERSION.C" />
-    <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C" />
-    <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C" />
-    <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C" />
+    <ClCompile Include="..\..\libs\putty\aqsync.c" />
+    <ClCompile Include="..\..\libs\putty\callback.c" />
+    <ClCompile Include="..\..\libs\putty\errsock.c" />
+    <ClCompile Include="..\..\libs\putty\marshal.c" />
+    <ClCompile Include="..\..\libs\putty\memory.c" />
+    <ClCompile Include="..\..\libs\putty\mpint.c" />
+    <ClCompile Include="..\..\libs\putty\sshsh256.c" />
+    <ClCompile Include="..\..\libs\putty\tree234.c" />
+    <ClCompile Include="..\..\libs\putty\utils.c" />
+    <ClCompile Include="..\..\libs\putty\version.c" />
+    <ClCompile Include="..\..\libs\putty\windows\wincapi.c" />
+    <ClCompile Include="..\..\libs\putty\windows\winhandl.c" />
+    <ClCompile Include="..\..\libs\putty\windows\winhsock.c" />
+    <ClCompile Include="..\..\libs\putty\windows\winmisc.c" />
+    <ClCompile Include="..\..\libs\putty\windows\winnpc.c" />
+    <ClCompile Include="..\..\libs\putty\windows\winpgntc.c" />
+    <ClCompile Include="..\..\libs\putty\windows\winsecur.c" />
     <ClCompile Include="libputty.c" />
+    <ClCompile Include="putty-import.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="libputty.h" />

Modified: trunk/ttssh2/putty/putty.v16.vcxproj.filters
===================================================================
--- trunk/ttssh2/putty/putty.v16.vcxproj.filters	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/ttssh2/putty/putty.v16.vcxproj.filters	2022-01-03 05:46:40 UTC (rev 9662)
@@ -6,28 +6,59 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\libs\putty\CONF.C">
+    <ClCompile Include="..\..\libs\putty\aqsync.c">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\MISC.C">
+    <ClCompile Include="..\..\libs\putty\callback.c">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\TREE234.C">
+    <ClCompile Include="..\..\libs\putty\errsock.c">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\VERSION.C">
+    <ClCompile Include="..\..\libs\putty\marshal.c">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\WINDOWS\WINMISC.C">
+    <ClCompile Include="..\..\libs\putty\memory.c">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\WINDOWS\WINPGNTC.C">
+    <ClCompile Include="..\..\libs\putty\mpint.c">
       <Filter>Putty Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libs\putty\WINDOWS\WINSECUR.C">
+    <ClCompile Include="..\..\libs\putty\sshsh256.c">
       <Filter>Putty Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libs\putty\tree234.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\utils.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\version.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\windows\wincapi.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\windows\winhandl.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\windows\winhsock.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\windows\winmisc.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\windows\winnpc.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\windows\winpgntc.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\putty\windows\winsecur.c">
+      <Filter>Putty Files</Filter>
+    </ClCompile>
     <ClCompile Include="libputty.c" />
+    <ClCompile Include="putty-import.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="libputty.h" />

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2022-01-01 08:58:28 UTC (rev 9661)
+++ trunk/ttssh2/ttxssh/ssh.c	2022-01-03 05:46:40 UTC (rev 9662)
@@ -9503,9 +9503,9 @@
 		data = agent_msg->buf;
 	}
 
-	agent_query(data, *agent_request_len, &response, &resplen, NULL, NULL);
+	putty_agent_query_synchronous(data, *agent_request_len, &response, &resplen);
 	if (response == NULL || resplen < 5) {
-		logprintf(LOG_LEVEL_NOTICE, "%s Agent Forwarding Error: agent_query is failed.", __FUNCTION__);
+		logprintf(LOG_LEVEL_NOTICE, "%s Agent Forwarding Error: putty_agent_query_synchronous is failed.", __FUNCTION__);
 		goto error;
 	}
 

From scmnotify ＠ osdn.net  Mon Jan  3 15:53:28 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 03 Jan 2022 15:53:28 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjNdIOmrmERQSeWvvuW/nOOBq+OBpA==?=
 =?utf-8?b?44GE44Gm44OJ44Kt44Ol44Oh44Oz44OI562J44KS5aSJ5pu0?=
Message-ID: <1641192808.499601.8610.nullmailer@users.osdn.me>

Revision: 9663
          https://osdn.net/projects/ttssh2/scm/svn/commits/9663
Author:   zmatsuo
Date:     2022-01-03 15:53:28 +0900 (Mon, 03 Jan 2022)
Log Message:
-----------
高DPI対応についてドキュメント等を変更

- TERATERM.INI の Tera Term セクションで DPIAware=on を追加
- r9656 の変更についてのドキュメント修正

ticket #36122

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9656

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/36122

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-ini.html
    trunk/doc/en/html/setup/teraterm-misc.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/setup/teraterm-ini.html
    trunk/doc/ja/html/setup/teraterm-misc.html
    trunk/installer/release/TERATERM.INI

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2022-01-03 05:46:40 UTC (rev 9662)
+++ trunk/doc/en/html/about/history.html	2022-01-03 06:53:28 UTC (rev 9663)
@@ -36,6 +36,10 @@
   <li>Changes
     <ul>
       <li>Improved the stability of XMODEM transmission.</li>
+      <li>Changed default to on for High DPI support.</li>
+      <ul>
+        <li>Same behavior as before the change when DPIAware=off add to Tera Term section in TERATERM.INI</li>
+      </ul>
     </ul>
   </li>
 

Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html	2022-01-03 05:46:40 UTC (rev 9662)
+++ trunk/doc/en/html/setup/teraterm-ini.html	2022-01-03 06:53:28 UTC (rev 9663)
@@ -506,6 +506,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="DpiAware"><a href="../setup/teraterm-misc.html#HighDPI">DpiAware</a></td>
+		<td style="width:250px;">on</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="EnableANSIColor"><a href="../menu/setup-additional.html#EnableANSIColor">EnableANSIColor</a></td>
 		<td style="width:250px;">on</td>
 		<td style="width:250px;">&lt;-</td>

Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html	2022-01-03 05:46:40 UTC (rev 9662)
+++ trunk/doc/en/html/setup/teraterm-misc.html	2022-01-03 06:53:28 UTC (rev 9663)
@@ -407,19 +407,18 @@
 </pre>
 
 <h1 id="HighDPI">High DPI Aware</h1>
+
 <p>
-The High DPI feature is experimentally supported. Tera Term works as the Per-monitor DPI Aware application when "DPIAware=on" entry is set at [Tera Term] section of the setup file like the following:
+The High DPI feature is supported.
+Tera Term works as the Per-monitor DPI Aware application.
 </p>
 
-<pre>
-DPIAware=on
-</pre>
-
 <p>
-Without the entry, Tera Term works as the DPI Unaware application as before. In the future release, it may automatically work as the Per-monitor DPI Aware application and, may ignore "DPIAware=on" entry.
+Tera Term works as the DPI Unaware application when "DPIAware=off" entry is added to [Tera Term] section in teraterm.ini.
 </p>
+
 <p>
-Scaling results become smooth when you choose a TrueType font for the <a href="../menu/setup-font.html">Font</a>.
+Scaling results become smooth at High DPI when you choose a TrueType font for the <a href="../menu/setup-font.html">Font</a>.
 </p>
 <p>
 High DPI aware has some modes. For more reference, see the DPI AwarenessMode section on the <a href="https://docs.microsoft.com/en-us/windows/desktop/hidpi/high-dpi-desktop-application-development-on-windows#dpi-awareness-mode">High DPI Desktop Application Development on Windows DPI AwarenessMode</a>.

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2022-01-03 05:46:40 UTC (rev 9662)
+++ trunk/doc/ja/html/about/history.html	2022-01-03 06:53:28 UTC (rev 9663)
@@ -36,6 +36,10 @@
   <li>\x95ύX
     <ul>
       <li>XMODEM \x91\x97\x90M\x8E\x9E\x82̈\xC0\x92萫\x8C\xFC\x8F\xE3</li>
+      <li>\x8D\x82DPI\x91Ή\x9E\x82̃f\x83t\x83H\x83\x8B\x83g\x82\xF0ON\x82ɕύX</li>
+      <ul>
+        <li>TERATERM.INI \x82\xCC Tera Term \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xC9 DPIAware=off \x82\xF0\x89\xC1\x82\xA6\x82\xE9\x82Ə]\x97\x88\x92ʂ\xE8\x82̓\xAE\x8D\xEC\x82ƂȂ\xE9</li>
+      </ul>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html	2022-01-03 05:46:40 UTC (rev 9662)
+++ trunk/doc/ja/html/setup/teraterm-ini.html	2022-01-03 06:53:28 UTC (rev 9663)
@@ -512,6 +512,12 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="DpiAware"><a href="../setup/teraterm-misc.html#HighDPI">DpiAware</a></td>
+		<td style="width:250px;">on</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="EnableANSIColor"><a href="../menu/setup-additional.html#EnableANSIColor">EnableANSIColor</a></td>
 		<td style="width:250px;">on</td>
 		<td style="width:250px;">&lt;-</td>

Modified: trunk/doc/ja/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-misc.html	2022-01-03 05:46:40 UTC (rev 9662)
+++ trunk/doc/ja/html/setup/teraterm-misc.html	2022-01-03 06:53:28 UTC (rev 9663)
@@ -429,19 +429,17 @@
 <h1 id="HighDPI">\x8D\x82DPI\x91Ή\x9E(High DPI Aware)</h1>
 
 <p>
-\x8E\x8E\x8C\xB1\x93I\x82ɍ\x82DPI\x82ɑΉ\x9E\x82\xB5\x82܂\xB5\x82\xBD\x81B<br>
+\x8D\x82DPI\x82ɑΉ\x9E\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
+Per monitor DPI Aware \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82ē\xAE\x8D삵\x82܂\xB7\x81B
+</p>
 
-teraterm.ini\x82\xCC[Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82\xC9DPIAware=on\x82Ƃ\xB7\x82\xE9\x82ƁA
-Per monitor DPI Aware \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82ē\xAE\x8D삵\x82܂\xB7\x81B<br>
-\x82\xB1\x82̐ݒ\xE8\x82\xF0\x8Ds\x82\xED\x82Ȃ\xA2\x82ƁA\x8F]\x97\x88\x82Ɠ\xAF\x97l DPI Unaware \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82ē\xAE\x8D삵\x82܂\xB7\x81B<br>
-\x8F\xAB\x97\x88\x93I\x82ɂ͂\xB1\x82̐ݒ\xE8\x82\xF0\x8EQ\x8FƂ\xB9\x82\xB8\x81A\x8E\xA9\x93\xAE\x82ō\x82DPI\x91Ή\x9E\x82ƂȂ\xE9\x97\\x92\xE8\x82ł\xB7\x81B<br>
+<p>
+\x8F]\x97\x88\x82Ɠ\xAF\x97l DPI Unaware \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ďg\x97p\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ\x82\xCD
+teraterm.ini\x82\xCC[Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82\xC9DPIAware=off\x82\xF0\x92lj\xC1\x82\xB5\x82܂\xB7\x81B
+</p>
 
-<pre>
-DPIAware=on
-</pre>
-
 <p>
-<a href="../menu/setup-font.html">\x83t\x83H\x83\x93\x83g</a>\x82\xCDTrue Type
+\x8D\x82DPI\x8E\x9E<a href="../menu/setup-font.html">\x83t\x83H\x83\x93\x83g</a>\x82\xCDTrue Type
 Font\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xA8\x82\xAD\x82ƃX\x83P\x81[\x83\x8A\x83\x93\x83O\x8C\x8B\x89ʂ\xAA\x83X\x83\x80\x81[\x83Y\x82ɂȂ\xE8\x82܂\xB7\x81B
 </p>
 

Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2022-01-03 05:46:40 UTC (rev 9662)
+++ trunk/installer/release/TERATERM.INI	2022-01-03 06:53:28 UTC (rev 9663)
@@ -787,6 +787,9 @@
 
 ;------ end of special options
 
+; high DPI support
+DpiAware=on
+
 [TTSSH]
 ; SSH enabled flag (1=enabled 0=disabled)
 Enabled=1

From scmnotify ＠ osdn.net  Mon Jan  3 16:21:34 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 03 Jan 2022 16:21:34 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjRdIGh0bWznlJ/miJDjgrnjgq/jg6o=?=
 =?utf-8?b?44OX44OI44GrbWFya2Rvd27jgYvjgonjga7lpInmj5vmqZ/og73jgpLov70=?=
 =?utf-8?b?5Yqg?=
Message-ID: <1641194494.201893.32034.nullmailer@users.osdn.me>

Revision: 9664
          https://osdn.net/projects/ttssh2/scm/svn/commits/9664
Author:   zmatsuo
Date:     2022-01-03 16:21:33 +0900 (Mon, 03 Jan 2022)
Log Message:
-----------
html生成スクリプトにmarkdownからの変換機能を追加

- 2sjis.pl
  - 機能を追加
    - markdown を html に変換
    - zlib license 部分切り出し
    - bom削除
  - require 5.24.0
- copy-zliblicense.pl 削除
  - 2sjis.pl に機能を追加したため
- htmlhelp_index_make.pl
  - use utf8
  - require 5.24.0
  - -o オプションを追加
- doc/makechm.cmake 追加
  - chm(ヘルプ)を作成

Modified Paths:
--------------
    trunk/doc/.gitignore
    trunk/doc/CMakeLists.txt
    trunk/doc/convtext.bat
    trunk/doc/htmlhelp_index_make.pl
    trunk/installer/2sjis.pl

Added Paths:
-----------
    trunk/doc/makechm.cmake

Removed Paths:
-------------
    trunk/installer/copy-zliblicense.pl

-------------- next part --------------
Modified: trunk/doc/.gitignore
===================================================================
--- trunk/doc/.gitignore	2022-01-03 06:53:28 UTC (rev 9663)
+++ trunk/doc/.gitignore	2022-01-03 07:21:33 UTC (rev 9664)
@@ -7,3 +7,6 @@
 *.txt
 *.md
 *.html
+*.hhk
+*.chw
+*.chm

Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt	2022-01-03 06:53:28 UTC (rev 9663)
+++ trunk/doc/CMakeLists.txt	2022-01-03 07:21:33 UTC (rev 9664)
@@ -27,93 +27,30 @@
     )
 
   add_custom_target(
-    teraterm_chm
+    chm
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/en/teraterm.chm
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ja/teratermj.chm
     SOURCES ${SRC_EN}
+    SOURCES ${SRC_JP}
     SOURCES htmlhelp_index_make.pl
-    SOURCES htmlhelp_update_check.pl
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT Generate "${CMAKE_CURRENT_BINARY_DIR}/teraterm.chm"
     )
 
-  add_custom_target(
-    teratermj_chm
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ja/teratermj.chm
-    SOURCES htmlhelp_index_make.pl
-    SOURCES htmlhelp_update_check.pl
-    SOURCES ${SRC_JP}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT Generate "${CMAKE_CURRENT_BINARY_DIR}/teratermj.chm"
-    )
-
   source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SRC_EN})
   source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SRC_JP})
 
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/en/teraterm.chm
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/Oniguruma-LICENSE.txt -o en/html/reference/Oniguruma-LICENSE.txt -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/en/RE                 -o en/html/reference/RE.txt      -c utf8   -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/OpenSSL-LICENSE.txt   -o en/html/reference/OpenSSL-LICENSE.txt   -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/PuTTY-LICENSE.txt     -o en/html/reference/PuTTY-LICENSE.txt     -l crlf
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/SFMT-LICENSE.txt      -o en/html/reference/SFMT-LICENSE.txt      -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/cJSON-LICENSE.txt     -o en/html/reference/cJSON-LICENSE.txt     -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/argon2-LICENSE.txt    -o en/html/reference/argon2-LICENSE.txt    -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../cygwin/cygterm/COPYING              -o en/html/reference/CygTerm+-LICENSE.txt  -l unix
-    COMMAND ${PERL} ../installer/copy-zliblicense.pl -i ../libs/doc_help/zlib-LICENSE.txt -o en/html/reference/zlib-LICENSE.txt -l unix
-    COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" en/html/reference/build_with_cmake.md > en/html/reference/build_with_cmake_no_bom.md
-    COMMAND ${PERL} Markdown_1.0.1/Markdown.pl en/html/reference/build_with_cmake_no_bom.md > en/html/reference/build_with_cmake_utf8.html
-    COMMAND ${PERL} ../installer/2sjis.pl -i en/html/reference/build_with_cmake_utf8.html -o en/html/reference/build_with_cmake.html  -c utf8
-    COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" en/html/reference/build_library_with_cmake.md > en/html/reference/build_library_with_cmake_no_bom.md
-    COMMAND ${PERL} Markdown_1.0.1/Markdown.pl en/html/reference/build_library_with_cmake_no_bom.md > en/html/reference/build_library_with_cmake_utf8.html
-    COMMAND ${PERL} ../installer/2sjis.pl -i en/html/reference/build_library_with_cmake_utf8.html -o en/html/reference/build_library_with_cmake.html  -c utf8
-    COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" en/html/reference/keyboard_cfg.md > en/html/reference/keyboard_cfg_no_bom.md
-    COMMAND ${PERL} Markdown_1.0.1/Markdown.pl en/html/reference/keyboard_cfg_no_bom.md > en/html/reference/keyboard_cfg_utf8.html
-    COMMAND ${PERL} ../installer/2sjis.pl -i en/html/reference/keyboard_cfg_utf8.html -o en/html/reference/keyboard_cfg.html  -c utf8
-    COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" en/html/reference/menu_id.md > en/html/reference/menu_id_no_bom.md
-    COMMAND ${PERL} Markdown_1.0.1/Markdown.pl en/html/reference/menu_id_no_bom.md > en/html/reference/menu_id_utf8.html
-    COMMAND ${PERL} ../installer/2sjis.pl -i en/html/reference/menu_id_utf8.html -o en/html/reference/menu_id.html  -c utf8
-    COMMAND ${PERL} htmlhelp_index_make.pl en html > en/Index.hhk
-    COMMAND ${HHC} en/teraterm.hhp || (exit 0)
+    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ja/teratermj.chm
+    COMMAND ${CMAKE_COMMAND} -P makechm.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     COMMENT Generate "${CMAKE_CURRENT_BINARY_DIR}/teraterm.chm"
     )
 
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/ja/teratermj.chm
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/Oniguruma-LICENSE.txt -o ja/html/reference/Oniguruma-LICENSE.txt -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/ja/RE                 -o ja/html/reference/RE.txt      -c utf8   -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/OpenSSL-LICENSE.txt   -o ja/html/reference/OpenSSL-LICENSE.txt   -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/PuTTY-LICENSE.txt     -o ja/html/reference/PuTTY-LICENSE.txt     -l crlf
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/SFMT-LICENSE.txt      -o ja/html/reference/SFMT-LICENSE.txt      -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/cJSON-LICENSE.txt     -o ja/html/reference/cJSON-LICENSE.txt     -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../libs/doc_help/argon2-LICENSE.txt    -o ja/html/reference/argon2-LICENSE.txt    -l unix
-    COMMAND ${PERL} ../installer/2sjis.pl -i ../cygwin/cygterm/COPYING              -o ja/html/reference/CygTerm+-LICENSE.txt  -l unix
-    COMMAND ${PERL} ../installer/copy-zliblicense.pl -i ../libs/doc_help/zlib-LICENSE.txt -o ja/html/reference/zlib-LICENSE.txt -l unix
-    COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" ja/html/reference/build_with_cmake.md > ja/html/reference/build_with_cmake_no_bom.md
-    COMMAND ${PERL} Markdown_1.0.1/Markdown.pl ja/html/reference/build_with_cmake_no_bom.md > ja/html/reference/build_with_cmake_utf8.html
-    COMMAND ${PERL} ../installer/2sjis.pl -i ja/html/reference/build_with_cmake_utf8.html -o ja/html/reference/build_with_cmake.html  -c utf8
-    COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" ja/html/reference/build_library_with_cmake.md > ja/html/reference/build_library_with_cmake_no_bom.md
-    COMMAND ${PERL} Markdown_1.0.1/Markdown.pl ja/html/reference/build_library_with_cmake_no_bom.md > ja/html/reference/build_library_with_cmake_utf8.html
-    COMMAND ${PERL} ../installer/2sjis.pl -i ja/html/reference/build_library_with_cmake_utf8.html -o ja/html/reference/build_library_with_cmake.html  -c utf8
-    COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" ja/html/reference/keyboard_cfg.md > ja/html/reference/keyboard_cfg_no_bom.md
-    COMMAND ${PERL} Markdown_1.0.1/Markdown.pl ja/html/reference/keyboard_cfg_no_bom.md > ja/html/reference/keyboard_cfg_utf8.html
-    COMMAND ${PERL} ../installer/2sjis.pl -i ja/html/reference/keyboard_cfg_utf8.html -o ja/html/reference/keyboard_cfg.html  -c utf8
-    COMMAND ${PERL} -C0 -pe "s/^\\xef\\xbb\\xbf//" ja/html/reference/menu_id.md > ja/html/reference/menu_id_no_bom.md
-    COMMAND ${PERL} Markdown_1.0.1/Markdown.pl ja/html/reference/menu_id_no_bom.md > ja/html/reference/menu_id_utf8.html
-    COMMAND ${PERL} ../installer/2sjis.pl -i ja/html/reference/menu_id_utf8.html -o ja/html/reference/menu_id.html  -c utf8
-    COMMAND ${PERL} htmlhelp_index_make.pl ja html > ja/Index.hhk
-    COMMAND ${HHC} ja/teraterm.hhp || (exit 0)
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMENT Generate "${CMAKE_CURRENT_BINARY_DIR}/teratermj.chm"
-    )
-
   set_target_properties(
-    teraterm_chm
-    teratermj_chm
+    chm
     PROPERTIES FOLDER doc)
 
-  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" --build ${CMAKE_BINARY_DIR} --target teraterm_chm)")
-  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" --build ${CMAKE_BINARY_DIR} --target teratermj_chm)")
   install(
     FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/ja/teratermj.chm

Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2022-01-03 06:53:28 UTC (rev 9663)
+++ trunk/doc/convtext.bat	2022-01-03 07:21:33 UTC (rev 9664)
@@ -1,5 +1,4 @@
 set TOSJIS=perl ..\installer\2sjis.pl
-set ZLIBCP=perl ..\installer\copy-zliblicense.pl
 set REF_E=en\html\reference
 set REF_J=ja\html\reference
 %TOSJIS% -i ..\libs\oniguruma\COPYING   -o %REF_E%\Oniguruma-LICENSE.txt -l unix
@@ -14,18 +13,18 @@
 %TOSJIS% -i ..\libs\SFMT\LICENSE.txt    -o %REF_J%\SFMT-LICENSE.txt      -l unix
 %TOSJIS% -i ..\cygwin\cygterm\COPYING   -o %REF_E%\CygTerm+-LICENSE.txt  -l unix
 %TOSJIS% -i ..\cygwin\cygterm\COPYING   -o %REF_J%\CygTerm+-LICENSE.txt  -l unix
-%ZLIBCP% -i ..\libs\zlib\README         -o %REF_E%\zlib-LICENSE.txt      -l unix
-%ZLIBCP% -i ..\libs\zlib\README         -o %REF_J%\zlib-LICENSE.txt      -l unix
+%TOSJIS% -i ..\libs\zlib\README         -o %REF_E%\zlib-LICENSE.txt      -l unix --zlib_special
+%TOSJIS% -i ..\libs\zlib\README         -o %REF_J%\zlib-LICENSE.txt      -l unix --zlib_special
 %TOSJIS% -i ..\libs\cJSON\LICENSE       -o %REF_E%\cJSON-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\cJSON\LICENSE       -o %REF_J%\cJSON-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\argon2\LICENSE      -o %REF_E%\argon2-LICENSE.txt    -l unix
 %TOSJIS% -i ..\libs\argon2\LICENSE      -o %REF_J%\argon2-LICENSE.txt    -l unix
 
-perl -C0 -pe "s/^\xef\xbb\xbf//" %REF_J%/build_with_cmake.md | perl Markdown_1.0.1/Markdown.pl | %TOSJIS% -i - -o %REF_J%/build_with_cmake.html -c utf8
-perl -C0 -pe "s/^\xef\xbb\xbf//" %REF_E%/build_with_cmake.md | perl Markdown_1.0.1/Markdown.pl | %TOSJIS% -i - -o %REF_E%/build_with_cmake.html -c utf8
-perl -C0 -pe "s/^\xef\xbb\xbf//" %REF_J%/build_library_with_cmake.md | perl Markdown_1.0.1/Markdown.pl | %TOSJIS% -i - -o %REF_J%/build_library_with_cmake.html -c utf8
-perl -C0 -pe "s/^\xef\xbb\xbf//" %REF_E%/build_library_with_cmake.md | perl Markdown_1.0.1/Markdown.pl | %TOSJIS% -i - -o %REF_E%/build_library_with_cmake.html -c utf8
-perl -C0 -pe "s/^\xef\xbb\xbf//" %REF_J%/keyboard_cfg.md | perl Markdown_1.0.1/Markdown.pl | %TOSJIS% -i - -o %REF_J%/keyboard_cfg.html -c utf8
-perl -C0 -pe "s/^\xef\xbb\xbf//" %REF_E%/keyboard_cfg.md | perl Markdown_1.0.1/Markdown.pl | %TOSJIS% -i - -o %REF_E%/keyboard_cfg.html -c utf8
-perl -C0 -pe "s/^\xef\xbb\xbf//" %REF_J%/menu_id.md | perl Markdown_1.0.1/Markdown.pl | %TOSJIS% -i - -o %REF_J%/menu_id.html -c utf8
-perl -C0 -pe "s/^\xef\xbb\xbf//" %REF_E%/menu_id.md | perl Markdown_1.0.1/Markdown.pl | %TOSJIS% -i - -o %REF_E%/menu_id.html -c utf8
+%TOSJIS% -i %REF_J%/build_with_cmake.md -o %REF_J%/build_with_cmake.html
+%TOSJIS% -i %REF_E%/build_with_cmake.md -o %REF_E%/build_with_cmake.html
+%TOSJIS% -i %REF_J%/build_library_with_cmake.md -o %REF_J%/build_library_with_cmake.html
+%TOSJIS% -i %REF_E%/build_library_with_cmake.md -o %REF_E%/build_library_with_cmake.html
+%TOSJIS% -i %REF_J%/keyboard_cfg.md     -o %REF_J%/keyboard_cfg.html
+%TOSJIS% -i %REF_E%/keyboard_cfg.md     -o %REF_E%/keyboard_cfg.html
+%TOSJIS% -i %REF_J%/menu_id.md          -o %REF_J%/menu_id.html
+%TOSJIS% -i %REF_E%/menu_id.md          -o %REF_E%/menu_id.html

Modified: trunk/doc/htmlhelp_index_make.pl
===================================================================
--- trunk/doc/htmlhelp_index_make.pl	2022-01-03 06:53:28 UTC (rev 9663)
+++ trunk/doc/htmlhelp_index_make.pl	2022-01-03 07:21:33 UTC (rev 9664)
@@ -1,23 +1,44 @@
-#! /usr/bin/perl
-
-#
-# HTML\x83w\x83\x8B\x83v\x82̃C\x83\x93\x83f\x83b\x83N\x83X\x83t\x83@\x83C\x83\x8B\x82𐶐\xAC\x82\xB7\x82\xE9
-#
-# Usage(ActivePerl):
-#  perl htmlhelp_index_make.pl ja html > ja\Index.hhk
-#
-
+#! /usr/bin/perl
+
+#
+# HTMLヘルプのインデックスファイルを生成する
+#
+# Usage(ActivePerl):
+#  perl htmlhelp_index_make.pl ja html > ja\Index.hhk
+#
+
+require 5.24.0;
+use strict;
+use warnings;
+use utf8;
 use Cwd;
- ＠ dirstack = (); 
-
-do_main($ARGV[0], $ARGV[1]);
-
-exit(0);
-
-sub do_main {
-	my($path, $body) = @_;
-
-	print << 'EOD';
+use Getopt::Long
+
+binmode STDOUT, ":utf8";
+
+my $out = "-";
+my $result = GetOptions(
+	'out|o=s' => \$out);
+
+my $OUT;
+if ($out eq "-") {
+	binmode STDIN, ":crlf:encoding(shiftjis)";
+	$OUT = *STDOUT;
+} else {
+	open ($OUT, '>:crlf:encoding(shiftjis)', $out);
+}
+
+my @dirstack = ();
+
+do_main($ARGV[0], $ARGV[1]);
+
+close $OUT;
+exit(0);
+
+sub do_main {
+	my($path, $body) = @_;
+
+	print $OUT <<'EOD';
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML><HEAD>
 <meta name="GENERATOR" content="TeraTerm Project">
@@ -24,87 +45,85 @@
 <!-- Sitemap 1.0 -->
 </HEAD><BODY>
 <UL>
-EOD
-
-	push @dirstack, getcwd; 
-	chdir $path; 
-	get_file_paths($body);
-	chdir pop @dirstack; 
-
-	print << 'EOD';
+EOD
+
+	push @dirstack, getcwd;
+	chdir $path;
+	get_file_paths($body);
+	chdir pop @dirstack;
+
+	print $OUT <<'EOD';
 </UL>
-</BODY></HTML>
-EOD
-
-}
-
-
+</BODY></HTML>
+EOD
+
+}
+
+
 sub get_file_paths {
 	my ($top_dir)= @_;
 	my @paths=();
 	my @temp = ();
 
-	#-- \x83J\x83\x8C\x83\x93\x83g\x82̈ꗗ\x82\xF0\x8E擾 --#
+	#-- カレントの一覧を取得 --#
 	opendir(DIR, $top_dir);
 	@temp = readdir(DIR);
 	closedir(DIR);
 	foreach my $path (sort @temp) {
-		next if( $path =~ /^\.{1,2}$/ );                # '.' \x82\xC6 '..' \x82̓X\x83L\x83b\x83v
-		next if( $path =~ /^\.svn$/ );                # '.svn' \x82̓X\x83L\x83b\x83v
-		
-		my $full_path = "$top_dir" . '/' . "$path";
-		next if (-B $full_path);     # \x83o\x83C\x83i\x83\x8A\x83t\x83@\x83C\x83\x8B\x82̓X\x83L\x83b\x83v
-		
-#		print "$full_path\r\n";                     # \x95\\x8E\xA6\x82\xBE\x82\xAF\x82Ȃ\xE7\x91S\x82Ă\xF0\x95\\x8E\xA6\x82\xB5\x82Ă\xAD\x82\xEA\x82\xE9-------
-		push(@paths, $full_path);                       # \x83f\x81[\x83^\x82Ƃ\xB5\x82Ď\xE6\x82荞\x82\xF1\x82ł\xE0\x91O\x82̎\xE6\x82荞\x82݂\xAA\x8F\x89\x8A\x{227B0B3}\x82\xEA\x82\xE9
-		if( -d "$top_dir/$path" ){                      #-- \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82̏ꍇ\x82͎\xA9\x95\xAA\x8E\xA9\x90g\x82\xF0\x8CĂяo\x82\xB7
-			&get_file_paths("$full_path");
-			
-		} else {
-			check_html_file($full_path);
-		
+		next if( $path =~ /^\.{1,2}$/ );                # '.' と '..' はスキップ
+		next if( $path =~ /^\.svn$/ );                # '.svn' はスキップ
+
+		my $full_path = "$top_dir" . '/' . "$path";
+
+#		print "$full_path\r\n";                     # 表示だけなら全てを表示してくれる-------
+		push(@paths, $full_path);                       # データとして取り込んでも前の取り込みが初期化される
+		if( -d "$top_dir/$path" ){                      #-- ディレクトリの場合は自分自身を呼び出す
+			&get_file_paths("$full_path");
+
+		} else {
+			check_html_file($full_path);
+
 		}
 	}
 	return \@paths;
 }
-
-sub check_html_file {
-	my($filename) = shift;
-	local(*FP);
-	my($line, $no, $val);
-	
-	if ($filename !~ /.html$/) {
-		return;
-	}
-	
-	open(FP, "<$filename") || return;
-	$no = 1;
-	while ($line = <FP>) {
-#		$line = chomp($line);
-#		print "$line\n";
-		if ($line =~ /<TITLE>(.+)<\/TITLE>/i) {
-#			print "$filename:$no: $1\n";
-#			print "$line\n";
-			$val = $1;
-			$val =~ s/"/&#34;/g;  # \x93\xF1\x8Fd\x88\xF8\x97p\x95\x84\x82\xF0\x83G\x83X\x83P\x81[\x83v\x82\xB7\x82\xE9
-			write_add_index($filename, $val);
-			last;
-		}
-
-		$no++;
-	}
-	close(FP);
-}
-
-sub write_add_index {
-	my($filename, $title) = @_;
-	
-	print << "EOD";
+
+sub check_html_file {
+	my($filename) = shift;
+	local(*FP);
+	my($line, $no, $val);
+
+	if ($filename !~ /.html$/) {
+		return;
+	}
+
+	open(FP, "<:crlf:encoding(sjis)", "$filename") || return;
+	$no = 1;
+	while ($line = <FP>) {
+#		$line = chomp($line);
+#		print "$line\n";
+		if ($line =~ /<TITLE>(.+)<\/TITLE>/i) {
+#			print "$filename:$no: $1\n";
+#			print "$line\n";
+			$val = $1;
+			$val =~ s/"/&#34;/g;  # 二重引用符をエスケープする
+			write_add_index($filename, $val);
+			last;
+		}
+
+		$no++;
+	}
+	close(FP);
+}
+
+sub write_add_index {
+	my($filename, $title) = @_;
+
+	print $OUT <<"EOD";
 <LI><OBJECT type="text/sitemap">
 <param name="Name" value="$title">
 <param name="Local" value="$filename">
-</OBJECT>
-EOD
-
-}
-
+</OBJECT>
+EOD
+
+}

Added: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake	                        (rev 0)
+++ trunk/doc/makechm.cmake	2022-01-03 07:21:33 UTC (rev 9664)
@@ -0,0 +1,112 @@
+# cmake -P makechm.cmake
+
+if(CMAKE_HOST_WIN32)
+  find_program(
+    PERL perl.exe
+    HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/perl/perl/bin
+    HINTS c:/Strawberry/perl/bin
+    HINTS c:/Perl64/bin
+    HINTS c:/Perl/bin
+    HINTS c:/cygwin/usr/bin
+    HINTS c:/cygwin64/usr/bin
+    )
+  find_program(
+    HHC hhc.exe
+    HINTS "C:/Program Files (x86)/HTML Help Workshop"
+    HINTS "C:/Program Files/HTML Help Workshop"
+    HINTS "$ENV{ProgramFiles}/HTML Help Workshop"
+#    HINTS "$ENV{ProgramFiles\(x86\)}/HTML Help Workshop"
+    )
+  find_program(
+    CHMCMD chmcmd
+    HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/chmcmd/
+    )
+else(CMAKE_HOST_WIN32)
+  find_program(
+    PERL perl
+    )
+  set(HHC "HHC-NOTFOUND")
+  # "apt-get install fp-utils" to install chmcmd
+  find_program(
+    CHMCMD chmcmd2
+    )
+endif(CMAKE_HOST_WIN32)
+
+message("perl=${PERL}")
+message("hhc=${HHC}")
+message("chmcmd=${CHMCMD}")
+
+
+function(ConvertHTML CMD_OPTION)
+  set(CONV_CMD ${PERL} "../installer/2sjis.pl")
+  set(CONV_CMD_OPTION ${CMD_OPTION})
+  separate_arguments(CONV_CMD_OPTION)
+  set(CMD ${CONV_CMD} ${CONV_CMD_OPTION})
+
+  string(JOIN " " CMD_PRINT ${CMD})
+  #message(STATUS ${CMD_PRINT})
+
+  execute_process(
+    COMMAND ${CMD}
+    RESULT_VARIABLE rv
+    )
+  if(NOT "${rv}" STREQUAL "0")
+    message(${CMD_PRINT})
+    message(FATAL_ERROR "rv=${rv}")
+  endif()
+endfunction()
+
+
+if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND"))
+  set(REF_E "en/html/reference")
+  set(REF_J "ja/html/reference")
+  ConvertHTML("-i ../libs/doc_help/Oniguruma-LICENSE.txt -o ${REF_E}/Oniguruma-LICENSE.txt -l unix")
+  ConvertHTML("-i ../libs/doc_help/Oniguruma-LICENSE.txt -o ${REF_J}/Oniguruma-LICENSE.txt -l unix")
+  ConvertHTML("-i ../libs/doc_help/en/RE                 -o ${REF_E}/RE.txt                -l unix -c utf8")
+  ConvertHTML("-i ../libs/doc_help/ja/RE                 -o ${REF_J}/RE.txt                -l unix -c utf8")
+  ConvertHTML("-i ../libs/doc_help/OpenSSL-LICENSE.txt   -o ${REF_E}/OpenSSL-LICENSE.txt   -l unix")
+  ConvertHTML("-i ../libs/doc_help/OpenSSL-LICENSE.txt   -o ${REF_J}/OpenSSL-LICENSE.txt   -l unix")
+  ConvertHTML("-i ../libs/doc_help/PuTTY-LICENSE.txt     -o ${REF_E}/PuTTY-LICENSE.txt     -l crlf")
+  ConvertHTML("-i ../libs/doc_help/PuTTY-LICENSE.txt     -o ${REF_J}/PuTTY-LICENSE.txt     -l crlf")
+  ConvertHTML("-i ../libs/doc_help/SFMT-LICENSE.txt      -o ${REF_E}/SFMT-LICENSE.txt      -l unix")
+  ConvertHTML("-i ../libs/doc_help/SFMT-LICENSE.txt      -o ${REF_J}/SFMT-LICENSE.txt      -l unix")
+  ConvertHTML("-i ../libs/doc_help/argon2-LICENSE.txt    -o ${REF_E}/argon2-LICENSE.txt    -l unix")
+  ConvertHTML("-i ../libs/doc_help/argon2-LICENSE.txt    -o ${REF_J}/argon2-LICENSE.txt    -l unix")
+  ConvertHTML("-i ../libs/doc_help/zlib-LICENSE.txt      -o ${REF_E}/zlib-LICENSE.txt      -l unix --zlib_special")
+  ConvertHTML("-i ../libs/doc_help/zlib-LICENSE.txt      -o ${REF_J}/zlib-LICENSE.txt      -l unix --zlib_special")
+  ConvertHTML("-i ../libs/doc_help/cJSON-LICENSE.txt     -o ${REF_E}/cJSON-LICENSE.txt     -l unix")
+  ConvertHTML("-i ../libs/doc_help/cJSON-LICENSE.txt     -o ${REF_J}/cJSON-LICENSE.txt     -l unix")
+  ConvertHTML("-i ../cygwin/cygterm/COPYING              -o ${REF_E}/CygTerm+-LICENSE.txt  -l unix")
+  ConvertHTML("-i ../cygwin/cygterm/COPYING              -o ${REF_J}/CygTerm+-LICENSE.txt  -l unix")
+  ConvertHTML("-i ${REF_E}/build_with_cmake.md           -o ${REF_E}/build_with_cmake.html")
+  ConvertHTML("-i ${REF_J}/build_with_cmake.md           -o ${REF_J}/build_with_cmake.html")
+  ConvertHTML("-i ${REF_E}/build_library_with_cmake.md   -o ${REF_E}/build_library_with_cmake.html")
+  ConvertHTML("-i ${REF_J}/build_library_with_cmake.md   -o ${REF_J}/build_library_with_cmake.html")
+  ConvertHTML("-i ${REF_E}/keyboard_cfg.md               -o ${REF_E}/keyboard_cfg.html")
+  ConvertHTML("-i ${REF_J}/keyboard_cfg.md               -o ${REF_J}/keyboard_cfg.html")
+  ConvertHTML("-i ${REF_E}/menu_id.md                    -o ${REF_E}/menu_id.html")
+  ConvertHTML("-i ${REF_J}/menu_id.md                    -o ${REF_J}/menu_id.html")
+
+  execute_process(
+    COMMAND ${PERL} htmlhelp_index_make.pl en html -o en/Index.hhk
+    COMMAND ${PERL} htmlhelp_index_make.pl ja html -o ja/Index.hhk
+    )
+endif()
+
+if(NOT("${HHC}" STREQUAL "HHC-NOTFOUND"))
+  execute_process(
+    COMMAND ${HHC} en/teraterm.hhp
+    )
+  execute_process(
+    COMMAND ${HHC} ja/teraterm.hhp
+    )
+elseif(NOT("${CHMCMD}" STREQUAL "CHMCMD-NOTFOUND"))
+  execute_process(
+    COMMAND ${CHMCMD} teraterm.hhp
+    WORKING_DIRECTORY en
+    )
+  execute_process(
+    COMMAND ${CHMCMD} teraterm.hhp
+    WORKING_DIRECTORY ja
+    )
+endif()

Modified: trunk/installer/2sjis.pl
===================================================================
--- trunk/installer/2sjis.pl	2022-01-03 06:53:28 UTC (rev 9663)
+++ trunk/installer/2sjis.pl	2022-01-03 07:21:33 UTC (rev 9664)
@@ -1,40 +1,103 @@
 #!/usr/bin/perl -w
 
-require 5.8.0;
+require 5.24.0;
 use strict;
+use warnings;
 use Encode;
 use utf8;
 use Getopt::Long qw(:config posix_default no_ignore_case gnu_compat);
 
-my($in, $out, $coding, $lf, $result);
+my $PERL = $^X;
 
+sub MarkdownToHTML {
+	my $buf = $_[0];
+
+	my $cmd = "$PERL Markdown_1.0.1/Markdown.pl";
+#	my $cmd = 'cat';
+
+	my $out_file = "MD_TO_HTML_$$" . "_md";
+	my $in_file = "MD_TO_HTML_$$" . "_html";
+
+	my $OUT;
+	open ($OUT, ">:unix:encoding(utf8)", $out_file) or die("error :$! $out_file");
+	print $OUT $buf;
+	close $OUT;
+
+	my $sys = "$cmd < $out_file > $in_file";
+	my $r = system($sys);
+	if ($r != 0) {
+		print "r=$r\n";
+		exit($r);
+		# Can't spawn "cmd.exe" ... -> check $PATH
+	}
+
+	my $IN;
+	open ($IN, "<:crlf:encoding(utf8)", $in_file) or die("error :$! $in_file");
+	$buf = join "", <$IN>;
+	close $IN;
+
+	unlink $in_file;
+	unlink $out_file;
+
+	$buf;
+}
+
+binmode STDOUT, ":utf8";
+
+my($in, $out, $result);
+
 # default setting
-$coding = "shiftjis";
-$lf = "crlf";
+my $coding = "shiftjis";
+my $lf = "crlf";
+my $type = "text";
+my $zlib_special;
 
-$result = GetOptions('in|i=s'     => \$in,
-                     'out|o=s'    => \$out,
-                     'coding|c=s' => \$coding,
-                     'lf|l=s'     => \$lf);
+$result = GetOptions('in|i=s'       => \$in,
+                     'out|o=s'      => \$out,
+                     'coding|c=s'   => \$coding,
+                     'lf|l=s'       => \$lf,
+                     'type|t=s'     => \$type,
+                     'zlib_special' => \$zlib_special);
 
 if (!(defined($in) && defined($out))) {
-	die "Usage: $0 --in file --out file [ --coding input_encoding ] [ --lf line_format ]\n";
+	die "Usage: $0 --in file --out file [ --coding input_encoding ] [ --lf line_format ] [ --type type ]\n";
 }
 
+if ($in =~/\.md/) {
+	$type = "markdown";
+	$coding = "utf8";
+}
+
 my $IN;
 if ($in eq "-") {
 	binmode STDIN, ":$lf:encoding($coding)";
 	$IN = *STDIN;
 } else {
-	open ($IN,  "<:$lf:encoding($coding)",   $in) or die("error :$! $in");
+	open ($IN,  "<:$lf:encoding($coding)", $in) or die("error :$! $in");
 }
-open (OUT, '>:crlf:encoding(shiftjis)', $out);
-while (<$IN>) {
-	print OUT $_;
+if ($zlib_special) {
+	while (<$IN>) {
+		last if $_ =~ /Copyright notice:/;
+	}
 }
-close OUT;
+my $buf = join "", <$IN>;
+$buf =~ s/\x{FEFF}//g; # remove all bom
 close $IN;
 
+if ($type =~ /markdown/i ) {
+	$buf = &MarkdownToHTML($buf);
+}
+
+my $OUT;
+if ($out eq "-") {
+	binmode STDOUT, ":crlf:encoding(shiftjis)";
+	$OUT = *STDOUT;
+} else {
+	open ($OUT, '>:crlf:encoding(shiftjis)', $out);
+}
+print $OUT $buf;
+close $OUT;
+
 if ($in ne "-") {
 	my(@filestat) = stat $in;
 	utime $filestat[8], $filestat[9], $out;

Deleted: trunk/installer/copy-zliblicense.pl
===================================================================
--- trunk/installer/copy-zliblicense.pl	2022-01-03 06:53:28 UTC (rev 9663)
+++ trunk/installer/copy-zliblicense.pl	2022-01-03 07:21:33 UTC (rev 9664)
@@ -1,37 +0,0 @@
-#!/usr/bin/perl -w
-
-require 5.8.0;
-use strict;
-use Encode;
-use utf8;
-use Getopt::Long qw(:config posix_default no_ignore_case gnu_compat);
-
-my($in, $out, $coding, $lf, $result);
-
-# default setting
-$lf = "crlf";
-
-$result = GetOptions('in|i=s'     => \$in,
-                     'out|o=s'    => \$out,
-                     'lf|l=s'     => \$lf);
-
-if (!(defined($in) && defined($out))) {
-	die "Usage: $0 --in file --out file [ --lf line_format ]\n";
-}
-
-open (IN,  "<:$lf",   $in);
-while (<IN>) {
-	last if $_ =~ /Copyright notice:/;
-}
-
-open (OUT, '>:crlf', $out);
-print OUT $_;
-
-while (<IN>) {
-	print OUT $_;
-}
-close OUT;
-close IN;
-
-my(@filestat) = stat $in;
-utime $filestat[8], $filestat[9], $out;

From scmnotify ＠ osdn.net  Mon Jan  3 16:21:44 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 03 Jan 2022 16:21:44 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjVdIDJzamlzLnBsIOOCkiBpbnN0YWxs?=
 =?utf-8?b?ZXIvIOOBi+OCiSBkb2MvIOOBuOenu+WLlQ==?=
Message-ID: <1641194504.743468.32249.nullmailer@users.osdn.me>

Revision: 9665
          https://osdn.net/projects/ttssh2/scm/svn/commits/9665
Author:   zmatsuo
Date:     2022-01-03 16:21:44 +0900 (Mon, 03 Jan 2022)
Log Message:
-----------
2sjis.pl を installer/ から doc/ へ移動

Modified Paths:
--------------
    trunk/doc/convtext.bat
    trunk/doc/makechm.cmake

Added Paths:
-----------
    trunk/doc/2sjis.pl

Removed Paths:
-------------
    trunk/installer/2sjis.pl

-------------- next part --------------
Copied: trunk/doc/2sjis.pl (from rev 9664, trunk/installer/2sjis.pl)
===================================================================
--- trunk/doc/2sjis.pl	                        (rev 0)
+++ trunk/doc/2sjis.pl	2022-01-03 07:21:44 UTC (rev 9665)
@@ -0,0 +1,104 @@
+#!/usr/bin/perl -w
+
+require 5.24.0;
+use strict;
+use warnings;
+use Encode;
+use utf8;
+use Getopt::Long qw(:config posix_default no_ignore_case gnu_compat);
+
+my $PERL = $^X;
+
+sub MarkdownToHTML {
+	my $buf = $_[0];
+
+	my $cmd = "$PERL Markdown_1.0.1/Markdown.pl";
+#	my $cmd = 'cat';
+
+	my $out_file = "MD_TO_HTML_$$" . "_md";
+	my $in_file = "MD_TO_HTML_$$" . "_html";
+
+	my $OUT;
+	open ($OUT, ">:unix:encoding(utf8)", $out_file) or die("error :$! $out_file");
+	print $OUT $buf;
+	close $OUT;
+
+	my $sys = "$cmd < $out_file > $in_file";
+	my $r = system($sys);
+	if ($r != 0) {
+		print "r=$r\n";
+		exit($r);
+		# Can't spawn "cmd.exe" ... -> check $PATH
+	}
+
+	my $IN;
+	open ($IN, "<:crlf:encoding(utf8)", $in_file) or die("error :$! $in_file");
+	$buf = join "", <$IN>;
+	close $IN;
+
+	unlink $in_file;
+	unlink $out_file;
+
+	$buf;
+}
+
+binmode STDOUT, ":utf8";
+
+my($in, $out, $result);
+
+# default setting
+my $coding = "shiftjis";
+my $lf = "crlf";
+my $type = "text";
+my $zlib_special;
+
+$result = GetOptions('in|i=s'       => \$in,
+                     'out|o=s'      => \$out,
+                     'coding|c=s'   => \$coding,
+                     'lf|l=s'       => \$lf,
+                     'type|t=s'     => \$type,
+                     'zlib_special' => \$zlib_special);
+
+if (!(defined($in) && defined($out))) {
+	die "Usage: $0 --in file --out file [ --coding input_encoding ] [ --lf line_format ] [ --type type ]\n";
+}
+
+if ($in =~/\.md/) {
+	$type = "markdown";
+	$coding = "utf8";
+}
+
+my $IN;
+if ($in eq "-") {
+	binmode STDIN, ":$lf:encoding($coding)";
+	$IN = *STDIN;
+} else {
+	open ($IN,  "<:$lf:encoding($coding)", $in) or die("error :$! $in");
+}
+if ($zlib_special) {
+	while (<$IN>) {
+		last if $_ =~ /Copyright notice:/;
+	}
+}
+my $buf = join "", <$IN>;
+$buf =~ s/\x{FEFF}//g; # remove all bom
+close $IN;
+
+if ($type =~ /markdown/i ) {
+	$buf = &MarkdownToHTML($buf);
+}
+
+my $OUT;
+if ($out eq "-") {
+	binmode STDOUT, ":crlf:encoding(shiftjis)";
+	$OUT = *STDOUT;
+} else {
+	open ($OUT, '>:crlf:encoding(shiftjis)', $out);
+}
+print $OUT $buf;
+close $OUT;
+
+if ($in ne "-") {
+	my(@filestat) = stat $in;
+	utime $filestat[8], $filestat[9], $out;
+}

Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2022-01-03 07:21:33 UTC (rev 9664)
+++ trunk/doc/convtext.bat	2022-01-03 07:21:44 UTC (rev 9665)
@@ -1,4 +1,4 @@
-set TOSJIS=perl ..\installer\2sjis.pl
+set TOSJIS=perl 2sjis.pl
 set REF_E=en\html\reference
 set REF_J=ja\html\reference
 %TOSJIS% -i ..\libs\oniguruma\COPYING   -o %REF_E%\Oniguruma-LICENSE.txt -l unix

Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake	2022-01-03 07:21:33 UTC (rev 9664)
+++ trunk/doc/makechm.cmake	2022-01-03 07:21:44 UTC (rev 9665)
@@ -38,7 +38,7 @@
 
 
 function(ConvertHTML CMD_OPTION)
-  set(CONV_CMD ${PERL} "../installer/2sjis.pl")
+  set(CONV_CMD ${PERL} "2sjis.pl")
   set(CONV_CMD_OPTION ${CMD_OPTION})
   separate_arguments(CONV_CMD_OPTION)
   set(CMD ${CONV_CMD} ${CONV_CMD_OPTION})

Deleted: trunk/installer/2sjis.pl
===================================================================
--- trunk/installer/2sjis.pl	2022-01-03 07:21:33 UTC (rev 9664)
+++ trunk/installer/2sjis.pl	2022-01-03 07:21:44 UTC (rev 9665)
@@ -1,104 +0,0 @@
-#!/usr/bin/perl -w
-
-require 5.24.0;
-use strict;
-use warnings;
-use Encode;
-use utf8;
-use Getopt::Long qw(:config posix_default no_ignore_case gnu_compat);
-
-my $PERL = $^X;
-
-sub MarkdownToHTML {
-	my $buf = $_[0];
-
-	my $cmd = "$PERL Markdown_1.0.1/Markdown.pl";
-#	my $cmd = 'cat';
-
-	my $out_file = "MD_TO_HTML_$$" . "_md";
-	my $in_file = "MD_TO_HTML_$$" . "_html";
-
-	my $OUT;
-	open ($OUT, ">:unix:encoding(utf8)", $out_file) or die("error :$! $out_file");
-	print $OUT $buf;
-	close $OUT;
-
-	my $sys = "$cmd < $out_file > $in_file";
-	my $r = system($sys);
-	if ($r != 0) {
-		print "r=$r\n";
-		exit($r);
-		# Can't spawn "cmd.exe" ... -> check $PATH
-	}
-
-	my $IN;
-	open ($IN, "<:crlf:encoding(utf8)", $in_file) or die("error :$! $in_file");
-	$buf = join "", <$IN>;
-	close $IN;
-
-	unlink $in_file;
-	unlink $out_file;
-
-	$buf;
-}
-
-binmode STDOUT, ":utf8";
-
-my($in, $out, $result);
-
-# default setting
-my $coding = "shiftjis";
-my $lf = "crlf";
-my $type = "text";
-my $zlib_special;
-
-$result = GetOptions('in|i=s'       => \$in,
-                     'out|o=s'      => \$out,
-                     'coding|c=s'   => \$coding,
-                     'lf|l=s'       => \$lf,
-                     'type|t=s'     => \$type,
-                     'zlib_special' => \$zlib_special);
-
-if (!(defined($in) && defined($out))) {
-	die "Usage: $0 --in file --out file [ --coding input_encoding ] [ --lf line_format ] [ --type type ]\n";
-}
-
-if ($in =~/\.md/) {
-	$type = "markdown";
-	$coding = "utf8";
-}
-
-my $IN;
-if ($in eq "-") {
-	binmode STDIN, ":$lf:encoding($coding)";
-	$IN = *STDIN;
-} else {
-	open ($IN,  "<:$lf:encoding($coding)", $in) or die("error :$! $in");
-}
-if ($zlib_special) {
-	while (<$IN>) {
-		last if $_ =~ /Copyright notice:/;
-	}
-}
-my $buf = join "", <$IN>;
-$buf =~ s/\x{FEFF}//g; # remove all bom
-close $IN;
-
-if ($type =~ /markdown/i ) {
-	$buf = &MarkdownToHTML($buf);
-}
-
-my $OUT;
-if ($out eq "-") {
-	binmode STDOUT, ":crlf:encoding(shiftjis)";
-	$OUT = *STDOUT;
-} else {
-	open ($OUT, '>:crlf:encoding(shiftjis)', $out);
-}
-print $OUT $buf;
-close $OUT;
-
-if ($in ne "-") {
-	my(@filestat) = stat $in;
-	utime $filestat[8], $filestat[9], $out;
-}

From scmnotify ＠ osdn.net  Mon Jan  3 16:21:54 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 03 Jan 2022 16:21:54 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjZdIGh0bWzjgbjlpInmj5vjgafjgY0=?=
 =?utf-8?b?44Gm44GE44Gq44GL44Gj44Gf44Gu44Gn5pu45byP44KS6Kq/5pW0?=
Message-ID: <1641194514.197008.32607.nullmailer@users.osdn.me>

Revision: 9666
          https://osdn.net/projects/ttssh2/scm/svn/commits/9666
Author:   zmatsuo
Date:     2022-01-03 16:21:53 +0900 (Mon, 03 Jan 2022)
Log Message:
-----------
htmlへ変換できていなかったので書式を調整

Modified Paths:
--------------
    trunk/doc/ja/html/setup/folder.md

-------------- next part --------------
Modified: trunk/doc/ja/html/setup/folder.md
===================================================================
--- trunk/doc/ja/html/setup/folder.md	2022-01-03 07:21:44 UTC (rev 9665)
+++ trunk/doc/ja/html/setup/folder.md	2022-01-03 07:21:53 UTC (rev 9666)
@@ -3,45 +3,47 @@
 ## デフォルトで使用するフォルダ
 
 - 設定ファイル
-  - %APPDATA%\teraterm5
+  - `%APPDATA%\teraterm5`
 - 動作ログ、ダンプ
-  - %LOCALAPPDATA%\teraterm5
+  - `%LOCALAPPDATA%\teraterm5`
 - 実行ファイル(32bitOS+32bitEXEの場合)
-  - %PROGRAMFILES%\teraterm5
+  - `%PROGRAMFILES%\teraterm5`
 
 ### Windows Vista以降 の場合のフォルダ例
 
 - 設定ファイル
-  - C:\Users\[usernane]\AppData\Roaming\teraterm5
+  - `C:\Users\[usernane]\AppData\Roaming\teraterm5`
 - 動作ログ、ダンプ
-  -  C:\Users\[usernane]\AppData\Local\teraterm5
+  - `C:\Users\[usernane]\AppData\Local\teraterm5`
 - 実行ファイル(32bitOS+32bitEXE)
-  - C:\Program Files\teraterm5
+  - `C:\Program Files\teraterm5`
 
 ### Windows 2000, XP の場合のフォルダ例
 
 - 設定ファイル
-  - C:\Documents and Settings\[usernane]\AppData\Roaming\teraterm5
+  - `C:\Documents and Settings\[usernane]\AppData\Roaming\teraterm5`
 - 動作ログ、ダンプ(未定義)
-  - C:\Documents and Settings\[usernane]\Application Data\teraterm5
+  - `C:\Documents and Settings\[usernane]\Application Data\teraterm5`
 - 実行ファイル
-  - C:\Program Files\teraterm5
+  - `C:\Program Files\teraterm5`
 
 ### Windows 2000より以前の場合のフォルダ例
 
 - 設定ファイル
-  - C:\My Documents\teraterm5
+  - `C:\My Documents\teraterm5`
 - 動作ログ、ダンプ(未定義)
-  - C:\My Documents\teraterm5
+  - `C:\My Documents\teraterm5`
 - 実行ファイル
-  - C:\Program Files\teraterm5
+  - `C:\Program Files\teraterm5`
 
 参考
-- https://torutk.hatenablog.jp/entry/20110604/p1
 
+- [https://torutk.hatenablog.jp/entry/20110604/p1](https://torutk.hatenablog.jp/entry/20110604/p1)
+
 ## ファイルを指定した場合
 
 コマンドラインでファイルをフルパスで指定した場合は、それを優先して使用する
+
 - TERATERM.INI
 - KEYBOARD.CNF
 - broadcast.log
@@ -50,6 +52,7 @@
 ## 設定ファイルがない場合
 
 次のように動作する
+
 - 設定ファイルを置くフォルダを作成する
 - ttermpro.exeのフォルダにある設定ファイルを
 - 設定ファイルを置くフォルダにコピーする

From scmnotify ＠ osdn.net  Mon Jan  3 19:31:54 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 03 Jan 2022 19:31:54 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjddIGNtYWtl44OT44Or44OJ5pmCLA==?=
 =?utf-8?b?44OY44Or44OX44OV44Kh44Kk44Or44KS6YCa5bi444OT44Or44OJ44Gn55Sf?=
 =?utf-8?b?5oiQ44GV44KM44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1641205914.574074.29777.nullmailer@users.osdn.me>

Revision: 9667
          https://osdn.net/projects/ttssh2/scm/svn/commits/9667
Author:   zmatsuo
Date:     2022-01-03 19:31:54 +0900 (Mon, 03 Jan 2022)
Log Message:
-----------
cmakeビルド時,ヘルプファイルを通常ビルドで生成されるようにした

- cmakeビルド
- 従来install時にchmを生成していた
- r9664 でinstall時にchmを生成しないようにした

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9664

Modified Paths:
--------------
    trunk/doc/CMakeLists.txt

-------------- next part --------------
Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt	2022-01-03 07:21:53 UTC (rev 9666)
+++ trunk/doc/CMakeLists.txt	2022-01-03 10:31:54 UTC (rev 9667)
@@ -27,7 +27,7 @@
     )
 
   add_custom_target(
-    chm
+    chm ALL
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/en/teraterm.chm
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ja/teratermj.chm
     SOURCES ${SRC_EN}

From scmnotify ＠ osdn.net  Tue Jan  4 00:17:45 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 04 Jan 2022 00:17:45 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjhdIExpbnV444Gn44OY44Or44OX44OV?=
 =?utf-8?b?44Kh44Kk44OrKGNobSnjgpLnlJ/miJA=?=
Message-ID: <1641223065.965426.3752.nullmailer@users.osdn.me>

Revision: 9668
          https://osdn.net/projects/ttssh2/scm/svn/commits/9668
Author:   zmatsuo
Date:     2022-01-04 00:17:45 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
Linuxでヘルプファイル(chm)を生成

- r9664 で chmcmd の指定に誤りがあったので修正
- AppVeyor で chmcmd をインストールするよう修正
- hhc.exe または chmcmd がある場合に chm を生成するよう修正

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9664

Modified Paths:
--------------
    trunk/ci_scripts/appveyor_linux.md
    trunk/ci_scripts/appveyor_linux.yml
    trunk/doc/CMakeLists.txt
    trunk/doc/makechm.cmake

-------------- next part --------------
Modified: trunk/ci_scripts/appveyor_linux.md
===================================================================
--- trunk/ci_scripts/appveyor_linux.md	2022-01-03 10:31:54 UTC (rev 9667)
+++ trunk/ci_scripts/appveyor_linux.md	2022-01-03 15:17:45 UTC (rev 9668)
@@ -21,6 +21,7 @@
 sudo apt-get -y upgrade
 sudo apt-get -y install cmake perl subversion
 sudo apt-get -y install g++-mingw-w64
+sudo apt-get -y install fp-utils
 cd /path/to/teraterm
 ```
 

Modified: trunk/ci_scripts/appveyor_linux.yml
===================================================================
--- trunk/ci_scripts/appveyor_linux.yml	2022-01-03 10:31:54 UTC (rev 9667)
+++ trunk/ci_scripts/appveyor_linux.yml	2022-01-03 15:17:45 UTC (rev 9668)
@@ -3,7 +3,7 @@
 build: off
 
 init:
-  - sudo apt-get -y install cmake perl subversion g++-mingw-w64
+  - sudo apt-get -y install cmake perl subversion g++-mingw-w64 fp-utils
 
 cache:
   - libs

Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt	2022-01-03 10:31:54 UTC (rev 9667)
+++ trunk/doc/CMakeLists.txt	2022-01-03 15:17:45 UTC (rev 9668)
@@ -6,12 +6,20 @@
     HINTS "$ENV{ProgramFiles}/HTML Help Workshop"
     HINTS "$ENV{ProgramFiles\(x86\)}/HTML Help Workshop"
     )
+  find_program(
+    CHMCMD chmcmd
+    HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/chmcmd/
+    )
 else()
   set(HHC "HHC-NOTFOUND")
+  find_program(
+    CHMCMD chmcmd2
+    )
 endif()
 message("hhc=${HHC}")
 
-if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND") AND NOT("${HHC}" STREQUAL "HHC-NOTFOUND"))
+if (NOT("${PERL}" STREQUAL "PERL-NOTFOUND")
+    AND (NOT(("${HHC}" STREQUAL "HHC-NOTFOUND") AND "${CHMCMD}" STREQUAL "CHMCMD-NOTFOUND")))
   file(
     GLOB_RECURSE
     SRC_EN

Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake	2022-01-03 10:31:54 UTC (rev 9667)
+++ trunk/doc/makechm.cmake	2022-01-03 15:17:45 UTC (rev 9668)
@@ -26,9 +26,8 @@
     PERL perl
     )
   set(HHC "HHC-NOTFOUND")
-  # "apt-get install fp-utils" to install chmcmd
   find_program(
-    CHMCMD chmcmd2
+    CHMCMD chmcmd
     )
 endif(CMAKE_HOST_WIN32)
 

From scmnotify ＠ osdn.net  Tue Jan  4 00:17:56 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 04 Jan 2022 00:17:56 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NjldIOioreWumuODleOCoeOCpOODqw==?=
 =?utf-8?b?44Gu44GC44KL44OV44Kp44Or44OA44Gu5Y+W5b6X44GrQVBJ44KS5L2/55So?=
 =?utf-8?b?44GZ44KL44KI44GG5L+u5q2j?=
Message-ID: <1641223076.110095.5187.nullmailer@users.osdn.me>

Revision: 9669
          https://osdn.net/projects/ttssh2/scm/svn/commits/9669
Author:   zmatsuo
Date:     2022-01-04 00:17:55 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
設定ファイルのあるフォルダの取得にAPIを使用するよう修正

- SHGetKnownFolderPath(FOLDERID_RoamingAppData)
- 変更前は APPDATA 環境変数から取得していた

Modified Paths:
--------------
    trunk/cygwin/cygterm/CMakeLists.txt
    trunk/cygwin/cygterm/cygterm.cc

-------------- next part --------------
Modified: trunk/cygwin/cygterm/CMakeLists.txt
===================================================================
--- trunk/cygwin/cygterm/CMakeLists.txt	2022-01-03 15:17:45 UTC (rev 9668)
+++ trunk/cygwin/cygterm/CMakeLists.txt	2022-01-03 15:17:55 UTC (rev 9669)
@@ -50,6 +50,13 @@
   -mwindows
   )
 
+target_link_libraries(
+  ${PACKAGE_NAME}
+  PRIVATE
+  shell32
+  ole32
+  )
+
 install(
   TARGETS ${PACKAGE_NAME}
   DESTINATION .

Modified: trunk/cygwin/cygterm/cygterm.cc
===================================================================
--- trunk/cygwin/cygterm/cygterm.cc	2022-01-03 15:17:45 UTC (rev 9668)
+++ trunk/cygwin/cygterm/cygterm.cc	2022-01-03 15:17:55 UTC (rev 9669)
@@ -51,12 +51,15 @@
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>
-#include <windows.h>
-#include <shlobj.h>
 #include <pwd.h>
 #include <sys/select.h>
 #include <wchar.h>
 
+#include <windows.h>
+#include <shlobj.h>
+#define INITGUID
+#include <knownfolders.h>
+
 // pageant support (ssh-agent proxy)
 //----------------------------------
 #define AGENT_COPYDATA_ID 0x804e50ba
@@ -322,8 +325,6 @@
 // $APPDATA
 char *get_appdata_dir()
 {
-#if 0
-	// link error :-(
     wchar_t *home_pathW;
     SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &home_pathW);
     convert_bsW(home_pathW);
@@ -330,12 +331,6 @@
     char *home_pathU8 = convert_utf8_from_wchar(home_pathW);
     CoTaskMemFree(home_pathW);
     return home_pathU8;
-#endif
-#if 1
-    char *appdata = strdup(getenv("APPDATA"));
-    convert_bs(appdata);
-    return appdata;
-#endif
 }
 
 void get_cfg_filenames(char **cfg_exe_full, char **cfg_appdata_full, char **cfg)

From scmnotify ＠ osdn.net  Tue Jan  4 00:18:05 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 04 Jan 2022 00:18:05 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzBdIGNtYWtlLCBtc3lzMuOBp+ODkw==?=
 =?utf-8?b?44Or44OJ5pmC44GrY2ht44GM5L2c5oiQ44Gn44GN44Gq44GE5aC05ZCI44GM?=
 =?utf-8?b?44GC44KL44Gu44Gn5L+u5q2j?=
Message-ID: <1641223085.255477.7423.nullmailer@users.osdn.me>

Revision: 9670
          https://osdn.net/projects/ttssh2/scm/svn/commits/9670
Author:   zmatsuo
Date:     2022-01-04 00:18:05 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
cmake, msys2でビルド時にchmが作成できない場合があるので修正

- 次の時 chm が生成できない
  - PATH に c:/Windows/system32/ が入っていない
    - msys2時にあり得る
  - msys2以外のperlを利用したとき
- perlスクリプトが system() を使用したとき cmd.exe を実行できない

Modified Paths:
--------------
    trunk/doc/makechm.cmake

-------------- next part --------------
Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake	2022-01-03 15:17:55 UTC (rev 9669)
+++ trunk/doc/makechm.cmake	2022-01-03 15:18:05 UTC (rev 9670)
@@ -1,16 +1,21 @@
 # cmake -P makechm.cmake
 
 if(CMAKE_HOST_WIN32)
+  if("${CMAKE_COMMAND}" MATCHES "msys")
+    # msys
+    find_program(PERL perl.exe)
+  else()
+    find_program(
+      PERL perl.exe
+      HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/perl/perl/bin
+      HINTS c:/Strawberry/perl/bin
+      HINTS c:/Perl64/bin
+      HINTS c:/Perl/bin
+      HINTS c:/cygwin/usr/bin
+      HINTS c:/cygwin64/usr/bin
+      )
+  endif()
   find_program(
-    PERL perl.exe
-    HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/perl/perl/bin
-    HINTS c:/Strawberry/perl/bin
-    HINTS c:/Perl64/bin
-    HINTS c:/Perl/bin
-    HINTS c:/cygwin/usr/bin
-    HINTS c:/cygwin64/usr/bin
-    )
-  find_program(
     HHC hhc.exe
     HINTS "C:/Program Files (x86)/HTML Help Workshop"
     HINTS "C:/Program Files/HTML Help Workshop"

From scmnotify ＠ osdn.net  Tue Jan  4 00:34:10 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 04 Jan 2022 00:34:10 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzFdIFJldmVydCByOTY2OSAi6Kit5a6a?=
 =?utf-8?b?44OV44Kh44Kk44Or44Gu44GC44KL44OV44Kp44Or44OA44Gu5Y+W5b6X44Gr?=
 =?utf-8?b?QVBJ44KS5L2/55So44GZ44KL44KI44GG5L+u5q2jIg==?=
Message-ID: <1641224050.583829.23008.nullmailer@users.osdn.me>

Revision: 9671
          https://osdn.net/projects/ttssh2/scm/svn/commits/9671
Author:   zmatsuo
Date:     2022-01-04 00:34:10 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
Revert r9669 "設定ファイルのあるフォルダの取得にAPIを使用するよう修正"

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9669

Modified Paths:
--------------
    trunk/cygwin/cygterm/CMakeLists.txt
    trunk/cygwin/cygterm/cygterm.cc

-------------- next part --------------
Modified: trunk/cygwin/cygterm/CMakeLists.txt
===================================================================
--- trunk/cygwin/cygterm/CMakeLists.txt	2022-01-03 15:18:05 UTC (rev 9670)
+++ trunk/cygwin/cygterm/CMakeLists.txt	2022-01-03 15:34:10 UTC (rev 9671)
@@ -50,13 +50,6 @@
   -mwindows
   )
 
-target_link_libraries(
-  ${PACKAGE_NAME}
-  PRIVATE
-  shell32
-  ole32
-  )
-
 install(
   TARGETS ${PACKAGE_NAME}
   DESTINATION .

Modified: trunk/cygwin/cygterm/cygterm.cc
===================================================================
--- trunk/cygwin/cygterm/cygterm.cc	2022-01-03 15:18:05 UTC (rev 9670)
+++ trunk/cygwin/cygterm/cygterm.cc	2022-01-03 15:34:10 UTC (rev 9671)
@@ -51,15 +51,12 @@
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <arpa/inet.h>
+#include <windows.h>
+#include <shlobj.h>
 #include <pwd.h>
 #include <sys/select.h>
 #include <wchar.h>
 
-#include <windows.h>
-#include <shlobj.h>
-#define INITGUID
-#include <knownfolders.h>
-
 // pageant support (ssh-agent proxy)
 //----------------------------------
 #define AGENT_COPYDATA_ID 0x804e50ba
@@ -325,6 +322,8 @@
 // $APPDATA
 char *get_appdata_dir()
 {
+#if 0
+	// link error :-(
     wchar_t *home_pathW;
     SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &home_pathW);
     convert_bsW(home_pathW);
@@ -331,6 +330,12 @@
     char *home_pathU8 = convert_utf8_from_wchar(home_pathW);
     CoTaskMemFree(home_pathW);
     return home_pathU8;
+#endif
+#if 1
+    char *appdata = strdup(getenv("APPDATA"));
+    convert_bs(appdata);
+    return appdata;
+#endif
 }
 
 void get_cfg_filenames(char **cfg_exe_full, char **cfg_appdata_full, char **cfg)

From scmnotify ＠ osdn.net  Tue Jan  4 23:08:52 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 04 Jan 2022 23:08:52 +0900
Subject: [ttssh2-commit] [9672] build with cmake
Message-ID: <1641305332.977871.10466.nullmailer@users.osdn.me>

Revision: 9672
          https://osdn.net/projects/ttssh2/scm/svn/commits/9672
Author:   zmatsuo
Date:     2022-01-04 23:08:52 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
build with cmake

Added Paths:
-----------
    branches/libressl_3_4_2_cmake/


From scmnotify ＠ osdn.net  Tue Jan  4 23:10:47 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 04 Jan 2022 23:10:47 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzNdIHI5NjIzIOOBp+WJiumZpOOBlw==?=
 =?utf-8?b?44GfIE9wZW5TU0wgMS4xIOS7pemZjeeUqOOBruOCs+ODvOODieOCkuaIuw==?=
 =?utf-8?b?44GX44CBI2lmZGVmIOOBp+S9v+OBhOWIhuOBkeOCiw==?=
Message-ID: <1641305447.162825.16442.nullmailer@users.osdn.me>

Revision: 9673
          https://osdn.net/projects/ttssh2/scm/svn/commits/9673
Author:   zmatsuo
Date:     2022-01-04 23:10:46 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
r9623 で削除した OpenSSL 1.1 以降用のコードを戻し、#ifdef で使い分ける

- r9658

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9623
    https://osdn.net/projects/ttssh2/scm/svn/commits/9658

Modified Paths:
--------------
    branches/libressl_3_4_2_cmake/ttssh2/ttxssh/cipher-3des1.c

-------------- next part --------------
Modified: branches/libressl_3_4_2_cmake/ttssh2/ttxssh/cipher-3des1.c
===================================================================
--- branches/libressl_3_4_2_cmake/ttssh2/ttxssh/cipher-3des1.c	2022-01-04 14:08:52 UTC (rev 9672)
+++ branches/libressl_3_4_2_cmake/ttssh2/ttxssh/cipher-3des1.c	2022-01-04 14:10:46 UTC (rev 9673)
@@ -125,6 +125,22 @@
 
 const EVP_CIPHER *evp_ssh1_3des(void)
 {
+#ifndef LIBRESSL_VERSION_NUMBER
+	static EVP_CIPHER *p = NULL;
+
+	if (p == NULL) {
+		p = EVP_CIPHER_meth_new(NID_undef, /*block_size*/8, /*key_len*/16);
+		/*** TODO: OPENSSL1.1.1 ERROR CHECK(ticket#39335\x82ŏ\x88\x92u\x97\\x92\xE8) ***/
+	}
+	if (p) {
+		EVP_CIPHER_meth_set_iv_length(p, 0);
+		EVP_CIPHER_meth_set_init(p, ssh1_3des_init);
+		EVP_CIPHER_meth_set_cleanup(p, ssh1_3des_cleanup);
+		EVP_CIPHER_meth_set_do_cipher(p, ssh1_3des_cbc);
+		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH);
+	}
+	return (p);
+#else
 	static EVP_CIPHER ssh1_3des;
 
 	memset(&ssh1_3des, 0, sizeof(EVP_CIPHER));
@@ -137,4 +153,5 @@
 	ssh1_3des.do_cipher = ssh1_3des_cbc;
 	ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH;
 	return (&ssh1_3des);
+#endif
 }

From scmnotify ＠ osdn.net  Tue Jan  4 23:10:57 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 04 Jan 2022 23:10:57 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzRdIGNtYWtl44OT44Or44OJLCBMaWJy?=
 =?utf-8?b?ZVNTTCDjgpLkvb/jgYjjgovjgojjgYbkv67mraM=?=
Message-ID: <1641305457.032383.16542.nullmailer@users.osdn.me>

Revision: 9674
          https://osdn.net/projects/ttssh2/scm/svn/commits/9674
Author:   zmatsuo
Date:     2022-01-04 23:10:56 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
cmakeビルド, LibreSSL を使えるよう修正

- "-DTTXSSH_LIBRESSL=OFF" とすると、OpenSSL1.1.1 でビルドする
  - デフォルトでは ON、LibreSSL を使ってビルド
- LibreSSL を lib/ でビルド
  - buildlibressl.cmake
- OpenSSL3 を lib/ でビルド
  - buildopenssl3.cmake

Modified Paths:
--------------
    branches/libressl_3_4_2_cmake/libs/buildall.cmake
    branches/libressl_3_4_2_cmake/ttssh2/ttxssh/CMakeLists.txt

Added Paths:
-----------
    branches/libressl_3_4_2_cmake/libs/buildlibressl.cmake
    branches/libressl_3_4_2_cmake/libs/buildopenssl3.cmake
    branches/libressl_3_4_2_cmake/libs/lib_libressl.cmake

-------------- next part --------------
Modified: branches/libressl_3_4_2_cmake/libs/buildall.cmake
===================================================================
--- branches/libressl_3_4_2_cmake/libs/buildall.cmake	2022-01-04 14:10:46 UTC (rev 9673)
+++ branches/libressl_3_4_2_cmake/libs/buildall.cmake	2022-01-04 14:10:56 UTC (rev 9674)
@@ -55,5 +55,9 @@
 execute_process(
   COMMAND ${CMAKE_COMMAND} -P argon2.cmake
   )
+message("libressl")
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P buildlibressl.cmake
+  )
 
 message("done buildall.cmake")

Added: branches/libressl_3_4_2_cmake/libs/buildlibressl.cmake
===================================================================
--- branches/libressl_3_4_2_cmake/libs/buildlibressl.cmake	                        (rev 0)
+++ branches/libressl_3_4_2_cmake/libs/buildlibressl.cmake	2022-01-04 14:10:56 UTC (rev 9674)
@@ -0,0 +1,134 @@
+# for libreSSL
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildlibressl.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildlibressl.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P buildlibressl.cmake
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "libressl-3.4.2")
+set(SRC_ARC "libressl-3.4.2.tar.gz")
+set(SRC_URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.2.tar.gz")
+set(SRC_ARC_HASH_SHA256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/libressl")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/libressl/src")
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/libressl_${TOOLSET}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/libressl/build_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+  set(BUILD_DIR "${BUILD_DIR}_x64")
+endif()
+
+#message("BUILD_DIR=${BUILD_DIR}")
+#message("INSTALL_DIR=${INSTALL_DIR}")
+
+########################################
+
+# Configure + Generate
+function(cmake_generate GENERATOR SRC_DIR WORKING_DIR OPTIONS)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} ${SRC_DIR} .. -G "${GENERATOR}" ${OPTIONS}
+    WORKING_DIRECTORY "${BUILD_DIR}"
+    ENCODING AUTO
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+endfunction()
+
+# build + install
+function(cmake_build WORKING_DIR OPTIONS BUILD_TOOL_OPTIONS)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} --build . ${OPTIONS} --target install -- ${BUILD_TOOL_OPTIONS}
+    WORKING_DIRECTORY "${BUILD_DIR}"
+    ENCODING AUTO
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+endfunction()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README.md)
+
+  file(DOWNLOAD
+    ${SRC_URL}
+    ${DOWN_DIR}/${SRC_ARC}
+    EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+    SHOW_PROGRESS
+    )
+
+  file(MAKE_DIRECTORY ${EXTRACT_DIR})
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+  file(COPY
+    ${SRC_DIR}/COPYING
+    DESTINATION ${CMAKE_CURRENT_LIST_DIR}/doc_help
+    )
+  file(RENAME
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/COPYING
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/LibreSSL-LICENSE.txt)
+endif()
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+    # multi-configuration
+
+    unset(GENERATE_OPTIONS)
+    list(APPEND GENERATE_OPTIONS -A ${ARCHITECTURE})
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_DEBUG_POSTFIX=d")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}")
+    list(APPEND GENERATE_OPTIONS "-DLIBRESSL_TESTS=off")
+    if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+      list(APPEND GENERATE_OPTIONS "-DMSVC=on")
+      list(APPEND GENERATE_OPTIONS "-DUSE_STATIC_MSVC_RUNTIMES=on")
+    endif()
+
+    cmake_generate("${CMAKE_GENERATOR}" "${SRC_DIR}" "${BUILD_DIR}" "${GENERATE_OPTIONS}")
+
+    unset(BUILD_OPTIONS)
+    list(APPEND BUILD_OPTIONS "--config Debug")
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "")
+
+    unset(BUILD_OPTIONS)
+    list(APPEND BUILD_OPTIONS "--config Release")
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "")
+
+    return()
+  else()
+    # single-configuration
+    unset(GENERATE_OPTIONS)
+    if(CMAKE_HOST_UNIX)
+      list(APPEND GENERATE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_LIST_DIR}/../mingw.toolchain.cmake")
+    endif(CMAKE_HOST_UNIX)
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_BUILD_TYPE=Release")
+    if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+      list(APPEND GENERATE_OPTIONS "-DMSVC=on")
+      list(APPEND GENERATE_OPTIONS "-DUSE_STATIC_MSVC_RUNTIMES=on")
+    endif()
+
+    cmake_generate("${CMAKE_GENERATOR}" "${SRC_DIR}" "${BUILD_DIR}" "${GENERATE_OPTIONS}")
+
+    if(${CMAKE_GENERATOR} MATCHES "Unix Makefiles")
+      set(APPEND BUILD_TOOL_OPTIONS "-j")
+    endif()
+
+    unset(BUILD_OPTIONS)
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "${BUILD_TOOL_OPTIONS}")
+
+  endif()
+endif()

Added: branches/libressl_3_4_2_cmake/libs/buildopenssl3.cmake
===================================================================
--- branches/libressl_3_4_2_cmake/libs/buildopenssl3.cmake	                        (rev 0)
+++ branches/libressl_3_4_2_cmake/libs/buildopenssl3.cmake	2022-01-04 14:10:56 UTC (rev 9674)
@@ -0,0 +1,340 @@
+# for OpenSSL 1.1.1
+# cmake -DCMAKE_GENERATOR="Visual Studio 17 2022" -DARCHITECTURE=Win32 -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P buildopenssl3.cmake
+
+####
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+    # multi-configuration
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Release
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -DARCHITECTURE=${ARCHITECTURE}
+      -P buildopenssl3.cmake
+      )
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Debug
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -DARCHITECTURE=${ARCHITECTURE}
+      -P buildopenssl3.cmake
+      )
+    return()
+  elseif("$ENV{MSYSTEM}" MATCHES "MINGW32")
+    # mingw on msys2
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+    # mingw
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
+    # VS nmake
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  else()
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  endif()
+endif()
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "openssl-3.0.1")
+set(SRC_ARC "openssl-3.0.1.tar.gz")
+set(SRC_URL "https://www.openssl.org/source/openssl-3.0.1.tar.gz")
+set(SRC_ARC_HASH_SHA256 c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/openssl")
+
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/openssl3/src_${TOOLSET}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/openssl3_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+  set(EXTRACT_DIR "${EXTRACT_DIR}_x64")
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+endif()
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Debug"))
+  set(EXTRACT_DIR "${EXTRACT_DIR}_debug")
+  set(INSTALL_DIR "${INSTALL_DIR}_debug")
+endif()
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+
+########################################
+
+file(DOWNLOAD
+  ${SRC_URL}
+  ${DOWN_DIR}/${SRC_ARC}
+  EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+  SHOW_PROGRESS
+  )
+
+########################################
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+  find_program(
+    PERL perl
+    )
+elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+  # Active/Strawberry Perl
+  find_program(
+    PERL perl.exe
+    HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/perl/perl/bin
+    HINTS c:/Perl64/bin
+    HINTS c:/Perl/bin
+    HINTS c:/Strawberry/perl/bin
+    )
+  if("${PERL}" MATCHES "[Cc]ygwin")
+    message(FATAL_ERROR "cygwin perl! ${PERL}")
+  endif()
+else()
+  # MinGW
+  find_program(
+    PERL perl
+    HINTS C:/msys64/usr/bin
+    )
+endif()
+
+if(${PERL} STREQUAL "PERL-NOTFOUND")
+  message(FATAL_ERROR "perl not found")
+endif()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README)
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+    )
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+  file(COPY
+    ${SRC_DIR}/LICENSE.txt
+    DESTINATION ${CMAKE_CURRENT_LIST_DIR}/doc_help
+    )
+  file(RENAME
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/LICENSE.txt
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/OpenSSL3-LICENSE.txt)
+
+endif()
+
+########################################
+
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") OR
+    (${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
+  ######################################## VS
+  if(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 14 2015")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 12 2013")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 11 2012")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 10 2010")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
+      )
+  else()
+    message(FATAL_ERROR "CMAKE_GENERATOR ${CMAKE_GENERATOR} not supported")
+  endif()
+  if(VCVARS32-NOTFOUND OR (${VCVARS32} STREQUAL "VCVARS32-NOTFOUND"))
+    message(FATAL_ERROR "vcvars32.bat not found")
+  endif()
+
+  if((${CMAKE_GENERATOR} MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64"))
+    set(CONFIG_TARGET "VC-WIN64A")
+  else()
+    set(CONFIG_TARGET "VC-WIN32")
+  endif()
+  if(("${CMAKE_BUILD_TYPE}" STREQUAL "Release") OR ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Release"))
+  else()
+    set(CONFIG_TARGET "debug-${CONFIG_TARGET}")
+  endif()
+
+  file(WRITE "${SRC_DIR}/build_cmake.bat"
+    "cd /d %~dp0\n"
+    "setlocal\n"
+    )
+  file(TO_NATIVE_PATH ${PERL} PERL_N)
+  file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+  file(TO_NATIVE_PATH ${VCVARS32} VCVARS32_N)
+  string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
+  file(APPEND "${SRC_DIR}/build_cmake.bat"
+    "set PATH=${PERL_N_PATH};c:\\windows;c:\\windows\\system32\n"
+    )
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    ## Visual Studio 2005 特別処理
+    # include,libパスの設定
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
+      "set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
+      "set LIB=%SDK%\\lib;%LIB%\n"
+      )
+  endif()
+  if((${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019") OR ${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
+    if("${ARCHITECTURE}" MATCHES "x64")
+      file(APPEND "${SRC_DIR}/build_cmake.bat"
+        "call \"${VCVARS32_N}\" amd64\n"
+        )
+    else()
+      file(APPEND "${SRC_DIR}/build_cmake.bat"
+        "call \"${VCVARS32_N}\" x86\n"
+        )
+    endif()
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017 Win64")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" amd64\n"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" x86\n"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\"\n"
+      )
+  endif()
+  file(APPEND "${SRC_DIR}/build_cmake.bat"
+    "perl Configure no-asm no-async no-shared no-capieng no-dso no-engine ${CONFIG_TARGET} -D_WIN32_WINNT=0x0501 --prefix=${INSTALL_DIR_N} --openssldir=${INSTALL_DIR_N}\\SSL\n"
+    "nmake -f makefile install\n"
+    )
+  set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
+  file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
+  execute_process(
+    COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+else()
+  ######################################## MinGW
+  execute_process(
+    COMMAND "uname" -s
+    OUTPUT_VARIABLE ov)
+  string(REGEX MATCH "[A-Za-z0-9]+" UNAME_S ${ov})
+  if("${UNAME_S}" STREQUAL "CYGWIN")
+    find_program(
+      MAKE make.exe
+      HINTS c:/cygwin/usr/bin
+      HINTS c:/cygwin64/usr/bin
+      )
+  elseif(("${UNAME_S}" STREQUAL "MINGW32") OR ("${UNAME_S}" STREQUAL "MINGW64") OR ("${CMAKE_COMMAND}" MATCHES "mingw"))
+    find_program(
+      MAKE make
+      )
+  elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+    find_program(
+      MAKE make
+      )
+  else()
+    message(FATAL_ERROR "unsported")
+  endif()
+  set(ENV{PATH} "/usr/bin;/bin")
+  if(("${UNAME_S}" STREQUAL "MINGW32") OR ("${CMAKE_COMMAND}" MATCHES "mingw32"))
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw32/bin:/usr/local/bin:/usr/bin:/bin")
+    set(CONFIG_NAME "mingw")
+  elseif(("${UNAME_S}" STREQUAL "MINGW64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw64/bin:/usr/local/bin:/usr/bin:/bin")
+    set(CONFIG_NAME "mingw64")
+  else()
+    include(${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake)
+    set(ENV{CC} ${CMAKE_C_COMPILER})
+    set(ENV{AR} "i686-w64-mingw32-ar")
+    set(ENV{RANLIB} "i686-w64-mingw32-ranlib")
+    set(ENV{RC} "i686-w64-mingw32-windres")
+    set(PATH "/usr/bin:/bin")
+    set(CONFIG_NAME "mingw")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=/usr/bin:/bin" ${PERL} ./Configure no-asm no-async no-shared no-capieng -no-dso -no-engine ${CONFIG_NAME} -D_WIN32_WINNT=0x0501 --prefix=${INSTALL_DIR} --openssldir=${INSTALL_DIR}/SSL
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake configure fail ${rv}")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} CC=${CMAKE_C_COMPILER}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} install
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+endif()

Added: branches/libressl_3_4_2_cmake/libs/lib_libressl.cmake
===================================================================
--- branches/libressl_3_4_2_cmake/libs/lib_libressl.cmake	                        (rev 0)
+++ branches/libressl_3_4_2_cmake/libs/lib_libressl.cmake	2022-01-04 14:10:56 UTC (rev 9674)
@@ -0,0 +1,27 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(REBRESSL_ROOT ${CMAKE_CURRENT_LIST_DIR}/libressl_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(REBRESSL_ROOT "${REBRESSL_ROOT}_x64")
+endif()
+
+if(MINGW)
+  set(LIBRESSL_INCLUDE_DIRS
+    ${REBRESSL_ROOT}/include
+    )
+
+  set(LIBRESSL_LIB
+    ${REBRESSL_ROOT}/lib/libcrypto-47.a
+    bcrypt
+  )
+else()
+  set(LIBRESSL_INCLUDE_DIRS
+    ${REBRESSL_ROOT}/include
+    )
+
+  set(LIBRESSL_LIB
+    debug ${REBRESSL_ROOT}/lib/crypto-47d.lib
+    optimized ${REBRESSL_ROOT}/lib/crypto-47d.lib
+    )
+endif()

Modified: branches/libressl_3_4_2_cmake/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/libressl_3_4_2_cmake/ttssh2/ttxssh/CMakeLists.txt	2022-01-04 14:10:46 UTC (rev 9673)
+++ branches/libressl_3_4_2_cmake/ttssh2/ttxssh/CMakeLists.txt	2022-01-04 14:10:56 UTC (rev 9674)
@@ -1,9 +1,15 @@
 set(PACKAGE_NAME "ttxssh")
 
+option(TTXSSH_LIBRESSL "User LibreSSL" on)
+
 project(${PACKAGE_NAME})
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+if(TTXSSH_LIBRESSL)
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_libressl.cmake)
+else()
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+endif()
 
 add_library(
   ${PACKAGE_NAME} SHARED
@@ -156,10 +162,23 @@
   ../../teraterm/common
   ../matcher
   ../putty
-  ${OPENSSL_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIRS}
-)
+  )
+if(TTXSSH_LIBRESSL)
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${LIBRESSL_INCLUDE_DIRS}
+    )
+else()
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL_INCLUDE_DIRS}
+    )
+endif()
 
+
 set_target_properties(
   ${PACKAGE_NAME}
   PROPERTIES
@@ -189,9 +208,24 @@
   ttpcmn
   argon2
   ${ZLIB_LIB}
-  ${OPENSSL_LIB}
   )
 
+if(TTXSSH_LIBRESSL)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${LIBRESSL_LIB}
+    bcrypt.lib
+    )
+else()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL_LIB}
+    crypt32.lib		# TODO このlibを使用しないパッチを適応したら削除すること
+    )
+endif()
+
 if(SUPPORT_OLD_WINDOWS)
   target_link_libraries(
     ${PACKAGE_NAME}
@@ -207,8 +241,6 @@
   gdi32
   comdlg32
   comctl32
-  # OpenSSL が使用
-  crypt32.lib		# TODO このlibを使用しないパッチを適応したら削除すること
   )
 
 ### create puttyversion.h

From scmnotify ＠ osdn.net  Tue Jan  4 23:11:06 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Tue, 04 Jan 2022 23:11:06 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzVdIOOCuOOCp+ODjeODrOODvOODiA==?=
 =?utf-8?b?5pmC44Gr5L2/55So44GZ44KLcnVudGltZeOCkuaMh+WumuOBmeOCi+OCiA==?=
 =?utf-8?b?44GG5L+u5q2j?=
Message-ID: <1641305466.029366.17874.nullmailer@users.osdn.me>

Revision: 9675
          https://osdn.net/projects/ttssh2/scm/svn/commits/9675
Author:   zmatsuo
Date:     2022-01-04 23:11:05 +0900 (Tue, 04 Jan 2022)
Log Message:
-----------
ジェネレート時に使用するruntimeを指定するよう修正

- perl, 2回目のcmakeが不要となった

Modified Paths:
--------------
    branches/libressl_3_4_2_cmake/libs/buildlibressl.bat

-------------- next part --------------
Modified: branches/libressl_3_4_2_cmake/libs/buildlibressl.bat
===================================================================
--- branches/libressl_3_4_2_cmake/libs/buildlibressl.bat	2022-01-04 14:10:56 UTC (rev 9674)
+++ branches/libressl_3_4_2_cmake/libs/buildlibressl.bat	2022-01-04 14:11:05 UTC (rev 9675)
@@ -45,12 +45,11 @@
 
 :vsend
 
+set CMAKE=cmake
+rem set CMAKE="C:\Program Files\CMake\bin\cmake"
+rem set CMAKE="%VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake"
 
-cmake %CMAKE_PARAMETER%
-perl -e "open(IN,'CMakeCache.txt');while(<IN>){s|=/MD|=/MT|;print $_;}close(IN);" > CMakeCache.txt.tmp
-move /y CMakeCache.txt.tmp CMakeCache.txt
-rem \x95ύX\x82\xB5\x82\xBD CMakeCache.txt \x82Ɋ\xEE\x82Â\xA2\x82Đ\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɍēx\x8E\xC0\x8Ds
-cmake %CMAKE_PARAMETER%
+%CMAKE% -DMSVC=on -DUSE_STATIC_MSVC_RUNTIMES=on %CMAKE_PARAMETER%
 
 devenv /build Debug LibreSSL.sln /project crypto /projectconfig Debug
 

From scmnotify ＠ osdn.net  Wed Jan  5 00:39:50 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 05 Jan 2022 00:39:50 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzZdIHI5NjIzIOOBp+WJiumZpOOBlw==?=
 =?utf-8?b?44GfIE9wZW5TU0wgMS4xIOS7pemZjeeUqOOBruOCs+ODvOODieOCkuaIuw==?=
 =?utf-8?b?44GX44CBI2lmZGVmIOOBp+S9v+OBhOWIhuOBkeOCiw==?=
Message-ID: <1641310790.224835.32041.nullmailer@users.osdn.me>

Revision: 9676
          https://osdn.net/projects/ttssh2/scm/svn/commits/9676
Author:   nmaya
Date:     2022-01-05 00:39:49 +0900 (Wed, 05 Jan 2022)
Log Message:
-----------
r9623 で削除した OpenSSL 1.1 以降用のコードを戻し、#ifdef で使い分ける

r9658 の不足分

merge from libressl_3_4_2_cmake:
r9673

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9623
    https://osdn.net/projects/ttssh2/scm/svn/commits/9658
    https://osdn.net/projects/ttssh2/scm/svn/commits/9673

Modified Paths:
--------------
    branches/libressl_3_4_2/ttssh2/ttxssh/cipher-3des1.c

Property Changed:
----------------
    branches/libressl_3_4_2/
    branches/libressl_3_4_2/TTProxy/
    branches/libressl_3_4_2/TTXKanjiMenu/
    branches/libressl_3_4_2/TTXSamples/
    branches/libressl_3_4_2/cygterm/
    branches/libressl_3_4_2/teraterm/
    branches/libressl_3_4_2/ttpmenu/

-------------- next part --------------
Index: branches/libressl_3_4_2
===================================================================
--- branches/libressl_3_4_2	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,7 ##
 /branches/4-stable:8924,9256-9257
 /branches/drag_and_drop:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr:7825-7827
+/branches/libressl_3_4_2_cmake:9673
 /branches/move_code_script:9026-9185
 /branches/openssl_1_1_1_v2:7785-7786,7788-7808,7811-7812,7814-7815,7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7873-7877,7880-7881,7884-7888,7890-7892,7894-7895,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980,8019,8208,8256
 /branches/openssl_1_1_1_v3:8258,8264-8265
Index: branches/libressl_3_4_2/TTProxy
===================================================================
--- branches/libressl_3_4_2/TTProxy	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/TTProxy	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,5 ##
 /branches/4-stable/TTProxy:9256-9257
+/branches/libressl_3_4_2_cmake/TTProxy:9673
 /branches/openssl_1_1_1_v2/TTProxy:7785-7786,7788-7808,7861-7863,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980
 /branches/openssl_1_1_1_v3/TTProxy:8258
 /branches/ssh_chacha20poly1305/TTProxy:9209-9212,9217,9229,9248-9253
Index: branches/libressl_3_4_2/TTXKanjiMenu
===================================================================
--- branches/libressl_3_4_2/TTXKanjiMenu	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/TTXKanjiMenu	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/TTXKanjiMenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/TTXKanjiMenu:9256-9257
+/branches/libressl_3_4_2_cmake/TTXKanjiMenu:9673
 /branches/ssh_chacha20poly1305/TTXKanjiMenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXKanjiMenu:6194-6285
\ No newline at end of property
Index: branches/libressl_3_4_2/TTXSamples
===================================================================
--- branches/libressl_3_4_2/TTXSamples	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/TTXSamples	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/TTXSamples
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/TTXSamples:9256-9257
+/branches/libressl_3_4_2_cmake/TTXSamples:9673
 /branches/ssh_chacha20poly1305/TTXSamples:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXSamples:6194-6285
\ No newline at end of property
Index: branches/libressl_3_4_2/cygterm
===================================================================
--- branches/libressl_3_4_2/cygterm	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/cygterm	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/cygterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/cygterm:9256-9257
+/branches/libressl_3_4_2_cmake/cygterm:9673
 /branches/openssl_1_1_1_v3/cygterm:8284
 /branches/ssh_chacha20poly1305/cygterm:9209-9212,9217,9229,9248-9253
\ No newline at end of property
Index: branches/libressl_3_4_2/teraterm
===================================================================
--- branches/libressl_3_4_2/teraterm	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/teraterm	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,7 ##
 /branches/4-stable/teraterm:8924,9256-9257
 /branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr/teraterm:7825-7827
+/branches/libressl_3_4_2_cmake/teraterm:9673
 /branches/move_code_script/teraterm:9026-9185
 /branches/openssl_1_1_1_v2/teraterm:7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7979-7980
 /branches/openssl_1_1_1_v3/teraterm:8258
Index: branches/libressl_3_4_2/ttpmenu
===================================================================
--- branches/libressl_3_4_2/ttpmenu	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/ttpmenu	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/ttpmenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/ttpmenu:9256-9257
+/branches/libressl_3_4_2_cmake/ttpmenu:9673
 /branches/ssh_chacha20poly1305/ttpmenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/ttpmenu:6194-6285
\ No newline at end of property
Modified: branches/libressl_3_4_2/ttssh2/ttxssh/cipher-3des1.c
===================================================================
--- branches/libressl_3_4_2/ttssh2/ttxssh/cipher-3des1.c	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/ttssh2/ttxssh/cipher-3des1.c	2022-01-04 15:39:49 UTC (rev 9676)
@@ -125,6 +125,22 @@
 
 const EVP_CIPHER *evp_ssh1_3des(void)
 {
+#ifndef LIBRESSL_VERSION_NUMBER
+	static EVP_CIPHER *p = NULL;
+
+	if (p == NULL) {
+		p = EVP_CIPHER_meth_new(NID_undef, /*block_size*/8, /*key_len*/16);
+		/*** TODO: OPENSSL1.1.1 ERROR CHECK(ticket#39335\x82ŏ\x88\x92u\x97\\x92\xE8) ***/
+	}
+	if (p) {
+		EVP_CIPHER_meth_set_iv_length(p, 0);
+		EVP_CIPHER_meth_set_init(p, ssh1_3des_init);
+		EVP_CIPHER_meth_set_cleanup(p, ssh1_3des_cleanup);
+		EVP_CIPHER_meth_set_do_cipher(p, ssh1_3des_cbc);
+		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH);
+	}
+	return (p);
+#else
 	static EVP_CIPHER ssh1_3des;
 
 	memset(&ssh1_3des, 0, sizeof(EVP_CIPHER));
@@ -137,4 +153,5 @@
 	ssh1_3des.do_cipher = ssh1_3des_cbc;
 	ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH;
 	return (&ssh1_3des);
+#endif
 }

From scmnotify ＠ osdn.net  Wed Jan  5 00:41:16 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 05 Jan 2022 00:41:16 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzddIOeUn+aIkOOBleOCjOOCiyBMaWJy?=
 =?utf-8?b?ZVNTTCDjga7jg6njg7Pjgr/jgqTjg6DjgpLjg57jg6vjg4Hjgrnjg6zjg4M=?=
 =?utf-8?b?44OJ44Gr44GZ44KL5pa55rOV44KS44CBQ01ha2VDYWNoZS50eHQg44KS5pu4?=
 =?utf-8?b?44GN5o+b44GI44KL44Gu44Gn44Gv44Gq44GP44CBY21ha2Ug44Gr5byV5pWw?=
 =?utf-8?b?44KS5oyH5a6a44GZ44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1641310876.540705.4991.nullmailer@users.osdn.me>

Revision: 9677
          https://osdn.net/projects/ttssh2/scm/svn/commits/9677
Author:   nmaya
Date:     2022-01-05 00:41:16 +0900 (Wed, 05 Jan 2022)
Log Message:
-----------
生成される LibreSSL のランタイムをマルチスレッドにする方法を、CMakeCache.txt を書き換えるのではなく、cmake に引数を指定するようにした

merge from libressl_3_4_2_cmake:
r9675

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9675

Modified Paths:
--------------
    branches/libressl_3_4_2/libs/buildlibressl.bat

Property Changed:
----------------
    branches/libressl_3_4_2/
    branches/libressl_3_4_2/TTProxy/
    branches/libressl_3_4_2/TTXKanjiMenu/
    branches/libressl_3_4_2/TTXSamples/
    branches/libressl_3_4_2/cygterm/
    branches/libressl_3_4_2/teraterm/
    branches/libressl_3_4_2/ttpmenu/

-------------- next part --------------
Index: branches/libressl_3_4_2
===================================================================
--- branches/libressl_3_4_2	2022-01-04 15:39:49 UTC (rev 9676)
+++ branches/libressl_3_4_2	2022-01-04 15:41:16 UTC (rev 9677)

Property changes on: branches/libressl_3_4_2
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/4-stable:8924,9256-9257
 /branches/drag_and_drop:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr:7825-7827
-/branches/libressl_3_4_2_cmake:9673
+/branches/libressl_3_4_2_cmake:9673,9675
 /branches/move_code_script:9026-9185
 /branches/openssl_1_1_1_v2:7785-7786,7788-7808,7811-7812,7814-7815,7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7873-7877,7880-7881,7884-7888,7890-7892,7894-7895,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980,8019,8208,8256
 /branches/openssl_1_1_1_v3:8258,8264-8265
Index: branches/libressl_3_4_2/TTProxy
===================================================================
--- branches/libressl_3_4_2/TTProxy	2022-01-04 15:39:49 UTC (rev 9676)
+++ branches/libressl_3_4_2/TTProxy	2022-01-04 15:41:16 UTC (rev 9677)

Property changes on: branches/libressl_3_4_2/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
 /branches/4-stable/TTProxy:9256-9257
-/branches/libressl_3_4_2_cmake/TTProxy:9673
+/branches/libressl_3_4_2_cmake/TTProxy:9673,9675
 /branches/openssl_1_1_1_v2/TTProxy:7785-7786,7788-7808,7861-7863,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980
 /branches/openssl_1_1_1_v3/TTProxy:8258
 /branches/ssh_chacha20poly1305/TTProxy:9209-9212,9217,9229,9248-9253
Index: branches/libressl_3_4_2/TTXKanjiMenu
===================================================================
--- branches/libressl_3_4_2/TTXKanjiMenu	2022-01-04 15:39:49 UTC (rev 9676)
+++ branches/libressl_3_4_2/TTXKanjiMenu	2022-01-04 15:41:16 UTC (rev 9677)

Property changes on: branches/libressl_3_4_2/TTXKanjiMenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/4-stable/TTXKanjiMenu:9256-9257
-/branches/libressl_3_4_2_cmake/TTXKanjiMenu:9673
+/branches/libressl_3_4_2_cmake/TTXKanjiMenu:9673,9675
 /branches/ssh_chacha20poly1305/TTXKanjiMenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXKanjiMenu:6194-6285
\ No newline at end of property
Index: branches/libressl_3_4_2/TTXSamples
===================================================================
--- branches/libressl_3_4_2/TTXSamples	2022-01-04 15:39:49 UTC (rev 9676)
+++ branches/libressl_3_4_2/TTXSamples	2022-01-04 15:41:16 UTC (rev 9677)

Property changes on: branches/libressl_3_4_2/TTXSamples
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/4-stable/TTXSamples:9256-9257
-/branches/libressl_3_4_2_cmake/TTXSamples:9673
+/branches/libressl_3_4_2_cmake/TTXSamples:9673,9675
 /branches/ssh_chacha20poly1305/TTXSamples:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXSamples:6194-6285
\ No newline at end of property
Index: branches/libressl_3_4_2/cygterm
===================================================================
--- branches/libressl_3_4_2/cygterm	2022-01-04 15:39:49 UTC (rev 9676)
+++ branches/libressl_3_4_2/cygterm	2022-01-04 15:41:16 UTC (rev 9677)

Property changes on: branches/libressl_3_4_2/cygterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/4-stable/cygterm:9256-9257
-/branches/libressl_3_4_2_cmake/cygterm:9673
+/branches/libressl_3_4_2_cmake/cygterm:9673,9675
 /branches/openssl_1_1_1_v3/cygterm:8284
 /branches/ssh_chacha20poly1305/cygterm:9209-9212,9217,9229,9248-9253
\ No newline at end of property
Modified: branches/libressl_3_4_2/libs/buildlibressl.bat
===================================================================
--- branches/libressl_3_4_2/libs/buildlibressl.bat	2022-01-04 15:39:49 UTC (rev 9676)
+++ branches/libressl_3_4_2/libs/buildlibressl.bat	2022-01-04 15:41:16 UTC (rev 9677)
@@ -45,12 +45,11 @@
 
 :vsend
 
+set CMAKE=cmake
+rem set CMAKE="C:\Program Files\CMake\bin\cmake"
+rem set CMAKE="%VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake"
 
-cmake %CMAKE_PARAMETER%
-perl -e "open(IN,'CMakeCache.txt');while(<IN>){s|=/MD|=/MT|;print $_;}close(IN);" > CMakeCache.txt.tmp
-move /y CMakeCache.txt.tmp CMakeCache.txt
-rem \x95ύX\x82\xB5\x82\xBD CMakeCache.txt \x82Ɋ\xEE\x82Â\xA2\x82Đ\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɍēx\x8E\xC0\x8Ds
-cmake %CMAKE_PARAMETER%
+%CMAKE% -DMSVC=on -DUSE_STATIC_MSVC_RUNTIMES=on %CMAKE_PARAMETER%
 
 devenv /build Debug LibreSSL.sln /project crypto /projectconfig Debug
 

Index: branches/libressl_3_4_2/teraterm
===================================================================
--- branches/libressl_3_4_2/teraterm	2022-01-04 15:39:49 UTC (rev 9676)
+++ branches/libressl_3_4_2/teraterm	2022-01-04 15:41:16 UTC (rev 9677)

Property changes on: branches/libressl_3_4_2/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/4-stable/teraterm:8924,9256-9257
 /branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr/teraterm:7825-7827
-/branches/libressl_3_4_2_cmake/teraterm:9673
+/branches/libressl_3_4_2_cmake/teraterm:9673,9675
 /branches/move_code_script/teraterm:9026-9185
 /branches/openssl_1_1_1_v2/teraterm:7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7979-7980
 /branches/openssl_1_1_1_v3/teraterm:8258
Index: branches/libressl_3_4_2/ttpmenu
===================================================================
--- branches/libressl_3_4_2/ttpmenu	2022-01-04 15:39:49 UTC (rev 9676)
+++ branches/libressl_3_4_2/ttpmenu	2022-01-04 15:41:16 UTC (rev 9677)

Property changes on: branches/libressl_3_4_2/ttpmenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/4-stable/ttpmenu:9256-9257
-/branches/libressl_3_4_2_cmake/ttpmenu:9673
+/branches/libressl_3_4_2_cmake/ttpmenu:9673,9675
 /branches/ssh_chacha20poly1305/ttpmenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/ttpmenu:6194-6285
\ No newline at end of property

From scmnotify ＠ osdn.net  Wed Jan  5 00:41:56 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 05 Jan 2022 00:41:56 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzhdIOmAo+e1oeWFiCzlkITnqK7mg4U=?=
 =?utf-8?b?5aCx44Gu5pu05paw?=
Message-ID: <1641310916.829123.5513.nullmailer@users.osdn.me>

Revision: 9678
          https://osdn.net/projects/ttssh2/scm/svn/commits/9678
Author:   zmatsuo
Date:     2022-01-05 00:41:56 +0900 (Wed, 05 Jan 2022)
Log Message:
-----------
連絡先,各種情報の更新

- チケット、問い合わせ先など修正

Modified Paths:
--------------
    trunk/doc/ja/html/about/contacts.html

-------------- next part --------------
Modified: trunk/doc/ja/html/about/contacts.html
===================================================================
--- trunk/doc/ja/html/about/contacts.html	2022-01-04 15:41:16 UTC (rev 9677)
+++ trunk/doc/ja/html/about/contacts.html	2022-01-04 15:41:56 UTC (rev 9678)
@@ -3,57 +3,61 @@
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-<TITLE>\x8D\xEC\x8E҂ւ̘A\x97\x8D</TITLE>
+<TITLE>\x98A\x97\x8D\x90\xE6,\x8Ae\x8E\xED\x8F\xEE\x95\xF1\x82փ\x8A\x83\x93\x83N</TITLE>
 <META http-equiv="Content-Style-Type" content="text/css">
 <link rel="stylesheet" href="../style.css" type="text/css">
 </HEAD>
 <BODY>
 
-<h1>\x8D\xEC\x8E҂ւ̘A\x97\x8D</h1>
+<h1>\x98A\x97\x8D\x90\xE6,\x8Ae\x8E\xED\x8F\xEE\x95\xF1\x82փ\x8A\x83\x93\x83N</h1>
 
-<p>
-\x83l\x83b\x83g\x83\x8F\x81[\x83N\x90ݒ\xE8\x81A\x90ڑ\xB1\x96@\x81A\x83z\x83X\x83g\x82̐ݒ\xE8\x81A\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x96@\x81A\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x8D쐬\x96@\x93\x99\x81ATera Term \x82̎g\x82\xA2\x95\xFB\x82Ɋւ\xB7\x82鎿\x96\xE2\x82\xF0\x8D\xEC\x8E҂ɂ\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-\x82ǂ\xA4\x82\xA9\x95t\x91\xAE\x95\xB6\x8F\x91\x82\xF0\x82\xB2\x97\x97\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B\x8DŐV\x8F\xEE\x95\xF1\x82\xE2\x81A\x95֗\x98\x82ȏ\xEE\x95\xF1\x81E\x83c\x81[\x83\x8B\x93\x99\x82\xCD Tera Term \x82\xCC Home Page \x82Ō\xA9\x82‚\xA9\x82邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B
-</p>
+<h2>web</h2>
 
-<p>
-Tera Term \x82\xCC Home Page:
-<a href="https://ttssh2.osdn.jp/">https://ttssh2.osdn.jp/</a>
-(\x8F\xAB\x97\x88\x95ύX\x82\xB3\x82\xEA\x82邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B)
-</p>
+<ul>
+  <li><a href="https://ttssh2.osdn.jp/">Tera Term Home Page (https://ttssh2.osdn.jp/)</a></li>
+  <li><a href="https://ja.osdn.net/projects/ttssh2/">Tera Term (Tera Term project page)</a></li>
+    <ul>
+      <li><a href="https://ja.osdn.net/projects/ttssh2/ticket/">\x83`\x83P\x83b\x83g(\x83o\x83O/\x97v\x96]/\x93\x8A\x95[)</a><br>
+        \x83o\x83O\x82̓`\x83P\x83b\x83g\x82֓o\x98^\x82\xAD\x82\xBE\x82\xB3\x82\xA2<br>
+        \x8C\xF6\x82ɂ\xB7\x82\xE9\x82Ɩ\xE2\x91肠\x82\xE9\x8Fꍇ\x82\xCD<a href="#ttssh2-contact">\x83\x81\x81[\x83\x8B</a>\x82\xAA\x97\x98\x97p\x82ł\xAB\x82܂\xB7<br>
+        \x93\x8A\x95[\x90\x94\x82̑\xBD\x82\xA2\x83`\x83P\x83b\x83g\x82͑Ή\x9E\x82\xAA\x91\xAC\x82\xAD\x82Ȃ邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1<br>
+        \x83`\x83P\x83b\x83g\x82ɑ΂\xB5\x82ăp\x83b\x83`\x82\xF0\x82\xA2\x82\xBD\x82\xBE\x82\xAD\x82ƑΉ\x9E\x82\xAA\x91\xAC\x82\xAD\x82Ȃ邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1
+      </li>
+      <li><a href="https://osdn.net/projects/ttssh2/forums/">\x83t\x83H\x81[\x83\x89\x83\x80</a><br>
+        \x8B^\x96\xE2\x93_\x82Ȃǂ𓊍e\x82\xA2\x82\xBD\x82\xBE\x82\xAD\x82ƁA\x8Fڂ\xB5\x82\xA2\x95\x{30AA4DA}\x82\xA6\x82Ă\xAD\x82\xEA\x82邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1<br>
+        \x82\xB1\x82\xB1\x82ł\xCC Q &amp; A \x82\xAA\x91\xBC\x82̃\x86\x81[\x83U\x81[\x82̏\x95\x82\xAF\x82ƂȂ\xE8\x82܂\xB7<br>
+        \x82܂\xBD\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x81A\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82̉\xFC\x97ǂ̎Q\x8Dl\x82ɂȂ\xE8\x82܂\xB7
+      </li>
+      <li><a href="https://ja.osdn.net/projects/ttssh2/releases/">\x83_\x83E\x83\x93\x83\x8D\x81[\x83h</a></li>
+      <li><a href="https://ja.osdn.net/projects/ttssh2/scm/svn/">\x83\\x81[\x83X/\x83\x8A\x83|\x83W\x83g\x83\x8A</a></li>
+    </ul>
+</ul>
 
-<p>
-\x92\x98\x8D쌠\x82\xE2\x8Eg\x97p\x8F\xF0\x8C\x8F\x82Ɋւ\xB7\x82鎿\x96\xE2\x82\xE2\x81A\x93\xC1\x95ʂȎg\x97p\x82\xA8\x82\xE6\x82єz\x95z\x8C`\x91ԂɊւ\xB7\x82鋖\x89‚̐\\x90\xBF\x93\x99\x82͂ǂ\xA4\x82\xBC\x83\x81\x81[\x83\x8B\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-\x8E\xBF\x96\xE2\x82\xE2\x83o\x83O\x95񍐂\xE2\x97v\x96]\x82ł͂Ȃ\xAD\x92P\x82Ƀ\x81\x83b\x83Z\x81[\x83W\x82𑗂肽\x82\xA2\x8Fꍇ\x82\xE0\x82ǂ\xA4\x82\xBC\x81B
-<p>
-
-<p>
-\x83o\x83O\x82̕񍐂\xE2\x97v\x96]\x82\xF0\x82\xB7\x82\xE9\x8Fꍇ\x82͈ȉ\xBA\x82\xF0\x95K\x82\xB8\x82悭\x93ǂ\xF1\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2:
-</p>
-
+<h2>\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B</h2>
 <ul>
  <li><a href="../about/qanda.html">Q &amp; A</a></li>
  <li><a href="../about/requests.html">\x97v\x96]\x8FW</a></li>
- <li><a href="../setup/teraterm.html">Tera Term \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B</a> (\x97v\x96]\x82\xAA\x82\xB7\x82łɎ\xC0\x8C\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B)</li>
+ <li><a href="../setup/teraterm.html">Tera Term \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B</a></li>
  <li><a href="../macro/index.html">MACRO \x83w\x83\x8B\x83v</a></li>
  <li><a href="../reference/keycode.txt">KEYCODE.TXT</a></li>
- <li>\x82\xBB\x82̑\xBC\x81A\x82\xB1\x82̃w\x83\x8B\x83v\x82̊֌W\x82\xB7\x82镔\x95\xAA</li>
 </ul>
 
-<p>
-\x82܂\xBD\x83o\x83O\x95񍐂̏ꍇ\x82́A\x82\xBB\x82ꂪ\x90ݒ\xE8\x82̖\xE2\x91\xE8\x82ł͂Ȃ\xA2\x82Ƃ\xA2\x82\xA4\x82\xB1\x82ƁATera Term \x8CŗL\x82̖\xE2\x91\xE8\x82ł\xA0\x82\xE9\x82Ƃ\xA2\x82\xA4\x82\xB1\x82ƁA\x82\xF0\x82ł\xAB\x82邾\x82\xAF\x8Am\x94F\x82\xB5\x82Ă݂Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
-Tera Term \x82\xBE\x82\xAF\x82ł͂Ȃ\xAD\x91\xBC\x82̃A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93(\x97Ⴆ\x82\xCE Windows 95/NT \x95W\x8F\x80\x95t\x91\xAE\x82\xCC telnet.exe) \x82ł\xE0\x93\xAF\x82\xB6\x96\xE2\x91肪\x8BN\x82\xB1\x82\xE9\x8Fꍇ\x82\xCD Tera Term \x82̃o\x83O\x82ł͂Ȃ\xA2\x8Fꍇ\x82\xAA\x91\xBD\x82\xA2\x82ł\xB7\x81B\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82錴\x88\xF6\x82₻\x82̖\xE2\x91肪\x95K\x82\xB8\x8BN\x82\xB1\x82\xE9\x82悤\x82ȏ\xF0\x8C\x8F\x82\xF0\x8C\xA9\x82‚\xAF\x82Ă\xA2\x82\xBD\x82\xBE\x82\xAD\x82ƍ\xEC\x8E҂͔\xF1\x8F\xED\x82ɏ\x95\x82\xA9\x82\xE8\x82܂\xB7\x81B\x95񍐂̍ۂ́ATera Term \x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xE2\x8A֌W\x82\xB7\x82\xE9\x82Ǝv\x82\xED\x82\xEA\x82\xE9\x8F\xEE\x95\xF1\x82\xF0\x8F\x91\x82\xA2\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-</p>
+<h2>\x83\x81\x81[\x83\x8B,\x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g</h2>
+<ul>
+  <li>
+    <a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">\x83\x86\x81[\x83U\x81[ML</a><br>
+    \x83\x86\x81[\x83U\x81[\x8C\xFC\x82\xAF\x82̃\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g
+  </li>
+  <li>
+    <a href="https://osdn.net/projects/ttssh2/lists/archive/dev/">\x8AJ\x94\xADML</a>
+  </li>
+  <li id="ttssh2-contact">
+    <address>ttssh2-contact at lists.osdn.me</address>
+    \x83v\x83\x8D\x83W\x83F\x83N\x83g\x83\x81\x83\x93\x83o\x81[\x82ւ̃\x81\x81[\x83\x8B<br>
+    \x8C\xF6\x82ɂ͂\xB5\x82\xBD\x82\xAD\x82Ȃ\xA2\x8E\x96\x95\xBF(\x95s\x8B\x82Ȃ\xC7)\x82̘A\x97\x8D\x97p<br>
+    \x91\x97\x82\xE7\x82ꂽ\x83\x81\x81[\x83\x8B\x82̓v\x83\x8D\x83W\x83F\x83N\x83g\x83\x81\x83\x93\x83o\x81[\x8AԂŋ\xA4\x97L\x82\xB3\x82\xEA\x82܂\xB7
+  </li>
+</ul>
 
-<p>
-\x8D\xEC\x8E҂Ƀ\x81\x81[\x83\x8B\x82𑗂\xC1\x82Ă\xAD\x82\xBE\x82\xB3\x82\xC1\x82\xBD\x8Fꍇ\x81A\x95Ԏ\x96\x82\xAA\x82\xA9\x82Ȃ\xE8\x92x\x82ꂽ\x82\xE8\x81A\x8Fo\x82\xB9\x82Ȃ\xA2\x8Fꍇ\x82\xE0\x82悭\x82\xA0\x82\xE8\x82܂\xB7\x82̂ł\xB2\x97\xB9\x8F\xB3\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
-\x82܂\xBD\x81A\x82\xB7\x82łɕ񍐂\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x83o\x83O\x82\xE2\x8Fo\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x97v\x96]\x81ATera Term \x95t\x91\xAE\x95\xB6\x8F\x91\x82ɓ\x9A\x82\xA6\x82\xAA\x8F\x91\x82\xA2\x82Ă\xA0\x82鎿\x96ⓙ\x82͕Ԏ\x96\x82\xF0\x8Fȗ\xAA\x82\xB3\x82\xB9\x82Ă\xA2\x82\xBD\x82\xBE\x82\xAD\x82\xA9\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1(\x82\xB9\x82\xC1\x82\xA9\x82\xAD\x83\x81\x81[\x83\x8B\x91\x97\x82\xC1\x82Ă\xAD\x82\xBE\x82\xB3\x82\xC1\x82\xBD\x82̂ɖ{\x93\x96\x82ɂ\xB7\x82݂܂\xB9\x82\xF1)\x81B
-</p>
-
-<address>
-\x8D\xEC\x8E҂̃\x81\x81[\x83\x8B\x83A\x83h\x83\x8C\x83X: ttssh2-contact ＠ lists.osdn.me
-(\x8F\xAB\x97\x88\x95ύX\x82\xB3\x82\xEA\x82邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B)
-</address>
-
 </BODY>
 </HTML>

From scmnotify ＠ osdn.net  Wed Jan  5 00:47:53 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 05 Jan 2022 00:47:53 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2NzldIGNtYWtl44OT44Or44OJLCBMaWJy?=
 =?utf-8?b?ZVNTTCDjgpLkvb/jgYjjgovjgojjgYbkv67mraM=?=
Message-ID: <1641311273.781099.15662.nullmailer@users.osdn.me>

Revision: 9679
          https://osdn.net/projects/ttssh2/scm/svn/commits/9679
Author:   nmaya
Date:     2022-01-05 00:47:53 +0900 (Wed, 05 Jan 2022)
Log Message:
-----------
cmakeビルド, LibreSSL を使えるよう修正

- "-DTTXSSH_LIBRESSL=OFF" とすると、OpenSSL1.1.1 でビルドする

- デフォルトでは ON、LibreSSL を使ってビルド
- LibreSSL を lib/ でビルド

- buildlibressl.cmake

merge from libressl_3_4_2_cmake:
r9674

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9674

Modified Paths:
--------------
    branches/libressl_3_4_2/libs/buildall.cmake
    branches/libressl_3_4_2/ttssh2/ttxssh/CMakeLists.txt

Added Paths:
-----------
    branches/libressl_3_4_2/libs/buildlibressl.cmake
    branches/libressl_3_4_2/libs/lib_libressl.cmake

Property Changed:
----------------
    branches/libressl_3_4_2/
    branches/libressl_3_4_2/TTProxy/
    branches/libressl_3_4_2/TTXKanjiMenu/
    branches/libressl_3_4_2/TTXSamples/
    branches/libressl_3_4_2/cygterm/
    branches/libressl_3_4_2/teraterm/
    branches/libressl_3_4_2/ttpmenu/

-------------- next part --------------
Index: branches/libressl_3_4_2
===================================================================
--- branches/libressl_3_4_2	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2	2022-01-04 15:47:53 UTC (rev 9679)

Property changes on: branches/libressl_3_4_2
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/4-stable:8924,9256-9257
 /branches/drag_and_drop:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr:7825-7827
-/branches/libressl_3_4_2_cmake:9673,9675
+/branches/libressl_3_4_2_cmake:9673-9675
 /branches/move_code_script:9026-9185
 /branches/openssl_1_1_1_v2:7785-7786,7788-7808,7811-7812,7814-7815,7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7873-7877,7880-7881,7884-7888,7890-7892,7894-7895,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980,8019,8208,8256
 /branches/openssl_1_1_1_v3:8258,8264-8265
Index: branches/libressl_3_4_2/TTProxy
===================================================================
--- branches/libressl_3_4_2/TTProxy	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2/TTProxy	2022-01-04 15:47:53 UTC (rev 9679)

Property changes on: branches/libressl_3_4_2/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
 /branches/4-stable/TTProxy:9256-9257
-/branches/libressl_3_4_2_cmake/TTProxy:9673,9675
+/branches/libressl_3_4_2_cmake/TTProxy:9673-9675
 /branches/openssl_1_1_1_v2/TTProxy:7785-7786,7788-7808,7861-7863,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980
 /branches/openssl_1_1_1_v3/TTProxy:8258
 /branches/ssh_chacha20poly1305/TTProxy:9209-9212,9217,9229,9248-9253
Index: branches/libressl_3_4_2/TTXKanjiMenu
===================================================================
--- branches/libressl_3_4_2/TTXKanjiMenu	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2/TTXKanjiMenu	2022-01-04 15:47:53 UTC (rev 9679)

Property changes on: branches/libressl_3_4_2/TTXKanjiMenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/4-stable/TTXKanjiMenu:9256-9257
-/branches/libressl_3_4_2_cmake/TTXKanjiMenu:9673,9675
+/branches/libressl_3_4_2_cmake/TTXKanjiMenu:9673-9675
 /branches/ssh_chacha20poly1305/TTXKanjiMenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXKanjiMenu:6194-6285
\ No newline at end of property
Index: branches/libressl_3_4_2/TTXSamples
===================================================================
--- branches/libressl_3_4_2/TTXSamples	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2/TTXSamples	2022-01-04 15:47:53 UTC (rev 9679)

Property changes on: branches/libressl_3_4_2/TTXSamples
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/4-stable/TTXSamples:9256-9257
-/branches/libressl_3_4_2_cmake/TTXSamples:9673,9675
+/branches/libressl_3_4_2_cmake/TTXSamples:9673-9675
 /branches/ssh_chacha20poly1305/TTXSamples:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXSamples:6194-6285
\ No newline at end of property
Index: branches/libressl_3_4_2/cygterm
===================================================================
--- branches/libressl_3_4_2/cygterm	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2/cygterm	2022-01-04 15:47:53 UTC (rev 9679)

Property changes on: branches/libressl_3_4_2/cygterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/4-stable/cygterm:9256-9257
-/branches/libressl_3_4_2_cmake/cygterm:9673,9675
+/branches/libressl_3_4_2_cmake/cygterm:9673-9675
 /branches/openssl_1_1_1_v3/cygterm:8284
 /branches/ssh_chacha20poly1305/cygterm:9209-9212,9217,9229,9248-9253
\ No newline at end of property
Modified: branches/libressl_3_4_2/libs/buildall.cmake
===================================================================
--- branches/libressl_3_4_2/libs/buildall.cmake	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2/libs/buildall.cmake	2022-01-04 15:47:53 UTC (rev 9679)
@@ -55,5 +55,9 @@
 execute_process(
   COMMAND ${CMAKE_COMMAND} -P argon2.cmake
   )
+message("libressl")
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P buildlibressl.cmake
+  )
 
 message("done buildall.cmake")

Copied: branches/libressl_3_4_2/libs/buildlibressl.cmake (from rev 9674, branches/libressl_3_4_2_cmake/libs/buildlibressl.cmake)
===================================================================
--- branches/libressl_3_4_2/libs/buildlibressl.cmake	                        (rev 0)
+++ branches/libressl_3_4_2/libs/buildlibressl.cmake	2022-01-04 15:47:53 UTC (rev 9679)
@@ -0,0 +1,134 @@
+# for libreSSL
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildlibressl.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildlibressl.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P buildlibressl.cmake
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "libressl-3.4.2")
+set(SRC_ARC "libressl-3.4.2.tar.gz")
+set(SRC_URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.2.tar.gz")
+set(SRC_ARC_HASH_SHA256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/libressl")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/libressl/src")
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/libressl_${TOOLSET}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/libressl/build_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+  set(BUILD_DIR "${BUILD_DIR}_x64")
+endif()
+
+#message("BUILD_DIR=${BUILD_DIR}")
+#message("INSTALL_DIR=${INSTALL_DIR}")
+
+########################################
+
+# Configure + Generate
+function(cmake_generate GENERATOR SRC_DIR WORKING_DIR OPTIONS)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} ${SRC_DIR} .. -G "${GENERATOR}" ${OPTIONS}
+    WORKING_DIRECTORY "${BUILD_DIR}"
+    ENCODING AUTO
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+endfunction()
+
+# build + install
+function(cmake_build WORKING_DIR OPTIONS BUILD_TOOL_OPTIONS)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} --build . ${OPTIONS} --target install -- ${BUILD_TOOL_OPTIONS}
+    WORKING_DIRECTORY "${BUILD_DIR}"
+    ENCODING AUTO
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+endfunction()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README.md)
+
+  file(DOWNLOAD
+    ${SRC_URL}
+    ${DOWN_DIR}/${SRC_ARC}
+    EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+    SHOW_PROGRESS
+    )
+
+  file(MAKE_DIRECTORY ${EXTRACT_DIR})
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+  file(COPY
+    ${SRC_DIR}/COPYING
+    DESTINATION ${CMAKE_CURRENT_LIST_DIR}/doc_help
+    )
+  file(RENAME
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/COPYING
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/LibreSSL-LICENSE.txt)
+endif()
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+    # multi-configuration
+
+    unset(GENERATE_OPTIONS)
+    list(APPEND GENERATE_OPTIONS -A ${ARCHITECTURE})
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_DEBUG_POSTFIX=d")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}")
+    list(APPEND GENERATE_OPTIONS "-DLIBRESSL_TESTS=off")
+    if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+      list(APPEND GENERATE_OPTIONS "-DMSVC=on")
+      list(APPEND GENERATE_OPTIONS "-DUSE_STATIC_MSVC_RUNTIMES=on")
+    endif()
+
+    cmake_generate("${CMAKE_GENERATOR}" "${SRC_DIR}" "${BUILD_DIR}" "${GENERATE_OPTIONS}")
+
+    unset(BUILD_OPTIONS)
+    list(APPEND BUILD_OPTIONS "--config Debug")
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "")
+
+    unset(BUILD_OPTIONS)
+    list(APPEND BUILD_OPTIONS "--config Release")
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "")
+
+    return()
+  else()
+    # single-configuration
+    unset(GENERATE_OPTIONS)
+    if(CMAKE_HOST_UNIX)
+      list(APPEND GENERATE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_LIST_DIR}/../mingw.toolchain.cmake")
+    endif(CMAKE_HOST_UNIX)
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_BUILD_TYPE=Release")
+    if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+      list(APPEND GENERATE_OPTIONS "-DMSVC=on")
+      list(APPEND GENERATE_OPTIONS "-DUSE_STATIC_MSVC_RUNTIMES=on")
+    endif()
+
+    cmake_generate("${CMAKE_GENERATOR}" "${SRC_DIR}" "${BUILD_DIR}" "${GENERATE_OPTIONS}")
+
+    if(${CMAKE_GENERATOR} MATCHES "Unix Makefiles")
+      set(APPEND BUILD_TOOL_OPTIONS "-j")
+    endif()
+
+    unset(BUILD_OPTIONS)
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "${BUILD_TOOL_OPTIONS}")
+
+  endif()
+endif()

Copied: branches/libressl_3_4_2/libs/lib_libressl.cmake (from rev 9674, branches/libressl_3_4_2_cmake/libs/lib_libressl.cmake)
===================================================================
--- branches/libressl_3_4_2/libs/lib_libressl.cmake	                        (rev 0)
+++ branches/libressl_3_4_2/libs/lib_libressl.cmake	2022-01-04 15:47:53 UTC (rev 9679)
@@ -0,0 +1,27 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(REBRESSL_ROOT ${CMAKE_CURRENT_LIST_DIR}/libressl_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(REBRESSL_ROOT "${REBRESSL_ROOT}_x64")
+endif()
+
+if(MINGW)
+  set(LIBRESSL_INCLUDE_DIRS
+    ${REBRESSL_ROOT}/include
+    )
+
+  set(LIBRESSL_LIB
+    ${REBRESSL_ROOT}/lib/libcrypto-47.a
+    bcrypt
+  )
+else()
+  set(LIBRESSL_INCLUDE_DIRS
+    ${REBRESSL_ROOT}/include
+    )
+
+  set(LIBRESSL_LIB
+    debug ${REBRESSL_ROOT}/lib/crypto-47d.lib
+    optimized ${REBRESSL_ROOT}/lib/crypto-47d.lib
+    )
+endif()

Index: branches/libressl_3_4_2/teraterm
===================================================================
--- branches/libressl_3_4_2/teraterm	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2/teraterm	2022-01-04 15:47:53 UTC (rev 9679)

Property changes on: branches/libressl_3_4_2/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,7 +1,7 ##
 /branches/4-stable/teraterm:8924,9256-9257
 /branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr/teraterm:7825-7827
-/branches/libressl_3_4_2_cmake/teraterm:9673,9675
+/branches/libressl_3_4_2_cmake/teraterm:9673-9675
 /branches/move_code_script/teraterm:9026-9185
 /branches/openssl_1_1_1_v2/teraterm:7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7979-7980
 /branches/openssl_1_1_1_v3/teraterm:8258
Index: branches/libressl_3_4_2/ttpmenu
===================================================================
--- branches/libressl_3_4_2/ttpmenu	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2/ttpmenu	2022-01-04 15:47:53 UTC (rev 9679)

Property changes on: branches/libressl_3_4_2/ttpmenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/4-stable/ttpmenu:9256-9257
-/branches/libressl_3_4_2_cmake/ttpmenu:9673,9675
+/branches/libressl_3_4_2_cmake/ttpmenu:9673-9675
 /branches/ssh_chacha20poly1305/ttpmenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/ttpmenu:6194-6285
\ No newline at end of property
Modified: branches/libressl_3_4_2/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/libressl_3_4_2/ttssh2/ttxssh/CMakeLists.txt	2022-01-04 15:41:56 UTC (rev 9678)
+++ branches/libressl_3_4_2/ttssh2/ttxssh/CMakeLists.txt	2022-01-04 15:47:53 UTC (rev 9679)
@@ -1,9 +1,15 @@
 set(PACKAGE_NAME "ttxssh")
 
+option(TTXSSH_LIBRESSL "User LibreSSL" on)
+
 project(${PACKAGE_NAME})
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+if(TTXSSH_LIBRESSL)
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_libressl.cmake)
+else()
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+endif()
 
 add_library(
   ${PACKAGE_NAME} SHARED
@@ -156,10 +162,23 @@
   ../../teraterm/common
   ../matcher
   ../putty
-  ${OPENSSL_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIRS}
-)
+  )
+if(TTXSSH_LIBRESSL)
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${LIBRESSL_INCLUDE_DIRS}
+    )
+else()
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL_INCLUDE_DIRS}
+    )
+endif()
 
+
 set_target_properties(
   ${PACKAGE_NAME}
   PROPERTIES
@@ -189,9 +208,24 @@
   ttpcmn
   argon2
   ${ZLIB_LIB}
-  ${OPENSSL_LIB}
   )
 
+if(TTXSSH_LIBRESSL)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${LIBRESSL_LIB}
+    bcrypt.lib
+    )
+else()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL_LIB}
+    crypt32.lib		# TODO このlibを使用しないパッチを適応したら削除すること
+    )
+endif()
+
 if(SUPPORT_OLD_WINDOWS)
   target_link_libraries(
     ${PACKAGE_NAME}
@@ -207,8 +241,6 @@
   gdi32
   comdlg32
   comctl32
-  # OpenSSL が使用
-  crypt32.lib		# TODO このlibを使用しないパッチを適応したら削除すること
   )
 
 ### create puttyversion.h

From scmnotify ＠ osdn.net  Wed Jan  5 01:18:29 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 05 Jan 2022 01:18:29 +0900
Subject: [ttssh2-commit] [9680] Fix typo
Message-ID: <1641313109.170724.6246.nullmailer@users.osdn.me>

Revision: 9680
          https://osdn.net/projects/ttssh2/scm/svn/commits/9680
Author:   zmatsuo
Date:     2022-01-05 01:18:28 +0900 (Wed, 05 Jan 2022)
Log Message:
-----------
Fix typo

- r9679

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9679

Modified Paths:
--------------
    branches/libressl_3_4_2/libs/lib_libressl.cmake

-------------- next part --------------
Modified: branches/libressl_3_4_2/libs/lib_libressl.cmake
===================================================================
--- branches/libressl_3_4_2/libs/lib_libressl.cmake	2022-01-04 15:47:53 UTC (rev 9679)
+++ branches/libressl_3_4_2/libs/lib_libressl.cmake	2022-01-04 16:18:28 UTC (rev 9680)
@@ -1,27 +1,27 @@
 
 include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
 
-set(REBRESSL_ROOT ${CMAKE_CURRENT_LIST_DIR}/libressl_${TOOLSET})
+set(LIBRESSL_ROOT ${CMAKE_CURRENT_LIST_DIR}/libressl_${TOOLSET})
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(REBRESSL_ROOT "${REBRESSL_ROOT}_x64")
+  set(LIBRESSL_ROOT "${LIBRESSL_ROOT}_x64")
 endif()
 
 if(MINGW)
   set(LIBRESSL_INCLUDE_DIRS
-    ${REBRESSL_ROOT}/include
+    ${LIBRESSL_ROOT}/include
     )
 
   set(LIBRESSL_LIB
-    ${REBRESSL_ROOT}/lib/libcrypto-47.a
+    ${LIBRESSL_ROOT}/lib/libcrypto-47.a
     bcrypt
   )
 else()
   set(LIBRESSL_INCLUDE_DIRS
-    ${REBRESSL_ROOT}/include
+    ${LIBRESSL_ROOT}/include
     )
 
   set(LIBRESSL_LIB
-    debug ${REBRESSL_ROOT}/lib/crypto-47d.lib
-    optimized ${REBRESSL_ROOT}/lib/crypto-47d.lib
+    debug ${LIBRESSL_ROOT}/lib/crypto-47d.lib
+    optimized ${LIBRESSL_ROOT}/lib/crypto-47d.lib
     )
 endif()

From scmnotify ＠ osdn.net  Fri Jan  7 00:27:11 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 07 Jan 2022 00:27:11 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2ODFdIGNtYWtl44OT44Or44OJ44GnIE9w?=
 =?utf-8?b?ZW5TU0wgMyDjgavlr77lv5w=?=
Message-ID: <1641482831.500641.24357.nullmailer@users.osdn.me>

Revision: 9681
          https://osdn.net/projects/ttssh2/scm/svn/commits/9681
Author:   zmatsuo
Date:     2022-01-07 00:27:11 +0900 (Fri, 07 Jan 2022)
Log Message:
-----------
cmakeビルドで OpenSSL 3 に対応

- "-DTTXSSH_LIBRESSL=OFF" とすると、従来通り(OpenSSL1.1.1)でビルド
- デフォルト TTXSSH_OPENSSL3=ON

Modified Paths:
--------------
    branches/openssl_3_0_1/ttssh2/ttxssh/CMakeLists.txt

Added Paths:
-----------
    branches/openssl_3_0_1/libs/buildopenssl3.cmake
    branches/openssl_3_0_1/libs/lib_openssl3.cmake

-------------- next part --------------
Added: branches/openssl_3_0_1/libs/buildopenssl3.cmake
===================================================================
--- branches/openssl_3_0_1/libs/buildopenssl3.cmake	                        (rev 0)
+++ branches/openssl_3_0_1/libs/buildopenssl3.cmake	2022-01-06 15:27:11 UTC (rev 9681)
@@ -0,0 +1,341 @@
+# for OpenSSL 1.1.1
+# cmake -DCMAKE_GENERATOR="Visual Studio 17 2022" -DARCHITECTURE=Win32 -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P buildopenssl3.cmake
+
+####
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+    # multi-configuration
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Release
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -DARCHITECTURE=${ARCHITECTURE}
+      -P buildopenssl3.cmake
+      )
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Debug
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -DARCHITECTURE=${ARCHITECTURE}
+      -P buildopenssl3.cmake
+      )
+    return()
+  elseif("$ENV{MSYSTEM}" MATCHES "MINGW32")
+    # mingw on msys2
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+    # mingw
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
+    # VS nmake
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  else()
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  endif()
+endif()
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "openssl-3.0.1")
+set(SRC_ARC "openssl-3.0.1.tar.gz")
+set(SRC_URL "https://www.openssl.org/source/openssl-3.0.1.tar.gz")
+set(SRC_ARC_HASH_SHA256 c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/openssl")
+
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/openssl3/src_${TOOLSET}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/openssl3_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+  set(EXTRACT_DIR "${EXTRACT_DIR}_x64")
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+endif()
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Debug"))
+  set(EXTRACT_DIR "${EXTRACT_DIR}_debug")
+  set(INSTALL_DIR "${INSTALL_DIR}_debug")
+endif()
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+
+########################################
+
+file(DOWNLOAD
+  ${SRC_URL}
+  ${DOWN_DIR}/${SRC_ARC}
+  EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+  SHOW_PROGRESS
+  )
+
+########################################
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+  find_program(
+    PERL perl
+    )
+elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+  # Active/Strawberry Perl
+  find_program(
+    PERL perl.exe
+    HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/perl/perl/bin
+    HINTS c:/Perl64/bin
+    HINTS c:/Perl/bin
+    HINTS c:/Strawberry/perl/bin
+    )
+  if("${PERL}" MATCHES "[Cc]ygwin")
+    message(FATAL_ERROR "cygwin perl! ${PERL}")
+  endif()
+else()
+  # MinGW
+  find_program(
+    PERL perl
+    HINTS C:/msys64/usr/bin
+    )
+endif()
+
+if(${PERL} STREQUAL "PERL-NOTFOUND")
+  message(FATAL_ERROR "perl not found")
+endif()
+
+########################################
+
+if(NOT EXISTS "${SRC_DIR}/README.md")
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+    )
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+  file(COPY
+    ${SRC_DIR}/LICENSE.txt
+    DESTINATION ${CMAKE_CURRENT_LIST_DIR}/doc_help
+    )
+  file(RENAME
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/LICENSE.txt
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/OpenSSL3-LICENSE.txt)
+
+endif()
+
+########################################
+
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") OR
+    (${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
+  ######################################## VS
+  if(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 14 2015")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 12 2013")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 11 2012")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 10 2010")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
+      )
+  else()
+    message(FATAL_ERROR "CMAKE_GENERATOR ${CMAKE_GENERATOR} not supported")
+  endif()
+  if(VCVARS32-NOTFOUND OR (${VCVARS32} STREQUAL "VCVARS32-NOTFOUND"))
+    message(FATAL_ERROR "vcvars32.bat not found")
+  endif()
+
+  if((${CMAKE_GENERATOR} MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64"))
+    set(CONFIG_TARGET "VC-WIN64A")
+  else()
+    set(CONFIG_TARGET "VC-WIN32")
+  endif()
+  if(("${CMAKE_BUILD_TYPE}" STREQUAL "Release") OR ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Release"))
+  else()
+    set(CONFIG_TARGET "debug-${CONFIG_TARGET}")
+  endif()
+
+  file(WRITE "${SRC_DIR}/build_cmake.bat"
+    "cd /d %~dp0\n"
+    "setlocal\n"
+    )
+  file(TO_NATIVE_PATH ${PERL} PERL_N)
+  file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+  file(TO_NATIVE_PATH ${VCVARS32} VCVARS32_N)
+  string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
+  file(APPEND "${SRC_DIR}/build_cmake.bat"
+    "set PATH=${PERL_N_PATH};c:\\windows;c:\\windows\\system32\n"
+    )
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    ## Visual Studio 2005 特別処理
+    # include,libパスの設定
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
+      "set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
+      "set LIB=%SDK%\\lib;%LIB%\n"
+      )
+  endif()
+  if((${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019") OR ${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
+    if("${ARCHITECTURE}" MATCHES "x64")
+      file(APPEND "${SRC_DIR}/build_cmake.bat"
+        "call \"${VCVARS32_N}\" amd64\n"
+        )
+    else()
+      file(APPEND "${SRC_DIR}/build_cmake.bat"
+        "call \"${VCVARS32_N}\" x86\n"
+        )
+    endif()
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017 Win64")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" amd64\n"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" x86\n"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\"\n"
+      )
+  endif()
+  file(APPEND "${SRC_DIR}/build_cmake.bat"
+    "perl Configure no-asm no-async no-shared no-capieng no-dso no-engine ${CONFIG_TARGET} -D_WIN32_WINNT=0x0501 --prefix=${INSTALL_DIR_N} --openssldir=${INSTALL_DIR_N}\\SSL\n"
+    "nmake -f makefile install\n"
+    )
+  set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
+  file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
+  execute_process(
+    COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+else()
+  ######################################## MinGW
+  execute_process(
+    COMMAND "uname" -s
+    OUTPUT_VARIABLE ov)
+  string(REGEX MATCH "[A-Za-z0-9]+" UNAME_S ${ov})
+  if("${UNAME_S}" STREQUAL "CYGWIN")
+    find_program(
+      MAKE make.exe
+      HINTS c:/cygwin/usr/bin
+      HINTS c:/cygwin64/usr/bin
+      )
+  elseif(("${UNAME_S}" STREQUAL "MINGW32") OR ("${UNAME_S}" STREQUAL "MINGW64") OR ("${CMAKE_COMMAND}" MATCHES "mingw"))
+    find_program(
+      MAKE make
+      )
+  elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+    find_program(
+      MAKE make
+      )
+  else()
+    message(FATAL_ERROR "unsported")
+  endif()
+  set(ENV{PATH} "/usr/bin;/bin")
+  if(("${UNAME_S}" STREQUAL "MINGW32") OR ("${CMAKE_COMMAND}" MATCHES "mingw32"))
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw32/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/core_perl")
+    set(CONFIG_NAME "mingw")
+  elseif(("${UNAME_S}" STREQUAL "MINGW64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/core_perl")
+    set(CONFIG_NAME "mingw64")
+  else()
+    include(${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake)
+    set(ENV{CC} ${CMAKE_C_COMPILER})
+    set(ENV{AR} "i686-w64-mingw32-ar")
+    set(ENV{RANLIB} "i686-w64-mingw32-ranlib")
+    set(ENV{RC} "i686-w64-mingw32-windres")
+    set(PATH "/usr/bin:/bin")
+    set(CONFIG_NAME "mingw")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=/usr/bin:/bin" ${PERL} ./Configure no-asm no-async no-shared no-capieng -no-dso -no-engine ${CONFIG_NAME} -D_WIN32_WINNT=0x0501 --prefix=${INSTALL_DIR} --openssldir=${INSTALL_DIR}/SSL
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake configure fail ${rv}")
+  endif()
+  set(MAKE_OPTION "-j")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} CC=${CMAKE_C_COMPILER} ${MAKE_OPTION}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} install ${MAKE_OPTION}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+endif()

Added: branches/openssl_3_0_1/libs/lib_openssl3.cmake
===================================================================
--- branches/openssl_3_0_1/libs/lib_openssl3.cmake	                        (rev 0)
+++ branches/openssl_3_0_1/libs/lib_openssl3.cmake	2022-01-06 15:27:11 UTC (rev 9681)
@@ -0,0 +1,33 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(OPENSSL3_ROOT ${CMAKE_CURRENT_LIST_DIR}/openssl3_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(OPENSSL3_ROOT "${OPENSSL3_ROOT}_x64")
+endif()
+
+if(MINGW)
+  set(OPENSSL3_INCLUDE_DIRS
+    ${OPENSSL3_ROOT}/include
+    )
+
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(OPENSSL3_LIB
+      ${OPENSSL3_ROOT}/lib64/libcrypto.a
+      )
+  else()
+    set(OPENSSL3_LIB
+      ${OPENSSL3_ROOT}/lib/libcrypto.a
+      )
+  endif()
+else()
+  set(OPENSSL3_INCLUDE_DIRS
+    "$<$<CONFIG:Debug>:${OPENSSL3_ROOT}_debug/include>"
+    "$<$<CONFIG:Release>:${OPENSSL3_ROOT}/include>"
+    )
+
+  set(OPENSSL3_LIB
+    debug ${OPENSSL3_ROOT}_debug/lib/libcrypto.lib
+    optimized ${OPENSSL3_ROOT}/lib/libcrypto.lib
+    )
+endif()

Modified: branches/openssl_3_0_1/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/openssl_3_0_1/ttssh2/ttxssh/CMakeLists.txt	2022-01-04 16:18:28 UTC (rev 9680)
+++ branches/openssl_3_0_1/ttssh2/ttxssh/CMakeLists.txt	2022-01-06 15:27:11 UTC (rev 9681)
@@ -1,9 +1,15 @@
 set(PACKAGE_NAME "ttxssh")
 
+option(TTXSSH_OPENSSL3 "Use OpenSSL3" on)
+
 project(${PACKAGE_NAME})
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+if(TTXSSH_OPENSSL3)
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl3.cmake)
+else()
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+endif()
 
 add_library(
   ${PACKAGE_NAME} SHARED
@@ -156,10 +162,24 @@
   ../../teraterm/common
   ../matcher
   ../putty
-  ${OPENSSL_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIRS}
-)
+  )
 
+if(TTXSSH_OPENSSL3)
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL3_INCLUDE_DIRS}
+    )
+else()
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL_INCLUDE_DIRS}
+    )
+endif()
+
+
 set_target_properties(
   ${PACKAGE_NAME}
   PROPERTIES
@@ -189,9 +209,24 @@
   ttpcmn
   argon2
   ${ZLIB_LIB}
-  ${OPENSSL_LIB}
   )
 
+if(TTXSSH_LIBRESSL)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL3_LIB}
+    bcrypt.lib
+    )
+else()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL_LIB}
+    crypt32.lib		# TODO このlibを使用しないパッチを適応したら削除すること
+    )
+endif()
+
 if(SUPPORT_OLD_WINDOWS)
   target_link_libraries(
     ${PACKAGE_NAME}
@@ -207,8 +242,6 @@
   gdi32
   comdlg32
   comctl32
-  # OpenSSL が使用
-  crypt32.lib		# TODO このlibを使用しないパッチを適応したら削除すること
   )
 
 ### create puttyversion.h

From scmnotify ＠ osdn.net  Sun Jan  9 01:17:39 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 09 Jan 2022 01:17:39 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2ODJdIGNtYWtl44OT44Or44OJLGlubm9z?=
 =?utf-8?b?ZXR1cOOCkjYuMi4w44G45pu05paw?=
Message-ID: <1641658659.489360.28809.nullmailer@users.osdn.me>

Revision: 9682
          https://osdn.net/projects/ttssh2/scm/svn/commits/9682
Author:   zmatsuo
Date:     2022-01-09 01:17:39 +0900 (Sun, 09 Jan 2022)
Log Message:
-----------
cmakeビルド,innosetupを6.2.0へ更新

- 入れ替え前は 6.0.5 を使用していた
  - self-extract形式
  - ローカルで展開するためには unpacker(innounp)が必要
- innounp 0.50 に入れ替え
  - 0.50 から innosetup 6.1.2以降のunpackに対応
  - RAR v5 でアーカイブされている
  - 入れ替え前の unnounp 0.49 は RAR v4 でアーカイブされていた
- RAR v5 に対応した unrarに入れ替え
  - 入れ替え前の unrar は RAR v4 までしか対応していなかった

Modified Paths:
--------------
    trunk/buildtools/innosetup.cmake

-------------- next part --------------
Modified: trunk/buildtools/innosetup.cmake
===================================================================
--- trunk/buildtools/innosetup.cmake	2022-01-06 15:27:11 UTC (rev 9681)
+++ trunk/buildtools/innosetup.cmake	2022-01-08 16:17:39 UTC (rev 9682)
@@ -1,9 +1,9 @@
 # cmake -P innosetup.cmake
 
 # unrar
-set(UNRAR_ZIP "unrar-3.4.3-bin.zip")
-set(UNRAR_URL "https://sourceforge.net/projects/gnuwin32/files/unrar/3.4.3/${UNRAR_ZIP}/download")
-set(UNRAR_HASH "b7c3cc0865bfc32cb9e7e2017c91c5d3601eb97b3bcd37f42c36d9c62f1ae46c")
+set(UNRAR_ZIP "unrarw32.exe")
+set(UNRAR_URL "https://www.rarlab.com/rar/unrarw32.exe")
+set(UNRAR_HASH "63dac3b0e3faa90f85e234e0608ce7db94dd6a43b12793c71895b3ee35ff7755")
 file(MAKE_DIRECTORY "download/unrar")
 file(DOWNLOAD
   ${UNRAR_URL}
@@ -16,17 +16,14 @@
 endif()
 file(MAKE_DIRECTORY "unrar")
 execute_process(
-  COMMAND ${CMAKE_COMMAND} -E tar xvf ../download/unrar/${UNRAR_ZIP}
+  COMMAND ../download/unrar/${UNRAR_ZIP} /s
   WORKING_DIRECTORY "unrar"
   )
 
 # innounp
-#set(INNOUNP_RAR "innounp050.rar")
-#set(INNOUNP_URL "https://sourceforge.net/projects/innounp/files/innounp/innounp%200.50/${INNOUNP_RAR}/download")
-#set(INNOUNP_HASH "1d8837540ccc15d98245a1c73fd08f404b2a7bdfe7dc9bed2fdece818ff6df67")
-set(INNOUNP_RAR "innounp049.rar")
-set(INNOUNP_URL "https://sourceforge.net/projects/innounp/files/innounp/innounp%200.49/${INNOUNP_RAR}/download")
-set(INNOUNP_HASH "4a636ff9213928a919717d0fab28e525fb992d9bb5f2d4a9ab2fd97132690741")
+set(INNOUNP_RAR "innounp050.rar")
+set(INNOUNP_URL "https://sourceforge.net/projects/innounp/files/innounp/innounp%200.50/${INNOUNP_RAR}/download")
+set(INNOUNP_HASH "1d8837540ccc15d98245a1c73fd08f404b2a7bdfe7dc9bed2fdece818ff6df67")
 file(MAKE_DIRECTORY "download/innounp")
 file(DOWNLOAD
   ${INNOUNP_URL}
@@ -39,15 +36,13 @@
 endif()
 file(MAKE_DIRECTORY "innounp")
 execute_process(
-  COMMAND ../unrar/bin/unrar.exe x ../download/innounp/${INNOUNP_RAR}
+  COMMAND ../unrar/UnRAR.exe x ../download/innounp/${INNOUNP_RAR}
   WORKING_DIRECTORY "innounp"
   )
 
 # innosetup 6
-#set(INNOSETUP_EXE "innosetup-6.1.2.exe")
-#set(INNOSETUP_HASH "a3ce1c40ef9c71a92691aaff0f413f530c8c9e3c766be481bc63ca7cc74e35e7")
-set(INNOSETUP_EXE "innosetup-6.0.5.exe")
-set(INNOSETUP_HASH "ae6823b523df87e9441789e51845434e4e0e70aac0b88afe80f94f20f4b98acb")
+set(INNOSETUP_EXE "innosetup-6.2.0.exe")
+set(INNOSETUP_HASH "2459da3c0a67346bc43a9732d96929877d04f53b1d4c56e61be64e3b5f34d5cf")
 file(MAKE_DIRECTORY "download/innosetup6")
 file(DOWNLOAD
   https://files.jrsoftware.org/is/6/${INNOSETUP_EXE}

From scmnotify ＠ osdn.net  Sun Jan  9 21:33:14 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 09 Jan 2022 21:33:14 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2ODNdIOiqpOOBo+OBn+S/ruato+OBjCBy?=
 =?utf-8?b?OTYyMyDjgavntJvjgozovrzjgpPjgaDjga7jgacgcmV2ZXJ0?=
Message-ID: <1641731594.631752.16194.nullmailer@users.osdn.me>

Revision: 9683
          https://osdn.net/projects/ttssh2/scm/svn/commits/9683
Author:   nmaya
Date:     2022-01-09 21:33:14 +0900 (Sun, 09 Jan 2022)
Log Message:
-----------
誤った修正が r9623 に紛れ込んだので revert

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9623

Modified Paths:
--------------
    branches/libressl_3_4_2/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters

-------------- next part --------------
Modified: branches/libressl_3_4_2/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters
===================================================================
--- branches/libressl_3_4_2/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters	2022-01-08 16:17:39 UTC (rev 9682)
+++ branches/libressl_3_4_2/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters	2022-01-09 12:33:14 UTC (rev 9683)
@@ -121,9 +121,24 @@
     <ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\tipwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\teraterm\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arc4random.h">
@@ -234,15 +249,6 @@
     <ClInclude Include="..\..\teraterm\common\codeconv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\teraterm\common\compat_win.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\teraterm\common\dllutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\teraterm\common\ttlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttsecure.ico">

From scmnotify ＠ osdn.net  Thu Jan 13 01:09:56 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 13 Jan 2022 01:09:56 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2ODRdIGRldmVsb3AudHh0IOOCkiBIVE1M?=
 =?utf-8?b?IOOBq+WkieabtA==?=
Message-ID: <1642003796.350725.7484.nullmailer@users.osdn.me>

Revision: 9684
          https://osdn.net/projects/ttssh2/scm/svn/commits/9684
Author:   nmaya
Date:     2022-01-13 01:09:55 +0900 (Thu, 13 Jan 2022)
Log Message:
-----------
develop.txt を HTML に変更

記述が古い・誤っている・日英で異なる・trunk/4-stableで共通部分の記述が異なる、などはそのまま

Modified Paths:
--------------
    branches/4-stable/doc/en/html/index.html
    branches/4-stable/doc/en/teraterm.hhc
    branches/4-stable/doc/en/teraterm.hhp
    branches/4-stable/doc/ja/html/index.html
    branches/4-stable/doc/ja/teraterm.hhc
    branches/4-stable/doc/ja/teraterm.hhp
    branches/4-stable/libs/Refer to develop.txt

Added Paths:
-----------
    branches/4-stable/doc/en/html/reference/develop.html
    branches/4-stable/doc/ja/html/reference/develop.html

-------------- next part --------------
Modified: branches/4-stable/doc/en/html/index.html
===================================================================
--- branches/4-stable/doc/en/html/index.html	2022-01-09 12:33:14 UTC (rev 9683)
+++ branches/4-stable/doc/en/html/index.html	2022-01-12 16:09:55 UTC (rev 9684)
@@ -144,7 +144,7 @@
  <LI><A HREF="reference/PuTTY-LICENSE.txt">License of PuTTY</A></LI>
  <LI><A HREF="reference/argon2-LICENSE.txt">License of The reference C implementation of Argon2</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">License of CygTerm+</A></LI>
- <LI><A HREF="reference/develop.txt">For developer</A>
+ <LI><A HREF="reference/develop.html">For developer</A>
  <UL>
    <LI>build with CMake (experimental)</LI>
    <UL>

Added: branches/4-stable/doc/en/html/reference/develop.html
===================================================================
--- branches/4-stable/doc/en/html/reference/develop.html	                        (rev 0)
+++ branches/4-stable/doc/en/html/reference/develop.html	2022-01-12 16:09:55 UTC (rev 9684)
@@ -0,0 +1,566 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<HTML>
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<TITLE>Tera Term Development</TITLE>
+<META http-equiv="Content-Style-Type" content="text/css">
+<link rel="stylesheet" href="../style.css" type="text/css">
+</HEAD>
+<BODY>
+
+<h1 class="center">Tera Term Development</h1>
+
+<ol>
+  <li><a href="#environment">Development Environment</a></li>
+  <li><a href="#library">Libraries</a></li>
+  <li><a href="#committer">Notice for SVN committer</a></li>
+  <li><a href="#ini-entry">Add entry to TERATERM.INI</a></li>
+  <li><a href="#menu-id">Naming rule to add menu ID</a></li>
+  <li><a href="#add-macro-command">What to do when new macro command is added?</a></li>
+  <li><a href="#build-library">How to build Libraries</a></li>
+  <li><a href="#build-teraterm">How to build Tera Term</a></li>
+  <li><a href="#build-teraterm-menu">How to build TeraTerm Menu</a></li>
+  <li><a href="#build-ttxkanjimenu">How to build TTXKanjiMenu</a></li>
+  <li><a href="#build-ttproxy">How to build TTProxy</a></li>
+  <li><a href="#build-ttssh">How to build TTSSH</a></li>
+  <li><a href="#build-cygterm">How to build CygTerm</a></li>
+  <li><a href="#build-ttxsamples">How to build TTXSamples</a></li>
+  <li><a href="#build-htmlhelp">How to build HTML help file</a></li>
+  <li><a href="#release">How to release Tera Term installation package</a></li>
+</ol>
+
+<hr>
+
+<h2 id="environment">Development Environment</h2>
+
+<ul>
+  <li>OS
+    <ul>
+      <li>Windows XP Professional</li>
+      <li>Windows 8 Pro</li>
+      <li>Windows 8.1 Pro</li>
+      <li>Windows 10 Pro</li>
+    </ul>
+  </li>
+  <li>Compiler used for release in Tera Term Project
+    <ul>
+      <li>Visual Studio 2005 SP1 Standard Edition (or higher edition)
+        <ul>
+          <li>Service Pack 1 (VS80sp1-KB926601-X86-ENU.exe)</li>
+          <li>Microsoft Visual Studio 2005 Service Pack 1 MFC Security Update (VS80sp1-KB2538218-v2-X86-INTL.exe)</li>
+          <li>When Windows Vista or higher, Visual Studio 2005 Service Pack 1 Update for Windows Vista (VS80sp1-KB932232-X86-ENU.exe)</li>
+          <li>Windows Server 2003 R2 Platform SDK(Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1)<br />
+              Note: The OpenSSL will not able to build by using the Visual Studio 2005 Standard Edition. So, install the Windows Server 2003 R2 Platform SDK to link the "Crypt32.Lib" library.<br />
+              Append to the beginning of INCLUDE and LIB of C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat, to be given priority for the INCLUDE and LIB directory of SDK installation directory.<br />
+              <pre>
+e.g. INCLUDE "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include"
+     LIB     "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib"
+              </pre>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>Supported Compiler
+    <ul>
+      <li>Visual Studio 2005 (Express Edition was supported from Tera Term 4.103)
+        <ul>
+          <li>with SDK 7.0
+            <ul>
+              <li>Windows Server 2003 R2 Platform SDK (= Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1) (5.2.3790.2075.51.PlatformSDK_Svr2003R2_rtm.img)<br />
+                  Note: unavailable on Microsoft website (at Apr 07, 2019).</li>
+            </ul>
+          </li>
+          <li>with SDK 7.1
+            <ul>
+              <li>Microsoft Windows SDK for Windows 7 and .NET Framework 4 (GRMSDK_EN_DVD.iso)</li>
+              <li>To use with Visual Studio 2005, KB949009(VS80sp1-KB949009-X86-INTL.exe) or KB980422(VS80sp1-KB980422-x86-INTL.exe) is necessary.<br />
+                  Note: KB949009 and KB980422 are unavailable on Microsoft website.</li>
+            </ul>
+            built binary is able to run on Windows 95.
+          </li>
+        </ul>
+      </li>
+      <li>Visual Studio 2008 SP1 Standard Edition (or higher edition)<br />
+          Note: The executable program which was compiled by this version does not work on Windows NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio 2010 SP1 Professional Edition (or higher edition)<br />
+          Note: The executable program which was compiled by this version does not work on Windows 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio 2012 Update 4 Professional Edition (or higher edition)<br />
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio Community 2013 Update 5<br />
+        <ul>
+          <li>MFC MBCS DLL Add-on (vc_mbcsmfc.exe) is necessary.</li>
+        </ul>
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio Community 2015 Update 3<br />
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio Community 2017<br />
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio Community 2019<br />
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+    </ul>
+  </li>
+  <li>Installer
+    <ul>
+      <li>Inno Setup 5.6.1 ANSI (http://www.jrsoftware.org/isinfo.php)
+        <ul>
+          <li>Inno Setup Preprocessor</li>
+        </ul>
+      </li>
+      <li>ISTool 5.3.0.1 (https://sourceforge.net/projects/istool/)</li>
+    </ul>
+  </li>
+  <li>Others
+    <ul>
+      <li>Cygwin the latest version (because CygTerm+ supports Vista or later from v4.105)</li>
+      <li>ActivePerl 5.10 or later version , Strawberry Perl 5.30.1.1 or later version<br />
+          converts character-code and return-code of documents for building OpenSSL.</li>
+      <li>Subversion for Windows (http://sourceforge.net/projects/win32svn/)<br />
+          Use the compatible version for check-outed svn version.<br />
+          Extract into libs\svn. ("svnversion.exe" is located in libs\svn\bin directory.)</li>
+      <li>Patch<br />
+          When the patch command is not found in the path, please put the "patch.exe" into the libs\openssl_patch directory.<br />
+          https://gitforwindows.org/ (https://github.com/git-for-windows/git/releases/latest). Next, extract the file and copy the  patch.exe, msys-gcc_s-1.dll, msys-2.0.dll of usr\bin directory.</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h2 id="library">Libraries</h2>
+
+<ul>
+  <li>Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)</li>
+  <li>OpenSSL 1.1.1k (http://www.openssl.org/)</li>
+  <li>zlib 1.2.11 (http://www.zlib.net/)</li>
+  <li>PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)</li>
+  <li>SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)</li>
+  <li>The reference C implementation of Argon2 20190702 (https://github.com/P-H-C/phc-winner-argon2)</li>
+</ul>
+
+
+<h2 id="committer">Notice for SVN committer</h2>
+
+<p>
+SVN repository for committer is the following:
+</p>
+<pre>
+svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable
+</pre>
+
+<p>
+Should not edit checkout file in copying directory.<br />
+The other modification code may be deleted in SVN server when you commit checkout file. Also, fix it carefully when the conflicting occurs.
+</p>
+
+<p>
+Should not have opened checkout file.<br />
+SVN commit procedure may be failure while checkout file will have been opened.
+</p>
+
+<p>
+Edit language files<br />
+Use the text editor supporting multi languages(vim, EmEditor, Notepad++, etc) to edit the language files(installer\release\lang\*.lng).
+</p>
+
+
+<h2 id="ini-entry">Add entry to TERATERM.INI</h2>
+
+<p>
+Entry name<br />
+Unfortunately, the confusing entries such as EnableFoo... and DisableBar... are included.<br />
+It recommends that the new name like as Baz....
+</p>
+
+
+<h2 id="menu-id">Naming rule to add menu ID</h2>
+
+<pre>
+The first digit is 5.
+</pre>
+<pre>
+The second digit is:
+  Tera Term VT window         0
+  Tera Term TEK window        1
+  TTSSH                       2
+  TTProxy                     3
+  TTXKanjiMenu                4
+</pre>
+<pre>
+The third digit is:
+  [File] menu                 1
+  [Edit] menu                 2
+  [Setup] menu                3
+  [Control] menu              4
+  [Window] menu               8
+  [Help] menu                 9
+</pre>
+
+<p>
+Example: adding a TTSSH menu under File menu
+</p>
+<pre>
+#define ID_SSHSCPMENU       52110
+</pre>
+
+
+<h2 id="add-macro-command">What to do when new macro command is added?</h2>
+
+<ul>
+  <li>Coding
+    <ul>
+      <li>get a new number of command internal ID.<br />
+          ... teraterm/ttmacro/ttmparse.h</li>
+      <li>add a if statement to below function.<br />
+          ... CheckReservedWord ＠ teraterm/ttmacro/ttmparse.c</li>
+      <li>add a caller doing the macro command.<br />
+          ... ExecCmnd ＠ teraterm/ttmacro/ttl.c</li>
+      <li>make a function code for the macro command.</li>
+    </ul>
+  </li>
+  <li>Help topic
+    <ul>
+      <li>make the command help file.<br />
+          ... doc/LANG/html/macro/command/hogefunc.html</li>
+      <li>add the file to help topic.<br />
+          ... doc/LANG/teraterm.hhc</li>
+      <li>get a new number of context ID in help page.<br />
+          The value is internal ID + 92000.<br />
+          ... teraterm/common/helpid.h</li>
+      <li>make the alias between context ID and calling file.<br />
+          Open the .hhp file by using Text Editor, added a html line in [ALIAS] tag.<br />
+          ... doc/LANG/teraterm.hhp</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h2 id="build-library">How to build Libraries</h2>
+
+<ul>
+  <li>PuTTY (used by TTSSH)
+    <ol>
+      <li>Extract PuTTY source into libs/putty directory.</li>
+    </ol>
+  </li>
+  <li>Oniguruma (used by Tera Term Macro)
+    <ol>
+      <li>Extract oniguruma source into libs/oniguruma directory.</li>
+      <li>Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.</li>
+      <li>Move 'libs' directory on the command prompt. And run buildoniguruma6.bat.</li>
+    </ol>
+  </li>
+  <li>OpenSSL (used by TTSSH)
+    <ol>
+      <li>Extract openssl source into libs/openssl directory.</li>
+      <li>When the libs/openssl/Makefile.bak file exists on the OpenSSL 1.0.0e or later, delete the file only once</li>
+      <li>Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.</li>
+      <li>Move 'libs' directory on the command prompt. And run buildopenssl11.bat.</li>
+    </ol>
+  </li>
+  <li>Zlib (used by TTSSH)
+    <ol>
+      <li>Extract zlib source into libs/zlib directory.</li>
+      <li>Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.</li>
+      <li>Move 'libs' directory on the command prompt. And run buildzlib.bat.</li>
+    </ol>
+  </li>
+  <li>SFMT (used by Tera Term Macro)
+    <ol>
+      <li>Extract SFMT source into libs/SFMT directory.</li>
+      <li>Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.</li>
+      <li>Move 'libs' directory on the command prompt. And run buildSFMT.bat.</li>
+      <li>Modify version information in libs/SFMT/SFMT_version_for_teraterm.h if necessary.</li>
+    </ol>
+  </li>
+  <li>The reference C implementation of Argon2 (used by TTSSH)
+    <ol>
+      <li>Extract argon2 source into libs/argon2 directory.</li>
+    </ol>
+  </li>
+</ul>
+
+<h2 id="build-teraterm">How to build Tera Term</h2>
+
+<p>
+To build Tera Term source code is shown in the following step:<br />
+And you should use Visual Studio 2005 Standard Edition later version to build Tera Term because Tera Term program links MFC library (Visual Studio 2005 Express Edition can't be used).
+</p>
+
+<ol>
+  <li>Checkout Tera Term source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open teraterm\visualc\ttermpro.sln with Visual Studio.<br />
+      The linefeed code of .sln file must be "CR+LF".</li>
+  <li>Build Tera Term solution.</li>
+  <li>Tera Term execution program will be generated in teraterm\visualc\bin directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-teraterm-menu">How to build TeraTerm Menu</h2>
+
+<ol>
+  <li>Checkout TeraTerm Menu source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open ttpmenu\ttpmenu.sln with Visual Studio.</li>
+  <li>Build ttpmenu solution.</li>
+  <li>ttpmenu.exe will be generated in Release directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-ttxkanjimenu">How to build TTXKanjiMenu</h2>
+
+<ol>
+  <li>Checkout TTXKanjiMenu source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open TTXKanjiMenu\ttxkanjimenu.sln with Visual Studio.</li>
+  <li>Build ttpmenu solution.</li>
+  <li>ttxkanjimenu.dll will be generated in TTXKanjiMenu directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-ttproxy">How to build TTProxy</h2>
+
+<p>
+To build TTProxy source code is shown in the following step:<br />
+And you need Visual Studio 2005(VC++8.0) to build.
+</p>
+
+<ol>
+  <li>Checkout TTProxy source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open TTProxy\TTProxy.sln with Visual Studio.</li>
+  <li>Build TTProxy solution.</li>
+  <li>TTProxy DLL module will be generated in TTProxy directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-ttssh">How to build TTSSH</h2>
+
+<p>
+To build TTSSH source code is shown in the following step:<br />
+And you need Visual Studio 2005(VC++8.0) and ActivePerl to build.
+</p>
+
+<p>
+VS2005 Express Edition is able to build TTSSH. TTSSH links to ttpcmn.lib and it must be created beforehand. VS2005 Express Edition cannot build Tera Term, but it can create ttpcmn.lib
+</p>
+
+<p>
+On VS2008 Express Edition, following error occurs:<br />
+.\ttxssh.rc(10) : fatal error RC1015: cannot open include file 'afxres.h'.<br />
+To avoid this error, edit ttxssh.rc file. Delete the line of "afxres.h", and add 2 lines.<br />
+</p>
+<pre>
+- #include "afxres.h"
++ #include <windows.h>
++ #define IDC_STATIC -1
+</pre>
+
+<ol>
+  <li>Checkout TTSSH source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open ttssh2\ttssh.sln with Visual Studio.</li>
+  <li>Build TTSSH solution.</li>
+  <li>TTSSH DLL will be generated in ttssh2\ttxssh directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-cygterm">How to build CygTerm</h2>
+
+<p>
+To build CygTerm source code is shown in the following step:
+</p>
+
+<ol>
+  <li>Install Cygwin(https://www.cygwin.com/) to your PC.</li>
+  <li>Launch Cygwin shell and go to cygterm directory.
+<pre>
+# cd cygterm
+</pre>
+  </li>
+  <li>Compile Cygterm.
+<pre>
+# make
+</pre>
+   </li>
+</ol>
+
+
+<h2 id="build-ttxsamples">How to build TTXSamples</h2>
+
+<p>
+To build TTXSamples source code is shown in the following step:<br />
+And you need Visual Studio 2005(VC++8.0) to build. VS2005 Express Edition is able to build TTXSamples.
+</p>
+
+<ol>
+  <li>Checkout TTXSamples source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open TTXSamples\TTXSamples.sln with Visual Studio.</li>
+  <li>Build TTXSamples solution.</li>
+  <li>TTXSamples DLL module will be generated in TTXSamples directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-htmlhelp">How to build HTML help file</h2>
+
+<p>
+To build  HTML help file is shown in the following step:
+</p>
+
+<ol>
+  <li>Install HTML Help Compiler<br />
+      Installing Visual Studio (2017 or later) with "C++ MFC" option, HTML Help Compiler (hhc.exe) is installed.</li>
+  <li>Run doc\makechm.bat</li>
+</ol>
+
+
+<h2 id="release">How to release Tera Term installation package</h2>
+
+<p>
+To release Tera Term installation package is shown in the following step:
+</p>
+
+<ol>
+  <li>Increment the version while RC release process.<br />
+      The binary is released for test in this timing. Prevent that old and new binary have same version number.
+    <ul>
+      <li>teraterm\common\tt-version.h</li>
+      <li>ttssh2\ttxssh\ttxssh-version.h</li>
+      <li>ttpmenu\ttpmenu.rc // only modifying</li>
+      <li>TTProxy\TTProxy.rc // only modifying</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // only modifying</li>
+      <li>installer\teraterm.iss
+        <ul>
+          <li>version up AppVer and add "RC"</li>
+          <li>comment out snapshot</li>
+          <li>change called batch files</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>Increment the year of last publication of copyright notice if it is first release in this year.
+    <ul>
+      <li>teraterm\keycode\keycode-version.rc // VERSIONINFO</li>
+      <li>teraterm\teraterm\tt-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpcmn\ttpcmn-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpdlg\ttpdlg.rc // dialog</li>
+      <li>teraterm\ttpfile\ttpfile-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpmacro\ttm-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpset\ttpset-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttptek\ttptek-version.rc // VERSIONINFO</li>
+      <li>ttssh2\ttxssh\ttxssh.rc // dialog</li>
+      <li>ttssh2\ttxssh\ttxssh-version.rc // VERSIONINFO</li>
+      <li>ttpmenu\ttpmenu.rc // dialog, VERSIONINFO</li>
+      <li>TTProxy\TTProxy.rc // dialog, VERSIONINFO(en), VERSIONINFO(ja)</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // VERSIONINFO</li>
+      <li>installer\teraterm.iss</li>
+      <li>installer\release\license.txt // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\en\html\index.html</li>
+      <li>doc\en\html\about\copyright.html // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\en\html\macro\index.html</li>
+      <li>doc\ja\html\index.html</li>
+      <li>doc\ja\html\about\copyright.html // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\ja\html\macro\index.html</li>
+    </ul>
+  </li>
+  <li>Check latest libraries and tools.
+    <ul>
+      <li>Visual Studio<br />
+          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
+      <li>Inno Setup<br />
+          http://www.jrsoftware.org/isdl.php</li>
+      <li>Oniguruma<br />
+          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
+      <li>OpenSSL<br />
+          http://www.openssl.org/</li>
+      <li>zlib<br />
+          http://www.zlib.net/</li>
+      <li>PuTTY<br />
+          http://www.chiark.greenend.org.uk/~sgtatham/putty/</li>
+      <li>SFMT<br />
+          http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</li>
+      <li>CygTerm<br />
+          https://googledrive.com/host/0B1s-dM6d6yC4fmhEZ3c0VTNFWEFtV3daUlRGQmFHVnBmVHRybUNnUVliNWktNDRlZ2NnZTQ/index-e.html</li>
+    </ul>
+  </li>
+  <li>Check the document files.</li>
+  <li>Increase the software version and modify date.
+    <ul>
+      <li>teraterm.iss<br />
+          remove "RC" from AppVer</li>
+      <li>html/about/hisotry.html</li>
+    </ul>
+    Note: Don't update the version number until the release, because the installer does not overwrite file when versions are same.<br />
+    Note: By way of exception, CygTerm+ always upgrades not regarding Tera Term release process when the patch is committed. The release date is the day committed by a developer. The suffix of CygTerm+ version is patchlevel, and then a user can get gcc compiler for free.
+  </li>
+  <li>When CygTerm+ is changed from previous version, please build the software with 64bit Cygwin and replace cygterm\cygterm+-x86_64\cygterm.exe.</li>
+  <li>Evaluate executable program file.
+    <ul>
+      <li>Make installer package<br />
+          Open "teraterm\installer\teraterm.iss" with ISTool and call [Project]-[Compile Setup] with InnoSetup.</li>
+      <li>Test Tera Term installation and evaluate it.</li>
+    </ul>
+  </li>
+  <li>Create SVN tag.<br />
+      The naming rule is `teraterm-version'(ex. teraterm-4_106).<br />
+<pre>
+svn copy -m "Release 4.106" svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106
+</pre>
+  </li>
+  <li>Re-checkout from svn tag.</li>
+  <li>Make installer package
+    <ul>
+      <li>Edit "teraterm\installer\teraterm.iss"
+<pre>
+#define AppVer "4.???"
+;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+
+[InnoIDE_PreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[InnoIDE_PostCompile]
+Name: makearchive.bat; Parameters: release
+
+[PreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[PostCompile]
+Name: makearchive.bat; Parameters: release
+
+[_ISToolPreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[_ISToolPostCompile]
+Name: makearchive.bat; Parameters: release
+</pre>
+      </li>
+      <li>Open "teraterm\installer\teraterm.iss" with ISTool and call [Project]-[Compile Setup] with InnoSetup.</li>
+    </ul>
+  </li>
+  <li>Update OSDN project site.
+    <ul>
+      <li>Add new release.</li>
+      <li>Submit news.</li>
+    </ul>
+  </li>
+  <li>Announce release to mailing list(in Japan).</li>
+  <li>Update OSDN project home page.</li>
+  <li>Delete snapshots.</li>
+  <li>Announce release to Twitter.<br />
+      https://twitter.com/Tera_Term<br />
+      Post release announcement and pin.</li>
+  </li>
+  <li>Update Chocolatey</li>
+</ol>
+
+</body>
+</html>

Modified: branches/4-stable/doc/en/teraterm.hhc
===================================================================
--- branches/4-stable/doc/en/teraterm.hhc	2022-01-09 12:33:14 UTC (rev 9683)
+++ branches/4-stable/doc/en/teraterm.hhc	2022-01-12 16:09:55 UTC (rev 9684)
@@ -582,7 +582,7 @@
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="For developer">
-			<param name="Local" value="html\reference\develop.txt">
+			<param name="Local" value="html\reference\develop.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<UL>

Modified: branches/4-stable/doc/en/teraterm.hhp
===================================================================
--- branches/4-stable/doc/en/teraterm.hhp	2022-01-09 12:33:14 UTC (rev 9683)
+++ branches/4-stable/doc/en/teraterm.hhp	2022-01-12 16:09:55 UTC (rev 9684)
@@ -170,7 +170,7 @@
 HlpRefRe=html\reference\RE.txt
 HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
-HlpRefDev=html\reference\develop.txt
+HlpRefDev=html\reference\develop.html
 HlpRefPutty=html\reference\PuTTY-LICENSE.txt
 HlpRefSource=html\reference\sourcecode.html
 HlpRefOniguruma=html\reference\Oniguruma-LICENSE.txt

Modified: branches/4-stable/doc/ja/html/index.html
===================================================================
--- branches/4-stable/doc/ja/html/index.html	2022-01-09 12:33:14 UTC (rev 9683)
+++ branches/4-stable/doc/ja/html/index.html	2022-01-12 16:09:55 UTC (rev 9684)
@@ -144,7 +144,7 @@
  <LI><A HREF="reference/PuTTY-LICENSE.txt">PuTTY \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/argon2-LICENSE.txt">The reference C implementation of Argon2 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">CygTerm+ \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
- <LI><A HREF="reference/develop.txt">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A>
+ <LI><A HREF="reference/develop.html">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A>
  <UL>
    <LI>CMake\x83r\x83\x8B\x83h\x83V\x83X\x83e\x83\x80\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x83r\x83\x8B\x83h(experimental)</LI>
    <UL>

Added: branches/4-stable/doc/ja/html/reference/develop.html
===================================================================
--- branches/4-stable/doc/ja/html/reference/develop.html	                        (rev 0)
+++ branches/4-stable/doc/ja/html/reference/develop.html	2022-01-12 16:09:55 UTC (rev 9684)
@@ -0,0 +1,594 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<HTML>
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<TITLE>Tera Term \x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</TITLE>
+<META http-equiv="Content-Style-Type" content="text/css">
+<link rel="stylesheet" href="../style.css" type="text/css">
+</HEAD>
+<BODY>
+
+<h1 class="center">Tera Term \x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</h1>
+
+<ol>
+  <li><a href="#environment">\x8AJ\x94\xAD\x8A‹\xAB</a></li>
+  <li><a href="#library">\x83\x89\x83C\x83u\x83\x89\x83\x8A</a></li>
+  <li><a href="#committer">SVN \x83R\x83~\x83b\x83^\x81[\x82ւ̒\x8D\x88\xD3</a></li>
+  <li><a href="#ini-entry">TERATERM.INI \x82ւ̍\x80\x96ڒlj\xC1</a></li>
+  <li><a href="#menu-id">\x83\x81\x83j\x83\x85\x81[ID\x92lj\xC1\x8E\x9E\x82̖\xBD\x96\xBC\x8BK\x91\xA5</a></li>
+  <li><a href="#add-macro-command">\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x92lj\xC1\x8E\x9E\x82̍\xEC\x8Bƃ\x8A\x83X\x83g</a></li>
+  <li><a href="#build-library">\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-teraterm">Tera Term\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-teraterm-menu">TeraTerm Menu\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-ttxkanjimenu">TTXKanjiMenu\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-ttproxy">TTProxy\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-ttssh">TTSSH\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-cygterm">CygTerm\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-ttxsamples">TTXSamples\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-htmlhelp">\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#release">\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@</a></li>
+</ol>
+
+<hr>
+
+<h2 id="environment">\x8AJ\x94\xAD\x8A‹\xAB</h2>
+
+<ul>
+  <li>OS
+    <ul>
+      <li>Windows XP Professional</li>
+      <li>Windows 8 Pro</li>
+      <li>Windows 8.1 Pro</li>
+      <li>Windows 10 Pro</li>
+    </ul>
+  </li>
+  <li>Tera Term Project \x82Ń\x8A\x83\x8A\x81[\x83X\x82Ɏg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x83R\x83\x93\x83p\x83C\x83\x89
+    <ul>
+      <li>Visual Studio 2005 SP1 (Standard Edition \x88ȏ\xE3)
+        <ul>
+          <li>Service Pack 1 (VS80sp1-KB926601-X86-ENU.exe)</li>
+          <li>Microsoft Visual Studio 2005 Service Pack 1 MFC \x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x8DX\x90V\x83v\x83\x8D\x83O\x83\x89\x83\x80 (VS80sp1-KB2538218-v2-X86-INTL.exe)</li>
+          <li>Windows Vista \x88ȏ\xE3\x82Ńr\x83\x8B\x83h\x82\xB7\x82\xE9\x8Fꍇ\x82́AVisual Studio 2005 Service Pack 1 Update for Windows Vista (VS80sp1-KB932236-X86-JPN.exe)</li>
+          <li>Windows Server 2003 R2 Platform SDK(Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1)<br />
+              \x92\x8D: Visual Studio 2005 Standard Edition\x82ł́AOpenSSL \x82̃r\x83\x8B\x83h\x82\xAA\x8E\xB8\x94s\x82\xB5\x82܂\xB7\x81BWindows Server 2003 R2 Platform SDK \x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x81A"Crypt32.Lib"\x82\xF0\x83\x8A\x83\x93\x83N\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xA8\x82\xAD\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B<br />
+              Platform SDK \x82\xCC INCLUDE, LIB \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xAA\x97D\x90悳\x82\xEA\x82\xE9\x82悤\x81AC:\Program Files\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat \x82\xCC INCLUDE \x82\xA8\x82\xE6\x82\xD1 LIB \x82̐擪\x82ɒNjL\x82\xB5\x82܂\xB7\x81B<br />
+              <pre>
+e.g. INCLUDE "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include"
+     LIB     "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib"
+              </pre>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x83R\x83\x93\x83p\x83C\x83\x89
+    <ul>
+      <li>Visual Studio 2005 (Express Edition\x82\xCDTera Term 4.103\x82\xA9\x82\xE7\x91Ή\x9E)
+        <ul>
+          <li>with SDK 7.0
+            <ul>
+              <li>Windows Server 2003 R2 Platform SDK (= Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1) (5.2.3790.2075.51.PlatformSDK_Svr2003R2_rtm.img)<br />
+                  \x92\x8D: Microsoft\x82̃T\x83C\x83g\x82\xA9\x82\xE7\x82͓\xFC\x8E\xE8\x95s\x89”\(2019/04/07\x8E\x9E\x93_)</li>
+            </ul>
+          </li>
+          <li>with SDK 7.1
+            <ul>
+              <li>Microsoft Windows SDK for Windows 7 and .NET Framework 4 (GRMSDK_EN_DVD.iso)</li>
+              <li>Visual Studio 2005\x82ŗ\x98\x97p\x82\xB7\x82\xE9\x82ɂ\xCDKB949009(VS80sp1-KB949009-X86-INTL.exe)\x82\xA9KB980422(VS80sp1-KB980422-x86-INTL.exe)\x82\xAA\x95K\x97v<br />
+                  \x92\x8D: KB949009,KB980422\x82\xCDMicrosoft\x82̃T\x83C\x83g\x82\xA9\x82\xE7\x93\xFC\x8E\xE8\x95s\x89”\</li>
+            </ul>
+            Windows95\x82ł\xE0\x93\xAE\x8D삷\x82\xE9\x83o\x83C\x83i\x83\x8A\x82\xF0\x83r\x83\x8B\x83h\x89”\
+          </li>
+        </ul>
+      </li>
+      <li>Visual Studio 2008 SP1 (Standard Edition \x88ȏ\xE3)<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
+      </li>
+      <li>Visual Studio 2010 SP1 (Professional Edition \x88ȏ\xE3)<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
+      </li>
+      <li>Visual Studio 2012 Update 4 (Professional Edition \x88ȏ\xE3)<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br />
+          Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v110_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </li>
+      <li>Visual Studio Community 2013 Update 5<br />
+        <ul>
+          <li>MFC MBCS DLL \x83A\x83h\x83I\x83\x93 (vc_mbcsmfc.exe)</li>
+        </ul>
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br />
+          Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v120_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </li>
+      <li>Visual Studio Community 2015 Update 3<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br />
+          Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v140_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </li>
+      <li>Visual Studio Community 2017<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br />
+          Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v141_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </li>
+      <li>Visual Studio Community 2019<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
+      </li>
+    </ul>
+  </li>
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89
+    <ul>
+      <li>Inno Setup 5.6.1 ANSI (http://www.jrsoftware.org/isinfo.php)
+        <ul>
+          <li>Inno Setup Preprocessor</li>
+        </ul>
+      </li>
+      <li>ISTool 5.3.0.1 (https://sourceforge.net/projects/istool/)</li>
+    </ul>
+  </li>
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>Cygwin \x8DŐV\x94\xC5(v4.105\x82\xA9\x82\xE7CygTerm+\x82\xCDVista\x88ȍ~\x91Ή\x9E\x82ƂȂ\xC1\x82\xBD\x82\xBD\x82\xDF)</li>
+      <li>ActivePerl 5.10 \x88ȏ\xE3 \x82\xE0\x82\xB5\x82\xAD\x82\xCD Strawberry Perl 5.30.1.1 \x88ȏ\xE3<br />
+          OpenSSL \x82̃R\x83\x93\x83p\x83C\x83\x8B\x81A\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x83t\x83@\x83C\x83\x8B\x82̕\xB6\x8E\x9A\x83R\x81[\x83h\x81E\x89\xFC\x8Ds\x83R\x81[\x83h\x95ϊ\xB7\x82ɕK\x97v\x82ł\xB7\x81B</li>
+      <li>Subversion for Windows (http://sourceforge.net/projects/win32svn/)<br />
+          \x83\\x81[\x83X\x82̃`\x83F\x83b\x83N\x83A\x83E\x83g\x82Ɏg\x82\xC1\x82\xBD svn \x82ƌ݊\xB7\x90\xAB\x82̂\xA0\x82\xE9\x83o\x81[\x83W\x83\x87\x83\x93\x81B<br />
+          libs\svn \x82։𓀂\xB5\x82܂\xB7\x81B("svnversion.exe" \x82\xAA libs\svn\bin \x82ɔz\x92u\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2)</li>
+      <li>Patch<br />
+          PATH \x82̒ʂ\xC1\x82\xBD\x82Ƃ\xB1\x82\xEB\x82\xC9 patch \x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82́Alibs\openssl_patch \x82\xC9 "patch.exe" \x82\xAA\x94z\x92u\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br />
+          https://gitforwindows.org/ (https://github.com/git-for-windows/git/releases/latest) \x82\xA9\x82\xE7\x82ł\xA0\x82\xEA\x82΁AGit-x.xx.x-32-bit.tar.bz2 \x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82ēW\x8AJ\x82\xB5\x81Ausr\bin \x93\xE0\x82\xCC patch.exe, msys-gcc_s-1.dll, msys-2.0.dll \x82\xF0\x83R\x83s\x81[\x82\xB5\x82܂\xB7\x81B</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h2 id="library">\x83\x89\x83C\x83u\x83\x89\x83\x8A</h2>
+
+<ul>
+  <li>Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)</li>
+  <li>OpenSSL 1.1.1k (http://www.openssl.org/)</li>
+  <li>zlib 1.2.11 (http://www.zlib.net/)</li>
+  <li>PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)</li>
+  <li>SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)</li>
+  <li>The reference C implementation of Argon2 20190702 (https://github.com/P-H-C/phc-winner-argon2)</li>
+</ul>
+
+
+<h2 id="committer">SVN \x83R\x83~\x83b\x83^\x81[\x82ւ̒\x8D\x88\xD3</h2>
+
+<p>
+SVN \x83\x8A\x83|\x83W\x83g\x83\x8A\x82͈\xEA\x94ʌ\xFC\x82\xAF\x82Ƃ͈Ⴂ\x81A\x88ȉ\xBA\x82̒ʂ\xE8\x82ł\xB7\x81B
+</p>
+<pre>
+svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable
+</pre>
+
+<p>
+\x83t\x83@\x83C\x83\x8B\x82\xF0\x95ʂ̃f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ŕҏW\x82\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br />
+\x83R\x83~\x83b\x83g\x82\xB5\x82\xBD\x82Ƃ\xAB\x82ɕʂ̐l\x82̏C\x90\xB3\x82\xF0\x8D폜\x82\xB5\x82Ă\xB5\x82܂\xA4\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
+</p>
+
+<p>
+\x83A\x83b\x83v\x83f\x81[\x83g\x81E\x83R\x83~\x83b\x83g\x8E\x9E\x82̒\x8D\x88\xD3<br />
+svn\x82̏\x88\x97\x9D\x82\xAA\x8E\xB8\x94s\x82\xB7\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x82̂ŁA\x83t\x83@\x83C\x83\x8B\x82\xF0\x83G\x83f\x83B\x83^\x93\x99\x82ŊJ\x82\xA2\x82\xBD\x82܂܂ōs\x82\xED\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<p>
+\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x95ҏW\x8E\x9E\x82̒\x8D\x88\xD3<br />
+\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B(installer\release\lang\*.lng)\x82͑\xBD\x8C\xBE\x8C\xEA\x91Ή\x9E\x83G\x83f\x83B\x83^(vim, EmEditor, Notepad++\x93\x99)\x82ŕҏW\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+
+<h2 id="ini-entry">TERATERM.INI \x82ւ̍\x80\x96ڒlj\xC1</h2>
+
+<p>
+\x8D\x80\x96ږ\xBC<br />
+\x82\xB7\x82ł\xC9 EnableFoo... \x82\xE2 DisableBar... \x82\xAA\x8D\xAC\x8D݂\xB5\x82Ă\xB5\x82܂\xC1\x82Ă\xA2\x82邪\x81A\x8D\xAC\x97\x90\x82\xB5\x82₷\x82\xA2\x81B<br />
+\x8D\xA1\x8C\xE3\x82\xCD Baz... \x82Ƃ\xA2\x82\xA4\x8C`\x8E\xAE\x82ɂ\xB7\x82\xE9\x82̂\xAA\x96]\x82܂\xB5\x82\xA2\x81B
+</p>
+
+
+<h2 id="menu-id">\x83\x81\x83j\x83\x85\x81[ID\x92lj\xC1\x8E\x9E\x82̖\xBD\x96\xBC\x8BK\x91\xA5</h2>
+
+<pre>
+1\x8C\x85\x96ڂ\xCD 5
+</pre>
+<pre>
+2\x8C\x85\x96ڂ\xCD
+  Tera Term VT \x83E\x83B\x83\x93\x83h\x83E\x82Ȃ\xE7  0
+  Tera Term TEK \x83E\x83B\x83\x93\x83h\x83E\x82Ȃ\xE7 1
+  TTSSH \x82Ȃ\xE7                   2
+  TTProxy \x82Ȃ\xE7                 3
+  TTXKanjiMenu \x82Ȃ\xE7            4
+</pre>
+<pre>
+3\x8C\x85\x96ڂ\xCD
+  [File] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7    1
+  [Edit] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7    2
+  [Setup] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7   3
+  [Control] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7 4
+  [Window] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7  8
+  [Help] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7    9
+</pre>
+
+<p>
+\x97\xE1\x81FFile\x94z\x89\xBA\x82\xC9TTSSH\x82̃\x81\x83j\x83\x85\x81[\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9
+</p>
+<pre>
+#define ID_SSHSCPMENU       52110
+</pre>
+
+
+<h2 id="add-macro-command">\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x92lj\xC1\x8E\x9E\x82̍\xEC\x8Bƃ\x8A\x83X\x83g</h2>
+
+<p>
+Tera Term\x83}\x83N\x83\x8D\x82\xF0\x90V\x90݂\xB7\x82\xE9\x82Ƃ\xAB\x82̍\xEC\x8BƎ菇\x82ɂ‚\xA2\x82āA\x88ȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<ul>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82̏C\x90\xB3
+    <ul>
+      <li>\x83R\x83}\x83\x93\x83h\x82̓\xE0\x95\x94 ID \x82\xF0\x8D̔Ԃ\xB7\x82\xE9\x81B\x81i\x81u\x93\xE0\x95\x94 ID\x81v\x82\xCD"helpid.h"\x82ɂ\xE0\x8Eg\x97p\x82\xB3\x82\xEA\x82\xE9\x81j<br />
+          ... teraterm/ttmacro/ttmparse.h</li>
+      <li>\x83R\x83}\x83\x93\x83h\x96\xBC\x82𑖍\xB8\x82\xB5\x82ē\xE0\x95\x94 ID \x82ɕϊ\xB7\x82\xB7\x82\xE9\x81B<br />
+          ... CheckReservedWord ＠ teraterm/ttmacro/ttmparse.c</li>
+      <li>\x83R\x83}\x83\x93\x83h\x82̓\xE0\x95\x94 ID \x82\xA9\x82\xE7\x8E\xC0\x8Dۂɏ\x88\x97\x9D\x82\xF0\x82\xB7\x82\xE9\x8A֐\x94\x82\xF0\x8CĂԁB<br />
+          ... ExecCmnd ＠ teraterm/ttmacro/ttl.c</li>
+      <li>\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x8A֐\x94\x82\xF0\x8D\xEC\x82\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>\x83w\x83\x8B\x83v(\x8C\xBE\x8Cꂲ\x82\xC6)
+    <ul>
+      <li>\x83R\x83}\x83\x93\x83h\x82̃w\x83\x8B\x83v\x82\xF0\x8D\xEC\x82\xE9\x81B<br />
+          ... doc/LANG/html/macro/command/hogefunc.html</li>
+      <li>\x83R\x83}\x83\x93\x83h\x88ꗗ\x83y\x81[\x83W\x82ɒlj\xC1\x82\xB7\x82\xE9\x81B<br />
+          ... doc/LANG/html/macro/command/index.html</li>
+      <li>\x83w\x83\x8B\x83v\x83g\x83s\x83b\x83N\x82ɒlj\xC1\x82\xB7\x82\xE9\x81B<br />
+          ... doc/LANG/teraterm.hhc</li>
+      <li>\x83w\x83\x8B\x83v\x83y\x81[\x83W\x82̃R\x83\x93\x83e\x83L\x83X\x83g ID \x82\xF0\x8D̔Ԃ\xB7\x82\xE9\x81B<br />
+          \x92l\x82\xCD \x83R\x83}\x83\x93\x83h\x82̓\xE0\x95\x94 ID + 92000\x81B<br />
+          ... teraterm/common/helpid.h</li>
+      <li>\x83R\x83\x93\x83e\x83L\x83X\x83g ID \x82ƌĂяo\x82\xB7\x83t\x83@\x83C\x83\x8B\x82̃G\x83C\x83\x8A\x83A\x83X\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
+          \x83e\x83L\x83X\x83g\x83G\x83f\x83B\x83^\x82Œ\xBC\x90ڊJ\x82\xAB\x81A[ALIAS]\x82\xC9HTML\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9\x81B<br />
+          ... doc/LANG/teraterm.hhp</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h2 id="build-library">\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<ul>
+  <li>PuTTY (used by TTSSH)
+    <ol>
+      <li>PuTTY \x82̃\\x81[\x83X\x82\xF0 libs/putty \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B<br />
+          ttssh \x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x94z\x89\xBA\x82\xCC putty \x83v\x83\x8D\x83W\x83F\x83N\x83g\x82ɂ\xE6\x82\xE8\x95K\x97v\x82ȋ@\x94\\x82݂̂\xAA\x90ÓI\x83\x89\x83C\x83u\x83\x89\x83\x8A\x89\xBB\x82\xB3\x82\xEA\x81Attxssh.dll \x82Ƀ\x8A\x83\x93\x83N\x82\xB3\x82\xEA\x82邽\x82߁A\x93W\x8AJ\x82\xB7\x82邾\x82\xAF\x82ł悢\x81B</li>
+    </ol>
+  </li>
+  <li>Oniguruma (used by Tera Term Macro)
+    <ol>
+      <li>oniguruma \x82̃\\x81[\x83X\x82\xF0 libs/oniguruma \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildoniguruma6.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>OpenSSL (used by TTSSH)
+    <ol>
+      <li>openssl \x82̃\\x81[\x83X\x82\xF0 libs/openssl \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+      <li> OpenSSL 1.0.0e \x88ȍ~\x82ŁAlibs/openssl/Makefile.bak \x82\xAA\x8Dŏ\x89\x82\xA9\x82瑶\x8D݂\xB7\x82\xE9\x8Fꍇ\x82́A\x88\xEA\x93x\x82\xBE\x82\xAF\x8E蓮\x82ō폜\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B</li>
+      <li>\x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildopenssl11.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>Zlib (used by TTSSH)
+    <ol>
+      <li>zlib \x82̃\\x81[\x83X\x82\xF0 libs/zlib \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildzlib.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>SFMT (used by Tera Term Macro)
+    <ol>
+      <li>SFMT \x82̃\\x81[\x83X\x82\xF0 libs/SFMT \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81AbuildSFMT.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95K\x97v\x82ɉ\x9E\x82\xB6\x82\xC4 libs/SFMT/SFMT_version_for_teraterm.h \x82̃o\x81[\x83W\x83\x87\x83\x93\x94ԍ\x86\x82\xF0\x8FC\x90\xB3\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>The reference C implementation of Argon2 (used by TTSSH)
+    <ol>
+      <li>argon2 \x82̃\\x81[\x83X\x82\xF0 libs/argon2 \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B<br />
+          argon2 \x83\x8A\x83t\x83@\x83\x8C\x83\x93\x83X\x8E\xC0\x91\x95\x82ɂ͐ÓI\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82𐶐\xAC\x82\xB7\x82\xE9\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@\x83C\x83\x8B\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82Ȃ\xA2\x81B<br />
+          ttssh \x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x94z\x89\xBA\x82\xCC argon2 \x83v\x83\x8D\x83W\x83F\x83N\x83g\x82ɂ\xE6\x82\xE8\x90ÓI\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x81Attxssh.dll \x82Ƀ\x8A\x83\x93\x83N\x82\xB3\x82\xEA\x82邽\x82߁A\x93W\x8AJ\x82\xB7\x82邾\x82\xAF\x82ł悢\x81B</li>
+    </ol>
+  </li>
+</ul>
+
+<h2 id="build-teraterm">Tera Term\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+Tera Term\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B<br />
+\x83r\x83\x8B\x83h\x82ɂ\xCDVisual Studio 2005 Standard Edition\x88ȏオ\x95K\x97v\x82ł\xB7\x81B\x81iVisual Studio 2005 Express Edition\x82͕s\x89j
+</p>
+
+<ol>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82\xF0OSDN(https://ja.osdn.net/projects/ttssh2/)\x82\xA9\x82\xE7\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB7\x82\xE9\x81B</li>
+  <li>teraterm\visualc\ttermpro.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B<br />
+      .sln\x83t\x83@\x83C\x83\x8B\x82̉\xFC\x8Ds\x83R\x81[\x83h\x82\xAA"LF"\x82ɂȂ\xC1\x82Ă\xA2\x82\xE9\x82ƁAVisual Studio\x82\xAA\x8BN\x93\xAE\x82\xB5\x82Ȃ\xA2\x82̂Œ\x8D\x88ӊ肢\x82܂\xB7\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6teraterm \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɏ\xC0\x8Ds\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-teraterm-menu">TeraTerm Menu\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<ol>
+  <li>Checkout TeraTerm Menu source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>ttpmenu\ttpmenu.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6 ttpmenu \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9 ttpmenu.exe \x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-ttxkanjimenu">TTXKanjiMenu\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<ol>
+  <li>Checkout TeraTerm Menu source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>TTXKanjiMenu\ttxkanjimenu.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6 TTXKanjiMenu \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9 ttxkanjimenu.dll \x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-ttproxy">TTProxy\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+TTProxy\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B<br />
+\x83r\x83\x8B\x83h\x82ɂ\xCDVisual Studio 2005(VC++8.0)\x82\xAA\x95K\x97v\x82ł\xB7\x81B
+</p>
+
+<ol>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82\xF0OSDN(https://ja.osdn.net/projects/ttssh2/)\x82\xA9\x82\xE7\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB7\x82\xE9\x81B</li>
+  <li>TTProxy\TTProxy.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6 TTProxy \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9DLL\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-ttssh">TTSSH\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+TTSSH\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B<br />
+\x83r\x83\x8B\x83h\x82ɂ\xCDVisual Studio 2005(VC++8.0)\x81AActivePerl\x82\xAA\x95K\x97v\x82ł\xB7\x81B
+</p>
+
+<p>
+TTSSH\x92P\x91̂̃r\x83\x8B\x83h\x82\xCD VS2005 Express Edition \x82ł\xE0\x89”\\x82ł\xB7\x81Bttpcmn.lib\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB7\x82邽\x82߁ATera Term\x82̃r\x83\x8B\x83h\x82\xF0\x8E\x96\x91O\x82ɍs\x82\xC1\x82Ă\xA8\x82\xAD\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81BVS2005 Express Edition\x82ł\xCDTera Term\x82̃r\x83\x8B\x83h\x82͂ł\xAB\x82܂\xB9\x82񂪁Attpcmn.lib\x82͍쐬\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
+</p>
+
+<p>
+VS2008 Express Edition\x82Ńr\x83\x8B\x83h\x82\xB7\x82\xE9\x82ƁA.rc\x83t\x83@\x83C\x83\x8B\x82ʼn\xBA\x8BL\x82̃G\x83\x89\x81[\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82܂\xB7\x81B<br />
+.\ttxssh.rc(10) : fatal error RC1015: cannot open include file 'afxres.h'.<br />
+\x96{\x8C\xBB\x8Fۂ\xF0\x89\xF1\x94\xF0\x82\xB7\x82\xE9\x82ɂ́A.rc\x83t\x83@\x83C\x83\x8B\x82\xF0\x83e\x83L\x83X\x83g\x83G\x83f\x83B\x83^\x82ŊJ\x82\xAB\x81Aafxres.h\x82\xCCinclude\x82\xF0\x8D폜\x82\xB5\x81A\x90V\x8BK\x82\xC92\x8Ds\x82\xF0\x92lj\xC1\x82\xB5\x82܂\xB7\x81B<br />
+</p>
+<pre>
+- #include "afxres.h"
++ #include <windows.h>
++ #define IDC_STATIC -1
+</pre>
+
+<ol>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82\xF0OSDN(https://ja.osdn.net/projects/ttssh2/)\x82\xA9\x82\xE7\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB7\x82\xE9\x81B</li>
+  <li>ttssh2\ttssh.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6ttssh2\ttxssh \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9DLL\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-cygterm">CygTerm\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+CygTerm\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<ol>
+  <li>Cygwin(https://www.cygwin.com/)\x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9\x81B</li>
+  <li>Cygwin\x82̃V\x83F\x83\x8B\x82\xF0\x8BN\x93\xAE\x82\xB5\x81Acygterm \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ֈړ\xAE\x82\xB7\x82\xE9\x81B
+<pre>
+# cd cygterm
+</pre>
+  </li>
+  <li>CygTerm\x82\xF0\x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB7\x82\xE9\x81B
+<pre>
+# make
+</pre>
+  </li>
+</ol>
+
+
+<h2 id="build-ttxsamples">TTXSamples\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+\x83\x8A\x83|\x83W\x83g\x83\x8A\x82\xCCTTXSamples\x82\xC9 Tera Term Extension (TTX)\x82̃T\x83\x93\x83v\x83\x8B\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81BTTX\x82\xF0\x8D\xEC\x82\xE9\x8Dۂ̎Q\x8Dl\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br />
+TTXSamples\x82̃r\x83\x8B\x83h\x82ɂ\xCDVisual Studio 2005(VC++8.0)\x82\xAA\x95K\x97v\x82ł\xB7\x81BTera Term\x96{\x91̂Ƃ͈Ⴂ\x81AExpress Edition\x82ł\xE0\x83r\x83\x8B\x83h\x89”\\x82ł\xB7\x81B
+</p>
+
+<ol>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82\xF0OSDN(https://ja.osdn.net/projects/ttssh2/)\x82\xA9\x82\xE7\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB7\x82\xE9\x81B</li>
+  <li>TTXSamples\TTXSamples.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6 TTXSamples \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9DLL\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+<p>
+\x8AeTTX\x82̏ڍׂɂ‚\xA2\x82ẮA\x83v\x83\x8D\x83W\x83F\x83N\x83g\x93\xE0\x82\xCCReadMe-ja.txt\x82\xF0\x8EQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+
+
+<h2 id="build-htmlhelp">\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<ol>
+  <li>HTML Help Compiler \x82\xF0\x93\xFC\x8E肷\x82\xE9\x81B<br />
+      Visual Studio (2017 \x88ȍ~) \x82\xF0 "C++ MFC" \x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82ăC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9\x82ƁAHTML Help Compiler (hhc.exe) \x82\xAA\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+  <li>doc\makechm.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="release">\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@</h2>
+
+<p>
+\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<ol>
+  <li>RC \x8D쐬\x8E\x9E\x82Ƀo\x81[\x83W\x83\x87\x83\x93\x82\xF0\x88\xEA\x82ƒC\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9\x81B<br />
+      \x88\xEA\x94ʂɃe\x83X\x83g\x82\xF0\x8CĂт\xA9\x82\xAF\x81A\x8B\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82Ƃ̓\xAF\x8E\x9E\x8E\xC0\x8Ds\x82\xAA\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82邽\x82߁A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ƃ\xB7\x82\xE9(cf. TT_FILEMAPNAME \x92\xE8\x8B`)\x81B
+    <ul>
+      <li>teraterm\common\tt-version.h</li>
+      <li>ttssh2\ttxssh\ttxssh-version.h</li>
+      <li>ttpmenu\ttpmenu.rc // only modifying</li>
+      <li>TTProxy\TTProxy.rc // only modifying</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // only modifying</li>
+      <li>installer\teraterm.iss
+        <ul>
+          <li>AppVer \x82\xF0\x8Fグ\x81A"RC" \x82\xF0\x92lj\xC1</li>
+          <li>snapshot \x82\xF0 \x83R\x83\x81\x83\x93\x83g\x83A\x83E\x83g</li>
+          <li>\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82̌Ăяo\x82\xB5\x82\xF0\x8FC\x90\xB3</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>\x82\xB1\x82̔N\x82ɂ\xA8\x82\xAF\x82\xE9\x8Dŏ\x89\x82̃\x8A\x83\x8A\x81[\x83X\x82̏ꍇ\x82́A\x92\x98\x8D쌠\x95\\x8E\xA6\x82́u\x8DŌ\xE3\x82̔\xAD\x8Ds\x82̔N\x81v\x82\xF0\x83C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>teraterm\keycode\keycode-version.rc // VERSIONINFO</li>
+      <li>teraterm\teraterm\tt-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpcmn\ttpcmn-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpdlg\ttpdlg.rc // dialog</li>
+      <li>teraterm\ttpfile\ttpfile-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpmacro\ttm-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpset\ttpset-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttptek\ttptek-version.rc // VERSIONINFO</li>
+      <li>ttssh2\ttxssh\ttxssh.rc // dialog</li>
+      <li>ttssh2\ttxssh\ttxssh-version.rc // VERSIONINFO</li>
+      <li>ttpmenu\ttpmenu.rc // dialog, VERSIONINFO</li>
+      <li>TTProxy\TTProxy.rc // dialog, VERSIONINFO(en), VERSIONINFO(ja)</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // VERSIONINFO</li>
+      <li>installer\teraterm.iss</li>
+      <li>installer\release\license.txt // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\en\html\index.html</li>
+      <li>doc\en\html\about\copyright.html // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\en\html\macro\index.html</li>
+      <li>doc\ja\html\index.html</li>
+      <li>doc\ja\html\about\copyright.html // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\ja\html\macro\index.html</li>
+    </ul>
+  </li>
+  <li>\x88ˑ\xB6\x83\x89\x83C\x83u\x83\x89\x83\x8A\x81A\x83c\x81[\x83\x8B\x81A\x83C\x83\x93\x83|\x81[\x83g\x8C\xB3\x82̍ŐV\x94ł\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>Visual Studio<br />
+          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
+      <li>Inno Setup<br />
+          http://www.jrsoftware.org/isdl.php</li>
+      <li>Oniguruma<br />
+          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
+      <li>OpenSSL<br />
+          http://www.openssl.org/</li>
+      <li>zlib<br />
+          http://www.zlib.net/</li>
+      <li>PuTTY<br />
+          http://www.chiark.greenend.org.uk/~sgtatham/putty/</li>
+      <li>SFMT<br />
+          http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</li>
+      <li>CygTerm<br />
+          https://googledrive.com/host/0B1s-dM6d6yC4fmhEZ3c0VTNFWEFtV3daUlRGQmFHVnBmVHRybUNnUVliNWktNDRlZ2NnZTQ/index-e.html</li>
+    </ul>
+  </li>
+  <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>\x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82̐ݒ荀\x96ځEUI\x82̂Ȃ\xA2\x93\xC1\x95ʃI\x83v\x83V\x83\x87\x83\x93\x81E\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x81E\x90V\x8BK\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ȂǁA\x91Ή\x9E\x82\xB7\x82\xE9\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82ɘR\x82ꂪ\x82Ȃ\xA2\x82\xA9\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82̏\x91\x82\xAB\x96Y\x82\xEA\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B<br />
+       \x82\xA8\x82\xA8\x82ނ˕ύX\x82\xB5\x82\xBD\x8F\x87\x82ɒNjL\x82\xB3\x82\xEA\x82\xE9\x95ύX\x97\x9A\x97\xF0\x82̏\x87\x94Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̎w\x90j\x82Ƃ\xB5\x82ẮA\x83^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83V\x83\x87\x83\x93\x8A֌W\x81E\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ă̕ύX\x81E\x83}\x83N\x83\x8D\x82̏\x87\x81B</li>
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x8D\xB7\x95\xAA\x82\xAA\x96|\x96󂳂\xEA\x82Ă\xA2\x82邱\x82Ƃ\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>\x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8Fグ\x81A\x93\xFA\x95t\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>teraterm.iss<br />
+          AppVer \x82\xA9\x82\xE7 RC \x82\xF0\x8D폜</li>
+      <li>html/about/hisotry.html</li>
+    </ul>
+    CygTerm+ \x82͗\xE1\x8AO\x82ŁA\x83\x8A\x83\x8A\x81[\x83X\x82Ƃ͊֌W\x82Ȃ\xAD\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x8Fオ\x82\xE9\x81B<br />
+    \x83p\x83b\x83`\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82\xE9\x82Ƒ\xA6\x83\x8A\x83\x8A\x81[\x83X\x88\xB5\x82\xA2\x82ɂȂ\xE8\x81A\x83\x8A\x83\x8A\x81[\x83X\x93\xFA\x82͂\xBB\x82̓\xFA\x95t\x82ƂȂ\xE9\x81B<br />
+    \x82\xB1\x82\xEA\x82́A\x83o\x81[\x83W\x83\x87\x83\x93\x82̖\x96\x94\xF6\x82\xAA patchlevel \x82ł\xA0\x82\xE8\x81A\x83R\x83\x93\x83p\x83C\x83\x89\x82̓\xFC\x8E肪\x97e\x88ՂȂ\xBD\x82߁B
+  </li>
+  <li>\x91O\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82\xA9\x82\xE7CygTerm+\x82ɕύX\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x82́A64bit Cygwin\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xC4 cygterm\cygterm+-x86_64\cygterm.exe \x82̍\xB7\x82\xB5\x91ւ\xA6\x82\xF0\x8Ds\x82\xA4\x81B</li>
+  <li>\x93\xAE\x8D\xEC\x8Am\x94F\x82\xF0\x82\xB7\x82\xE9
+    <ul>
+      <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
+          ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A[Project]-[Compile Setup]\x82ō쐬\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+      <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xA8\x82\xE6\x82ю\xC0\x8Ds\x82\xF0\x83e\x83X\x83g\x82\xB7\x82\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>SVN \x82̃^\x83O\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
+      \x83^\x83O\x96\xBC\x82́uteraterm-\x83o\x81[\x83W\x83\x87\x83\x93\x81v\x81B\x82\xBD\x82Ƃ\xA6\x82΁Av4.106\x82Ȃ\xE7\x82\xCE"teraterm-4_106"\x81B<br />
+      <pre>
+svn copy -m "Release 4.106" svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106
+      </pre>
+  </li>
+  <li>\x83\x8A\x83\x8A\x81[\x83X\x97p\x82̃^\x83O\x82Ń`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB5\x92\xBC\x82\xB7\x81B</li>
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>teraterm\installer\teraterm.iss \x82\xF0\x95ҏW\x82\xB7\x82\xE9
+<pre>
+#define AppVer "4.???"
+;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+
+[InnoIDE_PreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[InnoIDE_PostCompile]
+Name: makearchive.bat; Parameters: release
+
+[PreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[PostCompile]
+Name: makearchive.bat; Parameters: release
+
+[_ISToolPreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[_ISToolPostCompile]
+Name: makearchive.bat; Parameters: release
+</pre>
+      </li>
+      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A[Project]-[Compile Setup]\x82ō쐬\x82\xB3\x82\xEA\x82\xE9</li>
+    </ul>
+  </li>
+  <li>OSDN \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>[\x83_\x83E\x83\x93\x83\x8D\x81[\x83h]-[\x8AǗ\x9D]-[\x90V\x8BK\x8D쐬]<br />
+          \x95ύX\x97\x9A\x97\xF0\x82\xF0\x93\xFC\x97͂\xB5\x82ă\x8A\x83\x8A\x81[\x83X\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B</li>
+      <li>[\x83j\x83\x85\x81[\x83X\x88ꗗ]-[\x90V\x8BK\x93o\x98^]<br />
+          \x83j\x83\x85\x81[\x83X\x8BL\x8E\x96\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>\x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g\x82ɃA\x83i\x83E\x83\x93\x83X\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83y\x81[\x83W\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83X\x83i\x83b\x83v\x83V\x83\x87\x83b\x83g\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B</li>
+  <li>Twitter \x82ɍ\x90\x92m\x82\xB7\x82\xE9\x81B<br />
+      https://twitter.com/Tera_Term<br />
+      \x83\x8A\x83\x8A\x81[\x83X\x8D\x90\x92m\x82\xF0\x83c\x83C\x81[\x83g\x82\xB5\x82ČŒ肷\x82\xE9\x81B</li>
+  </li>
+  <li>Chocolatey \x82̓o\x98^\x82\xF0\x8DX\x90V</li>
+</ol>
+
+</body>
+</html>

Modified: branches/4-stable/doc/ja/teraterm.hhc
===================================================================
--- branches/4-stable/doc/ja/teraterm.hhc	2022-01-09 12:33:14 UTC (rev 9683)
+++ branches/4-stable/doc/ja/teraterm.hhc	2022-01-12 16:09:55 UTC (rev 9684)
@@ -591,7 +591,7 @@
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF">
-			<param name="Local" value="html\reference\develop.txt">
+			<param name="Local" value="html\reference\develop.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<UL>

Modified: branches/4-stable/doc/ja/teraterm.hhp
===================================================================
--- branches/4-stable/doc/ja/teraterm.hhp	2022-01-09 12:33:14 UTC (rev 9683)
+++ branches/4-stable/doc/ja/teraterm.hhp	2022-01-12 16:09:55 UTC (rev 9684)
@@ -178,7 +178,7 @@
 HlpRefRe=html\reference\RE.txt
 HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
-HlpRefDev=html\reference\develop.txt
+HlpRefDev=html\reference\develop.html
 HlpRefPutty=html\reference\PuTTY-LICENSE.txt
 HlpRefSource=html\reference\sourcecode.html
 HlpRefOniguruma=html\reference\Oniguruma-LICENSE.txt

Modified: branches/4-stable/libs/Refer to develop.txt
===================================================================
--- branches/4-stable/libs/Refer to develop.txt	2022-01-09 12:33:14 UTC (rev 9683)
+++ branches/4-stable/libs/Refer to develop.txt	2022-01-12 16:09:55 UTC (rev 9684)
@@ -1,3 +1,3 @@
 
-Refer to the ttssh2\doc\en\html\reference\develop.txt for these folders.
+Refer to the ttssh2\doc\en\html\reference\develop.html for these folders.
 

From scmnotify ＠ osdn.net  Thu Jan 13 01:16:38 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 13 Jan 2022 01:16:38 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2ODVdIGRldmVsb3AudHh0IOOCkiBIVE1M?=
 =?utf-8?b?IOOBq+WkieabtA==?=
Message-ID: <1642004198.496801.18550.nullmailer@users.osdn.me>

Revision: 9685
          https://osdn.net/projects/ttssh2/scm/svn/commits/9685
Author:   nmaya
Date:     2022-01-13 01:16:38 +0900 (Thu, 13 Jan 2022)
Log Message:
-----------
develop.txt を HTML に変更

記述が古い・誤っている・日英で異なる・trunk/4-stableで共通部分の記述が異なる、などはそのまま

Modified Paths:
--------------
    trunk/doc/en/html/index.html
    trunk/doc/en/teraterm.hhc
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/html/index.html
    trunk/doc/ja/teraterm.hhc
    trunk/doc/ja/teraterm.hhp
    trunk/libs/Refer to develop.txt

Added Paths:
-----------
    trunk/doc/en/html/reference/develop.html
    trunk/doc/ja/html/reference/develop.html

-------------- next part --------------
Modified: trunk/doc/en/html/index.html
===================================================================
--- trunk/doc/en/html/index.html	2022-01-12 16:09:55 UTC (rev 9684)
+++ trunk/doc/en/html/index.html	2022-01-12 16:16:38 UTC (rev 9685)
@@ -147,7 +147,7 @@
  <LI><A HREF="reference/PuTTY-LICENSE.txt">License of PuTTY</A></LI>
  <LI><A HREF="reference/argon2-LICENSE.txt">License of The reference C implementation of Argon2</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">License of CygTerm+</A></LI>
- <LI><A HREF="reference/develop.txt">For developer</A>
+ <LI><A HREF="reference/develop.html">For developer</A>
  <UL>
    <LI>build with CMake (experimental)</LI>
    <UL>

Added: trunk/doc/en/html/reference/develop.html
===================================================================
--- trunk/doc/en/html/reference/develop.html	                        (rev 0)
+++ trunk/doc/en/html/reference/develop.html	2022-01-12 16:16:38 UTC (rev 9685)
@@ -0,0 +1,602 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<HTML>
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<TITLE>Tera Term Development</TITLE>
+<META http-equiv="Content-Style-Type" content="text/css">
+<link rel="stylesheet" href="../style.css" type="text/css">
+</HEAD>
+<BODY>
+
+<h1 class="center">Tera Term Development</h1>
+
+<ol>
+  <li><a href="#environment">Development Environment</a></li>
+  <li><a href="#library">Libraries</a></li>
+  <li><a href="#committer">Notice for SVN committer</a></li>
+  <li><a href="#ini-entry">Add entry to TERATERM.INI</a></li>
+  <li><a href="#menu-id">Naming rule to add menu ID</a></li>
+  <li><a href="#add-macro-command">What to do when new macro command is added?</a></li>
+  <li><a href="#build-library">How to build Libraries</a></li>
+  <li><a href="#build-teraterm">How to build Tera Term</a></li>
+  <li><a href="#build-teraterm-menu">How to build TeraTerm Menu</a></li>
+  <li><a href="#build-ttxkanjimenu">How to build TTXKanjiMenu</a></li>
+  <li><a href="#build-ttproxy">How to build TTProxy</a></li>
+  <li><a href="#build-ttssh">How to build TTSSH</a></li>
+  <li><a href="#build-cygterm">How to build CygTerm</a></li>
+  <li><a href="#build-ttxsamples">How to build TTXSamples</a></li>
+  <li><a href="#build-htmlhelp">How to build HTML help file</a></li>
+  <li><a href="#release">How to release Tera Term installation package</a></li>
+</ol>
+
+<hr>
+
+<h2 id="environment">Development Environment</h2>
+
+<ul>
+  <li>OS
+    <ul>
+      <li>Windows XP Professional</li>
+      <li>Windows 8 Pro</li>
+      <li>Windows 8.1 Pro</li>
+      <li>Windows 10 Pro</li>
+    </ul>
+  </li>
+  <li>Compiler used for release in Tera Term Project
+    <ul>
+      <li>Visual Studio 2005 SP1 Standard Edition (or higher edition)
+        <ul>
+          <li>Service Pack 1 (VS80sp1-KB926601-X86-ENU.exe)</li>
+          <li>Microsoft Visual Studio 2005 Service Pack 1 MFC Security Update (VS80sp1-KB2538218-v2-X86-INTL.exe)</li>
+          <li>When Windows Vista or higher, Visual Studio 2005 Service Pack 1 Update for Windows Vista (VS80sp1-KB932232-X86-ENU.exe)</li>
+          <li>Windows Server 2003 R2 Platform SDK(Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1)<br />
+              Note: The OpenSSL will not able to build by using the Visual Studio 2005 Standard Edition. So, install the Windows Server 2003 R2 Platform SDK to link the "Crypt32.Lib" library.<br />
+              Configure the INCLUDE and LIB environment variables to be given priority for the SDK installation directory.
+              <pre>
+e.g. INCLUDE "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include"
+     LIB     "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib"
+              </pre>
+              Fix batch file C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>Supported Compiler
+    <ul>
+      <li>Visual Studio 2005 (Added support from Tera Term 4.103)
+        <ul>
+          <li>with SDK 7.0
+            <ul>
+              <li>Windows Server 2003 R2 Platform SDK (= Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1) (5.2.3790.2075.51.PlatformSDK_Svr2003R2_rtm.img)<br />
+                  Note: unavailable on Microsoft website (at Apr 07, 2019).</li>
+            </ul>
+          </li>
+          <li>with SDK 7.1
+            <ul>
+              <li>Microsoft Windows SDK for Windows 7 and .NET Framework 4 (GRMSDK_EN_DVD.iso)</li>
+              <li>To use with Visual Studio 2005, KB949009(VS80sp1-KB949009-X86-INTL.exe) or KB980422(VS80sp1-KB980422-x86-INTL.exe) is necessary.<br />
+                  Note: KB949009 and KB980422 are unavailable on Microsoft website.</li>
+            </ul>
+            built binary is able to run on Windows 95.
+          </li>
+        </ul>
+      </li>
+      <li>Visual Studio 2008 SP1 Standard Edition (or higher edition)<br />
+          Note: The executable program which was compiled by this version does not work on Windows NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio 2010 SP1 Professional Edition (or higher edition)<br />
+          Note: The executable program which was compiled by this version does not work on Windows 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio 2012 Update 4 Professional Edition (or higher edition)<br />
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio Community 2013 Update 5<br />
+        <ul>
+          <li>MFC MBCS DLL Add-on (vc_mbcsmfc.exe) is necessary.</li>
+        </ul>
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio Community 2015 Update 3<br />
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio Community 2017<br />
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>Visual Studio Community 2019<br />
+          Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+      </li>
+      <li>How to build with batch file:<br />
+          Please execute the batch file on command prompt of Visual Studio. Otherwise, please configure below environment variables.<br />
+          Please call "(x86) Native Tools Command Prompt" of your Visual Studio to register new PATH regarding the compiler path and VSINSTALLDIR variable.
+          <pre>
+Example:
+INCLUDE       C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;
+LIB           C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.1\lib\winv6.3\um\x86;
+PATH          C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Windows Kits\8.1\bin\x86
+VSINSTALLDIR  C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC
+          </pre>
+      </li>
+    </ul>
+  </li>
+  <li>Installer
+    <ul>
+      <li>Inno Setup 5.6.1 ANSI (http://www.jrsoftware.org/isinfo.php)
+        <ul>
+          <li>Inno Setup Preprocessor</li>
+        </ul>
+      </li>
+      <li>ISTool 5.3.0.1 (https://sourceforge.net/projects/istool/)</li>
+    </ul>
+  </li>
+  <li>Others
+    <ul>
+      <li>Cygwin the latest version (because CygTerm+ supports Vista or later from v4.105)</li>
+      <li>ActivePerl 5.10 or later version, Strawberry Perl 5.30.1.1 or later version<br />
+          converts character-code and return-code of documents for building OpenSSL.</li>
+      <li>Subversion for Windows (http://sourceforge.net/projects/win32svn/)<br />
+          Use the compatible version for check-outed svn version.<br />
+          Extract into libs\svn. ("svnversion.exe" is located in libs\svn\bin directory.)</li>
+<!--
+      <li>Cygwin 1.5.x (1.7.x \x82\xCD Windows 9x \x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82̂ŕs\x89\xC2)</li>
+      <li>ActivePerl 5.10 \x88ȏ\xE3 \x82܂\xBD\x82\xCD Strawberry perl 5.30.1.1 \x88ȏ\xE3<br />
+          \x83r\x83\x8B\x83h\x89ߒ\xF6\x82Ŏg\x97p\x82\xB5\x82܂\xB7<br />
+          <ul>
+            <li>OpenSSL \x82̃R\x83\x93\x83p\x83C\x83\x8B(\x95K\x90{)</li>
+            <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x83t\x83@\x83C\x83\x8B\x82̕\xB6\x8E\x9A\x83R\x81[\x83h\x81E\x89\xFC\x8Ds\x83R\x81[\x83h\x95ϊ\xB7(\x95K\x90{)</li>
+            <li>\x83\x8A\x83r\x83W\x83\x87\x83\x93\x94ԍ\x86\x8E擾 (perl\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x83\x8A\x83r\x83W\x83\x87\x83\x93\x94ԍ\x86\x82\xF0\x8E擾\x82\xB9\x82\xB8\x82Ƀr\x83\x8B\x83h\x82\xB5\x82܂\xB7)</li>
+          </ul>
+      </li>
+      <li>Subversion for Windows (http://sourceforge.net/projects/win32svn/)<br />
+          \x83\x8A\x83r\x83W\x83\x87\x83\x93\x94ԍ\x86\x8E擾\x8E\x9E\x82Ɏg\x97p\x82\xB5\x82܂\xB7<br />
+          svnrev_perl/toolinfo.txt \x82\xC9 svn.exe \x82̃t\x83\x8B\x83p\x83X\x82\xF0\x8BL\x8Fq\x82\xA2\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br />
+          \x8Fڂ\xB5\x82\xAD\x82\xCD svnrev_perl/readme.md \x82\xF0\x8EQ\x8FƂ\xAD\x82\xBE\x82\xB3\x82\xA2
+      </li>
+-->
+    </ul>
+  </li>
+</ul>
+
+
+<h2 id="library">Libraries</h2>
+
+<ul>
+  <li>Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)</li>
+  <li>OpenSSL 1.1.1k (http://www.openssl.org/)</li>
+  <li>zlib 1.2.11 (http://www.zlib.net/)</li>
+  <li>PuTTY 0.76 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)</li>
+  <li>SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)</li>
+  <li>cJSON 1.7.14 (https://github.com/DaveGamble/cJSON/)</li>
+  <li>The reference C implementation of Argon2 20190702 (https://github.com/P-H-C/phc-winner-argon2)</li>
+</ul>
+
+
+<h2 id="committer">Notice for SVN committer</h2>
+
+<p>
+SVN repository for committer is the following:
+</p>
+<pre>
+svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk
+</pre>
+
+<p>
+Should not edit checkout file in copying directory.<br />
+The other modification code may be deleted in SVN server when you commit checkout file. Also, fix it carefully when the conflicting occurs.
+</p>
+
+<p>
+Should not have opened checkout file.<br />
+SVN commit procedure may be failure while checkout file will have been opened.
+</p>
+
+<p>
+Edit language files<br />
+Use the text editor supporting multi languages(vim, EmEditor, Notepad++, etc) to edit the language files(installer\release\lang\*.lng).
+</p>
+
+
+<h2 id="ini-entry">Add entry to TERATERM.INI</h2>
+
+<p>
+Entry name<br />
+Unfortunately, the confusing entries such as EnableFoo... and DisableBar... are included.<br />
+It recommends that the new name like as Baz....
+</p>
+
+
+<h2 id="menu-id">Naming rule to add menu ID</h2>
+
+<pre>
+The first digit is 5.
+</pre>
+<pre>
+The second digit is:
+  Tera Term VT window         0
+  Tera Term TEK window        1
+  TTSSH                       2
+  TTProxy                     3
+  TTXKanjiMenu                4
+</pre>
+<pre>
+The third digit is:
+  [File] menu                 1
+  [Edit] menu                 2
+  [Setup] menu                3
+  [Control] menu              4
+  [Window] menu               8
+  [Help] menu                 9
+</pre>
+
+<p>
+Example: adding a TTSSH menu under File menu
+</p>
+<pre>
+#define ID_SSHSCPMENU       52110
+</pre>
+
+
+<h2 id="add-macro-command">What to do when new macro command is added?</h2>
+
+<ul>
+  <li>Coding
+    <ul>
+      <li>get a new number of command internal ID.<br />
+          ... teraterm/ttmacro/ttmparse.h</li>
+      <li>add a if statement to below function.<br />
+          ... CheckReservedWord ＠ teraterm/ttmacro/ttmparse.c</li>
+      <li>add a caller doing the macro command.<br />
+          ... ExecCmnd ＠ teraterm/ttmacro/ttl.c</li>
+      <li>make a function code for the macro command.</li>
+    </ul>
+  </li>
+  <li>Help topic
+    <ul>
+      <li>make the command help file.<br />
+          ... doc/LANG/html/macro/command/hogefunc.html</li>
+      <li>add the file to help topic.<br />
+          ... doc/LANG/teraterm.hhc</li>
+      <li>get a new number of context ID in help page.<br />
+          The value is internal ID + 92000.<br />
+          ... teraterm/common/helpid.h</li>
+      <li>make the alias between context ID and calling file.<br />
+          Open the .hhp file by using Text Editor, added a html line in [ALIAS] tag.<br />
+          ... doc/LANG/teraterm.hhp</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h2 id="build-library">How to build Libraries</h2>
+
+<ul>
+  <li>PuTTY (used by TTSSH)
+    <ol>
+      <li>Extract PuTTY source into libs/putty directory.</li>
+    </ol>
+  </li>
+  <li>Oniguruma (used by Tera Term Macro)
+    <ol>
+      <li>Extract oniguruma source into libs/oniguruma directory.</li>
+      <li>Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.</li>
+      <li>Move 'libs' directory on the command prompt. And run buildoniguruma6.bat.</li>
+    </ol>
+  </li>
+  <li>OpenSSL (used by TTSSH)
+    <ol>
+      <li>Extract openssl source into libs/openssl directory.</li>
+      <li>When the libs/openssl/Makefile.bak file exists on the OpenSSL 1.0.0e or later, delete the file only once</li>
+      <li>Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.</li>
+      <li>Move 'libs' directory on the command prompt. And run buildopenssl11.bat.</li>
+    </ol>
+  </li>
+  <li>Zlib (used by TTSSH)
+    <ol>
+      <li>Extract zlib source into libs/zlib directory.</li>
+      <li>Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.</li>
+      <li>Move 'libs' directory on the command prompt. And run buildzlib.bat.</li>
+    </ol>
+  </li>
+  <li>SFMT (used by Tera Term Macro)
+    <ol>
+      <li>Extract SFMT source into libs/SFMT directory.</li>
+      <li>Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.</li>
+      <li>Move 'libs' directory on the command prompt. And run buildSFMT.bat.</li>
+      <li>Modify version information in libs/SFMT/SFMT_version_for_teraterm.h if necessary.</li>
+    </ol>
+  </li>
+  <li>cJSON (used by TTXCheckUpdate plugin)
+    <ol>
+      <li>Extract cJSON source into libs/cJSON directory.</li>
+    </ol>
+  </li>
+  <li>The reference C implementation of Argon2 (used by TTSSH)
+    <ol>
+      <li>Extract argon2 source into libs/argon2 directory.</li>
+    </ol>
+  </li>
+</ul>
+
+<h2 id="build-teraterm">How to build Tera Term</h2>
+
+<p>
+To build Tera Term source code is shown in the following step:<br />
+And you should use Visual Studio 2005 Standard Edition later version to build Tera Term because Tera Term program links MFC library (Visual Studio 2005 Express Edition can't be used).
+</p>
+
+<ol>
+  <li>Checkout Tera Term source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open teraterm\visualc\ttermpro.sln with Visual Studio.<br />
+      The linefeed code of .sln file must be "CR+LF".</li>
+  <li>Build Tera Term solution.</li>
+  <li>Tera Term execution program will be generated in teraterm\visualc\bin directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-teraterm-menu">How to build TeraTerm Menu</h2>
+
+<ol>
+  <li>Checkout TeraTerm Menu source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open ttpmenu\ttpmenu.sln with Visual Studio.</li>
+  <li>Build ttpmenu solution.</li>
+  <li>ttpmenu.exe will be generated in Release directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-ttxkanjimenu">How to build TTXKanjiMenu</h2>
+
+<ol>
+  <li>Checkout TTXKanjiMenu source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open TTXKanjiMenu\ttxkanjimenu.sln with Visual Studio.</li>
+  <li>Build ttpmenu solution.</li>
+  <li>ttxkanjimenu.dll will be generated in TTXKanjiMenu directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-ttproxy">How to build TTProxy</h2>
+
+<p>
+To build TTProxy source code is shown in the following step:<br />
+And you need Visual Studio 2005(VC++8.0) to build.
+</p>
+
+<ol>
+  <li>Checkout TTProxy source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open TTProxy\TTProxy.sln with Visual Studio.</li>
+  <li>Build TTProxy solution.</li>
+  <li>TTProxy DLL module will be generated in TTProxy directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-ttssh">How to build TTSSH</h2>
+
+<p>
+To build TTSSH source code is shown in the following step:<br />
+And you need Visual Studio 2005(VC++8.0) and ActivePerl to build.
+</p>
+
+<p>
+VS2005 Express Edition is able to build TTSSH. TTSSH links to ttpcmn.lib and it must be created beforehand. VS2005 Express Edition cannot build Tera Term, but it can create ttpcmn.lib
+</p>
+
+<p>
+On VS2008 Express Edition, following error occurs:<br />
+.\ttxssh.rc(10) : fatal error RC1015: cannot open include file 'afxres.h'.<br />
+To avoid this error, edit ttxssh.rc file. Delete the line of "afxres.h", and add 2 lines.<br />
+</p>
+<pre>
+- #include "afxres.h"
++ #include <windows.h>
++ #define IDC_STATIC -1
+</pre>
+
+<ol>
+  <li>Checkout TTSSH source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open ttssh2\ttssh.sln with Visual Studio.</li>
+  <li>Build TTSSH solution.</li>
+  <li>TTSSH DLL will be generated in ttssh2\ttxssh directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-cygterm">How to build CygTerm</h2>
+
+<p>
+To build CygTerm source code is shown in the following step:
+</p>
+
+<ol>
+  <li>Install Cygwin(https://www.cygwin.com/) to your PC.</li>
+  <li>Launch Cygwin shell and go to cygterm directory.
+<pre>
+# cd cygterm
+</pre>
+  </li>
+  <li>Compile Cygterm.
+<pre>
+# make
+</pre>
+   </li>
+</ol>
+
+
+<h2 id="build-ttxsamples">How to build TTXSamples</h2>
+
+<p>
+To build TTXSamples source code is shown in the following step:<br />
+And you need Visual Studio 2005(VC++8.0) to build. VS2005 Express Edition is able to build TTXSamples.
+</p>
+
+<ol>
+  <li>Checkout TTXSamples source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>Open TTXSamples\TTXSamples.sln with Visual Studio.</li>
+  <li>Build TTXSamples solution.</li>
+  <li>TTXSamples DLL module will be generated in TTXSamples directory if the building is successful.</li>
+</ol>
+
+
+<h2 id="build-htmlhelp">How to build HTML help file</h2>
+
+<p>
+To build  HTML help file is shown in the following step:
+</p>
+
+<ol>
+  <li>Install HTML Help Compiler<br />
+      Installing Visual Studio (2017 or later) with "C++ MFC" option, HTML Help Compiler (hhc.exe) is installed.</li>
+  <li>Run doc\makechm.bat</li>
+</ol>
+
+
+<h2 id="release">How to release Tera Term installation package</h2>
+
+<p>
+To release Tera Term installation package is shown in the following step:
+</p>
+
+<ol>
+  <li>Increment the version while RC release process.<br />
+      The binary is released for test in this timing. Prevent that old and new binary have same version number.
+    <ul>
+      <li>teraterm\common\tt-version.h</li>
+      <li>ttssh2\ttxssh\ttxssh-version.h</li>
+      <li>ttpmenu\ttpmenu.rc // only modifying</li>
+      <li>TTProxy\TTProxy.rc // only modifying</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // only modifying</li>
+      <li>installer\teraterm.iss
+        <ul>
+          <li>version up AppVer and add "RC"</li>
+          <li>comment out snapshot</li>
+          <li>change called batch files</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>Increment the year of last publication of copyright notice if it is first release in this year.
+    <ul>
+      <li>teraterm\keycode\keycode-version.rc // VERSIONINFO</li>
+      <li>teraterm\teraterm\tt-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpcmn\ttpcmn-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpdlg\ttpdlg.rc // dialog</li>
+      <li>teraterm\ttpfile\ttpfile-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpmacro\ttm-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpset\ttpset-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttptek\ttptek-version.rc // VERSIONINFO</li>
+      <li>ttssh2\ttxssh\ttxssh.rc // dialog</li>
+      <li>ttssh2\ttxssh\ttxssh-version.rc // VERSIONINFO</li>
+      <li>ttpmenu\ttpmenu.rc // dialog, VERSIONINFO</li>
+      <li>TTProxy\TTProxy.rc // dialog, VERSIONINFO(en), VERSIONINFO(ja)</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // VERSIONINFO</li>
+      <li>installer\teraterm.iss</li>
+      <li>installer\release\license.txt // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\en\html\index.html</li>
+      <li>doc\en\html\about\copyright.html // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\en\html\macro\index.html</li>
+      <li>doc\ja\html\index.html</li>
+      <li>doc\ja\html\about\copyright.html // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\ja\html\macro\index.html</li>
+    </ul>
+  </li>
+  <li>Check latest libraries and tools.
+    <ul>
+      <li>Visual Studio<br />
+          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
+      <li>Inno Setup<br />
+          http://www.jrsoftware.org/isdl.php</li>
+      <li>Oniguruma<br />
+          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
+      <li>OpenSSL<br />
+          http://www.openssl.org/</li>
+      <li>zlib<br />
+          http://www.zlib.net/</li>
+      <li>PuTTY<br />
+          http://www.chiark.greenend.org.uk/~sgtatham/putty/</li>
+      <li>SFMT<br />
+          http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</li>
+      <li>CygTerm<br />
+          https://googledrive.com/host/0B1s-dM6d6yC4fmhEZ3c0VTNFWEFtV3daUlRGQmFHVnBmVHRybUNnUVliNWktNDRlZ2NnZTQ/index-e.html</li>
+    </ul>
+  </li>
+  <li>Check the document files.</li>
+  <li>Increase the software version and modify date.
+    <ul>
+      <li>teraterm.iss<br />
+          remove "RC" from AppVer</li>
+      <li>html/about/hisotry.html</li>
+    </ul>
+    Note: Don't update the version number until the release, because the installer does not overwrite file when versions are same.<br />
+    Note: By way of exception, CygTerm+ always upgrades not regarding Tera Term release process when the patch is committed. The release date is the day committed by a developer. The suffix of CygTerm+ version is patchlevel, and then a user can get gcc compiler for free.
+  </li>
+  <li>When CygTerm+ is changed from previous version, please build the software with 64bit Cygwin and replace cygterm\cygterm+-x86_64\cygterm.exe.</li>
+  <li>Evaluate executable program file.
+    <ul>
+      <li>Make installer package<br />
+          Open "teraterm\installer\teraterm.iss" with ISTool and call [Project]-[Compile Setup] with InnoSetup.</li>
+      <li>Test Tera Term installation and evaluate it.</li>
+    </ul>
+  </li>
+  <li>Create SVN tag.<br />
+      The naming rule is `teraterm-version'(ex. teraterm-4_82).<br />
+<pre>
+svn copy -m "Release 4.82" svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_82
+</pre>
+  </li>
+  <li>Re-checkout from svn tag.</li>
+  <li>Make installer package
+    <ul>
+      <li>Edit "teraterm\installer\teraterm.iss"
+<pre>
+#define AppVer "4.???"
+;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+
+[InnoIDE_PreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[InnoIDE_PostCompile]
+Name: makearchive.bat; Parameters: release
+
+[PreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[PostCompile]
+Name: makearchive.bat; Parameters: release
+
+[_ISToolPreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[_ISToolPostCompile]
+Name: makearchive.bat; Parameters: release
+</pre>
+      </li>
+      <li>Open "teraterm\installer\teraterm.iss" with ISTool and call [Project]-[Compile Setup] with InnoSetup.</li>
+    </ul>
+  </li>
+  <li>Update OSDN project site.
+    <ul>
+      <li>Add new release.</li>
+      <li>Submit news.</li>
+    </ul>
+  </li>
+  <li>Announce release to mailing list(in Japan).</li>
+  <li>Update OSDN project home page.</li>
+  <li>Delete snapshots.</li>
+  <li>Announce release to forum(in Canada).<br />
+      Announcements http://logmett.com/support-forums/5<br />
+      Create new topic in `Announcements' entry.<br />
+      Change the type of previous Announcement from Announcement to Normal.<br />
+      Delete third previous Announcement.</li>
+  <li>Announce release to Twitter.<br />
+      https://twitter.com/Tera_Term<br />
+      Post release announcement and pin.</li>
+  </li>
+  <li>Update Chocolatey</li>
+</ol>
+
+</body>
+</html>

Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc	2022-01-12 16:09:55 UTC (rev 9684)
+++ trunk/doc/en/teraterm.hhc	2022-01-12 16:16:38 UTC (rev 9685)
@@ -604,7 +604,7 @@
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="For developer">
-			<param name="Local" value="html\reference\develop.txt">
+			<param name="Local" value="html\reference\develop.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<UL>

Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2022-01-12 16:09:55 UTC (rev 9684)
+++ trunk/doc/en/teraterm.hhp	2022-01-12 16:16:38 UTC (rev 9685)
@@ -172,7 +172,7 @@
 HlpRefRe=html\reference\RE.txt
 HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
-HlpRefDev=html\reference\develop.txt
+HlpRefDev=html\reference\develop.html
 HlpRefPutty=html\reference\PuTTY-LICENSE.txt
 HlpRefSource=html\reference\sourcecode.html
 HlpRefOniguruma=html\reference\Oniguruma-LICENSE.txt

Modified: trunk/doc/ja/html/index.html
===================================================================
--- trunk/doc/ja/html/index.html	2022-01-12 16:09:55 UTC (rev 9684)
+++ trunk/doc/ja/html/index.html	2022-01-12 16:16:38 UTC (rev 9685)
@@ -149,7 +149,7 @@
  <LI><A HREF="reference/PuTTY-LICENSE.txt">PuTTY \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/argon2-LICENSE.txt">The reference C implementation of Argon2 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/CygTerm+-LICENSE.txt">CygTerm+ \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
- <LI><A HREF="reference/develop.txt">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A>
+ <LI><A HREF="reference/develop.html">\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</A>
  <UL>
    <LI>CMake\x83r\x83\x8B\x83h\x83V\x83X\x83e\x83\x80\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x83r\x83\x8B\x83h(experimental)</LI>
    <UL>

Added: trunk/doc/ja/html/reference/develop.html
===================================================================
--- trunk/doc/ja/html/reference/develop.html	                        (rev 0)
+++ trunk/doc/ja/html/reference/develop.html	2022-01-12 16:16:38 UTC (rev 9685)
@@ -0,0 +1,625 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<HTML>
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+<TITLE>Tera Term \x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</TITLE>
+<META http-equiv="Content-Style-Type" content="text/css">
+<link rel="stylesheet" href="../style.css" type="text/css">
+</HEAD>
+<BODY>
+
+<h1 class="center">Tera Term \x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF</h1>
+
+<ol>
+  <li><a href="#environment">\x8AJ\x94\xAD\x8A‹\xAB</a></li>
+  <li><a href="#library">\x83\x89\x83C\x83u\x83\x89\x83\x8A</a></li>
+  <li><a href="#committer">SVN \x83R\x83~\x83b\x83^\x81[\x82ւ̒\x8D\x88\xD3</a></li>
+  <li><a href="#ini-entry">TERATERM.INI \x82ւ̍\x80\x96ڒlj\xC1</a></li>
+  <li><a href="#menu-id">\x83\x81\x83j\x83\x85\x81[ID\x92lj\xC1\x8E\x9E\x82̖\xBD\x96\xBC\x8BK\x91\xA5</a></li>
+  <li><a href="#add-macro-command">\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x92lj\xC1\x8E\x9E\x82̍\xEC\x8Bƃ\x8A\x83X\x83g</a></li>
+  <li><a href="#build-library">\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-teraterm">Tera Term\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-teraterm-menu">TeraTerm Menu\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-ttxkanjimenu">TTXKanjiMenu\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-ttproxy">TTProxy\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-ttssh">TTSSH\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-cygterm">CygTerm\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-ttxsamples">TTXSamples\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#build-htmlhelp">\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
+  <li><a href="#release">\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@</a></li>
+</ol>
+
+<hr>
+
+<h2 id="environment">\x8AJ\x94\xAD\x8A‹\xAB</h2>
+
+<ul>
+  <li>OS
+    <ul>
+      <li>Windows XP Professional</li>
+      <li>Windows 8 Pro</li>
+      <li>Windows 8.1 Pro</li>
+      <li>Windows 10 Pro</li>
+    </ul>
+  </li>
+  <li>Tera Term Project \x82Ń\x8A\x83\x8A\x81[\x83X\x82Ɏg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x83R\x83\x93\x83p\x83C\x83\x89
+    <ul>
+      <li>Visual Studio 2005 SP1 (Standard Edition \x88ȏ\xE3)
+        <ul>
+          <li>Service Pack 1 (VS80sp1-KB926601-X86-ENU.exe)</li>
+          <li>Microsoft Visual Studio 2005 Service Pack 1 MFC \x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x8DX\x90V\x83v\x83\x8D\x83O\x83\x89\x83\x80 (VS80sp1-KB2538218-v2-X86-INTL.exe)</li>
+          <li>Windows Vista \x88ȏ\xE3\x82Ńr\x83\x8B\x83h\x82\xB7\x82\xE9\x8Fꍇ\x82́AVisual Studio 2005 Service Pack 1 Update for Windows Vista (VS80sp1-KB932236-X86-JPN.exe)</li>
+          <li>Windows Server 2003 R2 Platform SDK(Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1)<br />
+              \x92\x8D: Visual Studio 2005 Standard Edition\x82ł́AOpenSSL \x82̃r\x83\x8B\x83h\x82\xAA\x8E\xB8\x94s\x82\xB5\x82܂\xB7\x81BWindows Server 2003 R2 Platform SDK \x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x81A"Crypt32.Lib"\x82\xF0\x83\x8A\x83\x93\x83N\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xA8\x82\xAD\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B<br />
+              SDK \x82ŃC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82ꂽ\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xAA\x8DŗD\x90\xE6\x82ɂȂ\xE9\x82悤\x81AINCLUDE \x82\xA8\x82\xE6\x82\xD1 LIB \x8A‹\xAB\x95ϐ\x94\x82\xF0\x90ݒ肵\x82܂\xB7\x81B
+              <pre>
+e.g. INCLUDE "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include"
+     LIB     "C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib"
+              </pre>
+              \x8FC\x90\xB3\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B C:\Program Files\Microsoft Visual Studio 8\Common7\Tools\vsvars32.bat
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x83R\x83\x93\x83p\x83C\x83\x89
+    <ul>
+      <li>Visual Studio 2005 (Express Edition\x82\xCDTera Term 4.103\x82\xA9\x82\xE7\x91Ή\x9E)
+        <ul>
+          <li>with SDK 7.0
+            <ul>
+              <li>Windows Server 2003 R2 Platform SDK (= Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1) (5.2.3790.2075.51.PlatformSDK_Svr2003R2_rtm.img)<br />
+                  \x92\x8D: Microsoft\x82̃T\x83C\x83g\x82\xA9\x82\xE7\x82͓\xFC\x8E\xE8\x95s\x89”\(2019/04/07\x8E\x9E\x93_)</li>
+            </ul>
+          </li>
+          <li>with SDK 7.1
+            <ul>
+              <li>Microsoft Windows SDK for Windows 7 and .NET Framework 4 (GRMSDK_EN_DVD.iso)</li>
+              <li>Visual Studio 2005\x82ŗ\x98\x97p\x82\xB7\x82\xE9\x82ɂ\xCDKB949009(VS80sp1-KB949009-X86-INTL.exe)\x82\xA9KB980422(VS80sp1-KB980422-x86-INTL.exe)\x82\xAA\x95K\x97v<br />
+                  \x92\x8D: KB949009,KB980422\x82\xCDMicrosoft\x82̃T\x83C\x83g\x82\xA9\x82\xE7\x93\xFC\x8E\xE8\x95s\x89”\</li>
+            </ul>
+            Windows95\x82ł\xE0\x93\xAE\x8D삷\x82\xE9\x83o\x83C\x83i\x83\x8A\x82\xF0\x83r\x83\x8B\x83h\x89”\
+          </li>
+        </ul>
+      </li>
+      <li>Visual Studio 2008 SP1 (Standard Edition \x88ȏ\xE3)<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
+      </li>
+      <li>Visual Studio 2010 SP1 (Professional Edition \x88ȏ\xE3)<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
+      </li>
+      <li>Visual Studio 2012 Update 4 (Professional Edition \x88ȏ\xE3)<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br />
+          Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v110_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </li>
+      <li>Visual Studio Community 2013 Update 5<br />
+        <ul>
+          <li>MFC MBCS DLL \x83A\x83h\x83I\x83\x93 (vc_mbcsmfc.exe)</li>
+        </ul>
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br />
+          Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v120_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </li>
+      <li>Visual Studio Community 2015 Update 3<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br />
+          Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v140_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </li>
+      <li>Visual Studio Community 2017<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B<br />
+          Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v141_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </li>
+      <li>Visual Studio Community 2019<br />
+          \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
+      </li>
+      <li>\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83r\x83\x8B\x83h\x82\xB7\x82邽\x82߂\xC9<br />
+          Visual Studio \x82̃R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x82\xA9\x82\xE7\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邩\x81A\x88ȉ\xBA\x82̂悤\x82Ɋ‹\xAB\x95ϐ\x94\x82\xF0\x90ݒ肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br />
+          \x8Eg\x97p\x82\xB5\x82\xBD\x82\xA2\x83o\x81[\x83W\x83\x87\x83\x93\x82\xCC Visual Studio \x82\xCC "(x86) Native Tools Command Prompt" \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x81A\x83R\x83\x93\x83p\x83C\x83\x89\x82̃p\x83X\x82Ɋ֌W\x82\xB7\x82\xE9 PATH \x82\xC6 VSINSTALLDIR \x95ϐ\x94\x82\xF0\x8A‹\xAB\x95ϐ\x94\x82ɓo\x98^\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+          <pre>
+Example:
+INCLUDE       C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Windows Kits\8.1\include\shared;C:\Program Files (x86)\Windows Kits\8.1\include\um;
+LIB           C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Windows Kits\8.1\lib\winv6.3\um\x86;
+PATH          C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\BIN;C:\Program Files (x86)\Windows Kits\8.1\bin\x86
+VSINSTALLDIR  C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC
+          </pre>
+      </li>
+    </ul>
+  </li>
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89
+    <ul>
+      <li>Inno Setup 5.6.1 ANSI (http://www.jrsoftware.org/isinfo.php)
+        <ul>
+          <li>Inno Setup Preprocessor</li>
+        </ul>
+      </li>
+      <li>ISTool 5.3.0.1 (https://sourceforge.net/projects/istool/)</li>
+    </ul>
+  </li>
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>Cygwin \x8DŐV\x94\xC5(v4.105\x82\xA9\x82\xE7CygTerm+\x82\xCDVista\x88ȍ~\x91Ή\x9E\x82ƂȂ\xC1\x82\xBD\x82\xBD\x82\xDF)</li>
+      <li>ActivePerl 5.10 \x88ȏ\xE3 \x82܂\xBD\x82\xCD Strawberry Perl 5.30.1.1 \x88ȏ\xE3<br />
+          \x83r\x83\x8B\x83h\x89ߒ\xF6\x82Ŏg\x97p\x82\xB5\x82܂\xB7<br />
+          <ul>
+            <li>OpenSSL \x82̃R\x83\x93\x83p\x83C\x83\x8B(\x95K\x90{)</li>
+            <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x83t\x83@\x83C\x83\x8B\x82̕\xB6\x8E\x9A\x83R\x81[\x83h\x81E\x89\xFC\x8Ds\x83R\x81[\x83h\x95ϊ\xB7(\x95K\x90{)</li>
+            <li>\x83\x8A\x83r\x83W\x83\x87\x83\x93\x94ԍ\x86\x8E擾 (perl\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x83\x8A\x83r\x83W\x83\x87\x83\x93\x94ԍ\x86\x82\xF0\x8E擾\x82\xB9\x82\xB8\x82Ƀr\x83\x8B\x83h\x82\xB5\x82܂\xB7)</li>
+          </ul>
+      </li>
+      <li>Subversion for Windows (http://sourceforge.net/projects/win32svn/)<br />
+          \x83\\x81[\x83X\x82̃`\x83F\x83b\x83N\x83A\x83E\x83g\x82Ɏg\x82\xC1\x82\xBD svn \x82ƌ݊\xB7\x90\xAB\x82̂\xA0\x82\xE9\x83o\x81[\x83W\x83\x87\x83\x93\x81B<br />
+          libs\svn \x82։𓀂\xB5\x82܂\xB7\x81B("svnversion.exe" \x82\xAA libs\svn\bin \x82ɔz\x92u\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2)</li>
+      <li>Subversion for Windows (http://sourceforge.net/projects/win32svn/)<br />
+          \x83\x8A\x83r\x83W\x83\x87\x83\x93\x94ԍ\x86\x8E擾\x8E\x9E\x82Ɏg\x97p\x82\xB5\x82܂\xB7<br />
+          svnrev_perl/toolinfo.txt \x82\xC9 svn.exe \x82̃t\x83\x8B\x83p\x83X\x82\xF0\x8BL\x8Fq\x82\xA2\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br />
+          \x8Fڂ\xB5\x82\xAD\x82\xCD svnrev_perl/readme.md \x82\xF0\x8EQ\x8FƂ\xAD\x82\xBE\x82\xB3\x82\xA2
+      </li>
+    </ul>
+  </li>
+</ul>
+
+
+<h2 id="library">\x83\x89\x83C\x83u\x83\x89\x83\x8A</h2>
+
+<ul>
+  <li>Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)</li>
+  <li>OpenSSL 1.1.1k (http://www.openssl.org/)</li>
+  <li>zlib 1.2.11 (http://www.zlib.net/)</li>
+  <li>PuTTY 0.76 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)</li>
+  <li>SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)</li>
+  <li>cJSON 1.7.14 (https://github.com/DaveGamble/cJSON/)</li>
+  <li>The reference C implementation of Argon2 20190702 (https://github.com/P-H-C/phc-winner-argon2)</li>
+</ul>
+
+
+<h2 id="committer">SVN \x83R\x83~\x83b\x83^\x81[\x82ւ̒\x8D\x88\xD3</h2>
+
+<p>
+SVN \x83\x8A\x83|\x83W\x83g\x83\x8A\x82͈\xEA\x94ʌ\xFC\x82\xAF\x82Ƃ͈Ⴂ\x81A\x88ȉ\xBA\x82̒ʂ\xE8\x82ł\xB7\x81B
+</p>
+<pre>
+svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk
+</pre>
+
+<p>
+\x83t\x83@\x83C\x83\x8B\x82\xF0\x95ʂ̃f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ŕҏW\x82\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br />
+\x83R\x83~\x83b\x83g\x82\xB5\x82\xBD\x82Ƃ\xAB\x82ɕʂ̐l\x82̏C\x90\xB3\x82\xF0\x8D폜\x82\xB5\x82Ă\xB5\x82܂\xA4\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
+</p>
+
+<p>
+\x83A\x83b\x83v\x83f\x81[\x83g\x81E\x83R\x83~\x83b\x83g\x8E\x9E\x82̒\x8D\x88\xD3<br />
+svn\x82̏\x88\x97\x9D\x82\xAA\x8E\xB8\x94s\x82\xB7\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x82̂ŁA\x83t\x83@\x83C\x83\x8B\x82\xF0\x83G\x83f\x83B\x83^\x93\x99\x82ŊJ\x82\xA2\x82\xBD\x82܂܂ōs\x82\xED\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<p>
+\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x95ҏW\x8E\x9E\x82̒\x8D\x88\xD3<br />
+\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B(installer\release\lang\*.lng)\x82͑\xBD\x8C\xBE\x8C\xEA\x91Ή\x9E\x83G\x83f\x83B\x83^(vim, EmEditor, Notepad++\x93\x99)\x82ŕҏW\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+
+<h2 id="ini-entry">TERATERM.INI \x82ւ̍\x80\x96ڒlj\xC1</h2>
+
+<p>
+\x8D\x80\x96ږ\xBC<br />
+\x82\xB7\x82ł\xC9 EnableFoo... \x82\xE2 DisableBar... \x82\xAA\x8D\xAC\x8D݂\xB5\x82Ă\xB5\x82܂\xC1\x82Ă\xA2\x82邪\x81A\x8D\xAC\x97\x90\x82\xB5\x82₷\x82\xA2\x81B<br />
+\x8D\xA1\x8C\xE3\x82\xCD Baz... \x82Ƃ\xA2\x82\xA4\x8C`\x8E\xAE\x82ɂ\xB7\x82\xE9\x82̂\xAA\x96]\x82܂\xB5\x82\xA2\x81B
+</p>
+
+
+<h2 id="menu-id">\x83\x81\x83j\x83\x85\x81[ID\x92lj\xC1\x8E\x9E\x82̖\xBD\x96\xBC\x8BK\x91\xA5</h2>
+
+<pre>
+1\x8C\x85\x96ڂ\xCD 5
+</pre>
+<pre>
+2\x8C\x85\x96ڂ\xCD
+  Tera Term VT \x83E\x83B\x83\x93\x83h\x83E\x82Ȃ\xE7  0
+  Tera Term TEK \x83E\x83B\x83\x93\x83h\x83E\x82Ȃ\xE7 1
+  TTSSH \x82Ȃ\xE7                   2
+  TTProxy \x82Ȃ\xE7                 3
+  TTXKanjiMenu \x82Ȃ\xE7            4
+</pre>
+<pre>
+3\x8C\x85\x96ڂ\xCD
+  [File] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7    1
+  [Edit] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7    2
+  [Setup] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7   3
+  [Control] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7 4
+  [Window] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7  8
+  [Help] \x83\x81\x83j\x83\x85\x81[\x82Ȃ\xE7    9
+</pre>
+
+<p>
+\x97\xE1\x81FFile\x94z\x89\xBA\x82\xC9TTSSH\x82̃\x81\x83j\x83\x85\x81[\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9
+</p>
+<pre>
+#define ID_SSHSCPMENU       52110
+</pre>
+
+
+<h2 id="add-macro-command">\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x92lj\xC1\x8E\x9E\x82̍\xEC\x8Bƃ\x8A\x83X\x83g</h2>
+
+<p>
+Tera Term\x83}\x83N\x83\x8D\x82\xF0\x90V\x90݂\xB7\x82\xE9\x82Ƃ\xAB\x82̍\xEC\x8BƎ菇\x82ɂ‚\xA2\x82āA\x88ȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<ul>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82̏C\x90\xB3
+    <ul>
+      <li>\x83R\x83}\x83\x93\x83h\x82̓\xE0\x95\x94 ID \x82\xF0\x8D̔Ԃ\xB7\x82\xE9\x81B\x81i\x81u\x93\xE0\x95\x94 ID\x81v\x82\xCD"helpid.h"\x82ɂ\xE0\x8Eg\x97p\x82\xB3\x82\xEA\x82\xE9\x81j<br />
+          ... teraterm/ttmacro/ttmparse.h</li>
+      <li>\x83R\x83}\x83\x93\x83h\x96\xBC\x82𑖍\xB8\x82\xB5\x82ē\xE0\x95\x94 ID \x82ɕϊ\xB7\x82\xB7\x82\xE9\x81B<br />
+          ... CheckReservedWord ＠ teraterm/ttmacro/ttmparse.c</li>
+      <li>\x83R\x83}\x83\x93\x83h\x82̓\xE0\x95\x94 ID \x82\xA9\x82\xE7\x8E\xC0\x8Dۂɏ\x88\x97\x9D\x82\xF0\x82\xB7\x82\xE9\x8A֐\x94\x82\xF0\x8CĂԁB<br />
+          ... ExecCmnd ＠ teraterm/ttmacro/ttl.c</li>
+      <li>\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x8A֐\x94\x82\xF0\x8D\xEC\x82\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>\x83w\x83\x8B\x83v(\x8C\xBE\x8Cꂲ\x82\xC6)
+    <ul>
+      <li>\x83R\x83}\x83\x93\x83h\x82̃w\x83\x8B\x83v\x82\xF0\x8D\xEC\x82\xE9\x81B<br />
+          ... doc/LANG/html/macro/command/hogefunc.html</li>
+      <li>\x83R\x83}\x83\x93\x83h\x88ꗗ\x83y\x81[\x83W\x82ɒlj\xC1\x82\xB7\x82\xE9\x81B<br />
+          ... doc/LANG/html/macro/command/index.html</li>
+      <li>\x83w\x83\x8B\x83v\x83g\x83s\x83b\x83N\x82ɒlj\xC1\x82\xB7\x82\xE9\x81B<br />
+          ... doc/LANG/teraterm.hhc</li>
+      <li>\x83w\x83\x8B\x83v\x83y\x81[\x83W\x82̃R\x83\x93\x83e\x83L\x83X\x83g ID \x82\xF0\x8D̔Ԃ\xB7\x82\xE9\x81B<br />
+          \x92l\x82\xCD \x83R\x83}\x83\x93\x83h\x82̓\xE0\x95\x94 ID + 92000\x81B<br />
+          ... teraterm/common/helpid.h</li>
+      <li>\x83R\x83\x93\x83e\x83L\x83X\x83g ID \x82ƌĂяo\x82\xB7\x83t\x83@\x83C\x83\x8B\x82̃G\x83C\x83\x8A\x83A\x83X\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
+          \x83e\x83L\x83X\x83g\x83G\x83f\x83B\x83^\x82Œ\xBC\x90ڊJ\x82\xAB\x81A[ALIAS]\x82\xC9HTML\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9\x81B<br />
+          ... doc/LANG/teraterm.hhp</li>
+    </ul>
+  </li>
+</ul>
+
+
+<h2 id="build-library">\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<ul>
+  <li>PuTTY (used by TTSSH)
+    <ol>
+      <li>PuTTY \x82̃\\x81[\x83X\x82\xF0 libs/putty \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B<br />
+          ttssh \x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x94z\x89\xBA\x82\xCC putty \x83v\x83\x8D\x83W\x83F\x83N\x83g\x82ɂ\xE6\x82\xE8\x95K\x97v\x82ȋ@\x94\\x82݂̂\xAA\x90ÓI\x83\x89\x83C\x83u\x83\x89\x83\x8A\x89\xBB\x82\xB3\x82\xEA\x81Attxssh.dll \x82Ƀ\x8A\x83\x93\x83N\x82\xB3\x82\xEA\x82邽\x82߁A\x93W\x8AJ\x82\xB7\x82邾\x82\xAF\x82ł悢\x81B</li>
+    </ol>
+  </li>
+  <li>Oniguruma (used by Tera Term Macro)
+    <ol>
+      <li>oniguruma \x82̃\\x81[\x83X\x82\xF0 libs/oniguruma \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildoniguruma6.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>OpenSSL (used by TTSSH)
+    <ol>
+      <li>openssl \x82̃\\x81[\x83X\x82\xF0 libs/openssl \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+      <li> OpenSSL 1.0.0e \x88ȍ~\x82ŁAlibs/openssl/Makefile.bak \x82\xAA\x8Dŏ\x89\x82\xA9\x82瑶\x8D݂\xB7\x82\xE9\x8Fꍇ\x82́A\x88\xEA\x93x\x82\xBE\x82\xAF\x8E蓮\x82ō폜\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B</li>
+      <li>\x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildopenssl11.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>Zlib (used by TTSSH)
+    <ol>
+      <li>zlib \x82̃\\x81[\x83X\x82\xF0 libs/zlib \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildzlib.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>SFMT (used by Tera Term Macro)
+    <ol>
+      <li>SFMT \x82̃\\x81[\x83X\x82\xF0 libs/SFMT \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81AbuildSFMT.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95K\x97v\x82ɉ\x9E\x82\xB6\x82\xC4 libs/SFMT/SFMT_version_for_teraterm.h \x82̃o\x81[\x83W\x83\x87\x83\x93\x94ԍ\x86\x82\xF0\x8FC\x90\xB3\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>cJSON (used by TTXCheckUpdate plugin)
+    <ol>
+      <li>EcJSON \x82̃\\x81[\x83X\x82\xF0 libs/cJSON \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B</li>
+    </ol>
+  </li>
+  <li>The reference C implementation of Argon2 (used by TTSSH)
+    <ol>
+      <li>argon2 \x82̃\\x81[\x83X\x82\xF0 libs/argon2 \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B<br />
+          argon2 \x83\x8A\x83t\x83@\x83\x8C\x83\x93\x83X\x8E\xC0\x91\x95\x82ɂ͐ÓI\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82𐶐\xAC\x82\xB7\x82\xE9\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83t\x83@\x83C\x83\x8B\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82Ȃ\xA2\x81B<br />
+          ttssh \x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x94z\x89\xBA\x82\xCC argon2 \x83v\x83\x8D\x83W\x83F\x83N\x83g\x82ɂ\xE6\x82\xE8\x90ÓI\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x81Attxssh.dll \x82Ƀ\x8A\x83\x93\x83N\x82\xB3\x82\xEA\x82邽\x82߁A\x93W\x8AJ\x82\xB7\x82邾\x82\xAF\x82ł悢\x81B</li>
+    </ol>
+  </li>
+</ul>
+
+<h2 id="build-teraterm">Tera Term\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+Tera Term\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B<br />
+\x83r\x83\x8B\x83h\x82ɂ\xCDVisual Studio 2005 Standard Edition\x88ȏオ\x95K\x97v\x82ł\xB7\x81B\x81iVisual Studio 2005 Express Edition\x82͕s\x89j
+</p>
+
+<ol>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82\xF0OSDN(https://ja.osdn.net/projects/ttssh2/)\x82\xA9\x82\xE7\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB7\x82\xE9\x81B</li>
+  <li>teraterm\visualc\ttermpro.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B<br />
+      .sln\x83t\x83@\x83C\x83\x8B\x82̉\xFC\x8Ds\x83R\x81[\x83h\x82\xAA"LF"\x82ɂȂ\xC1\x82Ă\xA2\x82\xE9\x82ƁAVisual Studio\x82\xAA\x8BN\x93\xAE\x82\xB5\x82Ȃ\xA2\x82̂Œ\x8D\x88ӊ肢\x82܂\xB7\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6teraterm \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɏ\xC0\x8Ds\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-teraterm-menu">TeraTerm Menu\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<ol>
+  <li>Checkout TeraTerm Menu source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>ttpmenu\ttpmenu.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6 ttpmenu \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9 ttpmenu.exe \x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-ttxkanjimenu">TTXKanjiMenu\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<ol>
+  <li>Checkout TeraTerm Menu source code from OSDN(https://osdn.net/projects/ttssh2/).</li>
+  <li>TTXKanjiMenu\ttxkanjimenu.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6 TTXKanjiMenu \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9 ttxkanjimenu.dll \x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-ttproxy">TTProxy\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+TTProxy\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B<br />
+\x83r\x83\x8B\x83h\x82ɂ\xCDVisual Studio 2005(VC++8.0)\x82\xAA\x95K\x97v\x82ł\xB7\x81B
+</p>
+
+<ol>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82\xF0OSDN(https://ja.osdn.net/projects/ttssh2/)\x82\xA9\x82\xE7\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB7\x82\xE9\x81B</li>
+  <li>TTProxy\TTProxy.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6 TTProxy \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9DLL\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-ttssh">TTSSH\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+TTSSH\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B<br />
+\x83r\x83\x8B\x83h\x82ɂ\xCDVisual Studio 2005(VC++8.0)\x81AActivePerl\x82\xAA\x95K\x97v\x82ł\xB7\x81B
+</p>
+
+<p>
+TTSSH\x92P\x91̂̃r\x83\x8B\x83h\x82\xCD VS2005 Express Edition \x82ł\xE0\x89”\\x82ł\xB7\x81Bttpcmn.lib\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB7\x82邽\x82߁ATera Term\x82̃r\x83\x8B\x83h\x82\xF0\x8E\x96\x91O\x82ɍs\x82\xC1\x82Ă\xA8\x82\xAD\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81BVS2005 Express Edition\x82ł\xCDTera Term\x82̃r\x83\x8B\x83h\x82͂ł\xAB\x82܂\xB9\x82񂪁Attpcmn.lib\x82͍쐬\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
+</p>
+
+<p>
+VS2008 Express Edition\x82Ńr\x83\x8B\x83h\x82\xB7\x82\xE9\x82ƁA.rc\x83t\x83@\x83C\x83\x8B\x82ʼn\xBA\x8BL\x82̃G\x83\x89\x81[\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82܂\xB7\x81B<br />
+.\ttxssh.rc(10) : fatal error RC1015: cannot open include file 'afxres.h'.<br />
+\x96{\x8C\xBB\x8Fۂ\xF0\x89\xF1\x94\xF0\x82\xB7\x82\xE9\x82ɂ́A.rc\x83t\x83@\x83C\x83\x8B\x82\xF0\x83e\x83L\x83X\x83g\x83G\x83f\x83B\x83^\x82ŊJ\x82\xAB\x81Aafxres.h\x82\xCCinclude\x82\xF0\x8D폜\x82\xB5\x81A\x90V\x8BK\x82\xC92\x8Ds\x82\xF0\x92lj\xC1\x82\xB5\x82܂\xB7\x81B<br />
+</p>
+<pre>
+- #include "afxres.h"
++ #include <windows.h>
++ #define IDC_STATIC -1
+</pre>
+
+<ol>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82\xF0OSDN(https://ja.osdn.net/projects/ttssh2/)\x82\xA9\x82\xE7\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB7\x82\xE9\x81B</li>
+  <li>ttssh2\ttssh.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6ttssh2\ttxssh \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9DLL\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="build-cygterm">CygTerm\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+CygTerm\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<ol>
+  <li>Cygwin(https://www.cygwin.com/)\x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9\x81B</li>
+  <li>Cygwin\x82̃V\x83F\x83\x8B\x82\xF0\x8BN\x93\xAE\x82\xB5\x81Acygterm \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ֈړ\xAE\x82\xB7\x82\xE9\x81B
+<pre>
+# cd cygterm
+</pre>
+  </li>
+  <li>CygTerm\x82\xF0\x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB7\x82\xE9\x81B
+<pre>
+# make
+</pre>
+  </li>
+</ol>
+
+
+<h2 id="build-ttxsamples">TTXSamples\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+\x83\x8A\x83|\x83W\x83g\x83\x8A\x82\xCCTTXSamples\x82\xC9 Tera Term Extension (TTX)\x82̃T\x83\x93\x83v\x83\x8B\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81BTTX\x82\xF0\x8D\xEC\x82\xE9\x8Dۂ̎Q\x8Dl\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br />
+TTXSamples\x82̃r\x83\x8B\x83h\x82ɂ\xCDVisual Studio 2005(VC++8.0)\x82\xAA\x95K\x97v\x82ł\xB7\x81BTera Term\x96{\x91̂Ƃ͈Ⴂ\x81AExpress Edition\x82ł\xE0\x83r\x83\x8B\x83h\x89”\\x82ł\xB7\x81B
+</p>
+
+<ol>
+  <li>\x83\\x81[\x83X\x83R\x81[\x83h\x82\xF0OSDN(https://ja.osdn.net/projects/ttssh2/)\x82\xA9\x82\xE7\x83`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB7\x82\xE9\x81B</li>
+  <li>TTXSamples\TTXSamples.sln \x82\xF0Visual Studio\x82ŊJ\x82\xAD\x81B</li>
+  <li>\x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x82\xF0\x83r\x83\x8B\x83h\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83r\x83\x8B\x83h\x82ɐ\xAC\x8C\x{1C2DC2}\xE9\x82\xC6 TTXSamples \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xC9DLL\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+</ol>
+
+<p>
+\x8AeTTX\x82̏ڍׂɂ‚\xA2\x82ẮA\x83v\x83\x8D\x83W\x83F\x83N\x83g\x93\xE0\x82\xCCReadMe-ja.txt\x82\xF0\x8EQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+
+
+<h2 id="build-htmlhelp">\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B\x82̃r\x83\x8B\x83h\x95\xFB\x96@</h2>
+
+<p>
+\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B\x82̃r\x83\x8B\x83h\x95\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<ol>
+  <li>HTML Help Compiler \x82\xF0\x93\xFC\x8E肷\x82\xE9\x81B<br />
+      Visual Studio (2017 \x88ȍ~) \x82\xF0 "C++ MFC" \x83I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82ăC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9\x82ƁAHTML Help Compiler (hhc.exe) \x82\xAA\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+  <li>doc\makechm.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B</li>
+</ol>
+
+
+<h2 id="release">\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@</h2>
+
+<p>
+\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<ol>
+  <li>RC \x8D쐬\x8E\x9E\x82Ƀo\x81[\x83W\x83\x87\x83\x93\x82\xF0\x88\xEA\x82ƒC\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9\x81B<br />
+      \x88\xEA\x94ʂɃe\x83X\x83g\x82\xF0\x8CĂт\xA9\x82\xAF\x81A\x8B\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82Ƃ̓\xAF\x8E\x9E\x8E\xC0\x8Ds\x82\xAA\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82邽\x82߁A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ƃ\xB7\x82\xE9(cf. TT_FILEMAPNAME \x92\xE8\x8B`)\x81B
+    <ul>
+      <li>teraterm\common\tt-version.h</li>
+      <li>ttssh2\ttxssh\ttxssh-version.h</li>
+      <li>ttpmenu\ttpmenu.rc // only modifying</li>
+      <li>TTProxy\TTProxy.rc // only modifying</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // only modifying</li>
+      <li>installer\teraterm.iss
+        <ul>
+          <li>AppVer \x82\xF0\x8Fグ\x81A"RC" \x82\xF0\x92lj\xC1</li>
+          <li>snapshot \x82\xF0 \x83R\x83\x81\x83\x93\x83g\x83A\x83E\x83g</li>
+          <li>\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82̌Ăяo\x82\xB5\x82\xF0\x8FC\x90\xB3</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li>\x82\xB1\x82̔N\x82ɂ\xA8\x82\xAF\x82\xE9\x8Dŏ\x89\x82̃\x8A\x83\x8A\x81[\x83X\x82̏ꍇ\x82́A\x92\x98\x8D쌠\x95\\x8E\xA6\x82́u\x8DŌ\xE3\x82̔\xAD\x8Ds\x82̔N\x81v\x82\xF0\x83C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>teraterm\keycode\keycode-version.rc // VERSIONINFO</li>
+      <li>teraterm\teraterm\tt-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpcmn\ttpcmn-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpdlg\ttpdlg.rc // dialog</li>
+      <li>teraterm\ttpfile\ttpfile-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpmacro\ttm-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttpset\ttpset-version.rc // VERSIONINFO</li>
+      <li>teraterm\ttptek\ttptek-version.rc // VERSIONINFO</li>
+      <li>ttssh2\ttxssh\ttxssh.rc // dialog</li>
+      <li>ttssh2\ttxssh\ttxssh-version.rc // VERSIONINFO</li>
+      <li>ttpmenu\ttpmenu.rc // dialog, VERSIONINFO</li>
+      <li>TTProxy\TTProxy.rc // dialog, VERSIONINFO(en), VERSIONINFO(ja)</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // VERSIONINFO</li>
+      <li>installer\teraterm.iss</li>
+      <li>installer\release\license.txt // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\en\html\index.html</li>
+      <li>doc\en\html\about\copyright.html // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\en\html\macro\index.html</li>
+      <li>doc\ja\html\index.html</li>
+      <li>doc\ja\html\about\copyright.html // Tera Term, TTSSH, Cygterm+, TTProxy, TeraTerm Menu, TTX KanjiMenu</li>
+      <li>doc\ja\html\macro\index.html</li>
+    </ul>
+  </li>
+  <li>\x88ˑ\xB6\x83\x89\x83C\x83u\x83\x89\x83\x8A\x81A\x83c\x81[\x83\x8B\x81A\x83C\x83\x93\x83|\x81[\x83g\x8C\xB3\x82̍ŐV\x94ł\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>Visual Studio<br />
+          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
+      <li>Inno Setup<br />
+          http://www.jrsoftware.org/isdl.php</li>
+      <li>Oniguruma<br />
+          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
+      <li>OpenSSL<br />
+          http://www.openssl.org/</li>
+      <li>zlib<br />
+          http://www.zlib.net/</li>
+      <li>PuTTY<br />
+          http://www.chiark.greenend.org.uk/~sgtatham/putty/</li>
+      <li>SFMT<br />
+          http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</li>
+      <li>CygTerm<br />
+          https://googledrive.com/host/0B1s-dM6d6yC4fmhEZ3c0VTNFWEFtV3daUlRGQmFHVnBmVHRybUNnUVliNWktNDRlZ2NnZTQ/index-e.html</li>
+    </ul>
+  </li>
+  <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>\x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82̐ݒ荀\x96ځEUI\x82̂Ȃ\xA2\x93\xC1\x95ʃI\x83v\x83V\x83\x87\x83\x93\x81E\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x81E\x90V\x8BK\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ȂǁA\x91Ή\x9E\x82\xB7\x82\xE9\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82ɘR\x82ꂪ\x82Ȃ\xA2\x82\xA9\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82̏\x91\x82\xAB\x96Y\x82\xEA\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B<br />
+       \x82\xA8\x82\xA8\x82ނ˕ύX\x82\xB5\x82\xBD\x8F\x87\x82ɒNjL\x82\xB3\x82\xEA\x82\xE9\x95ύX\x97\x9A\x97\xF0\x82̏\x87\x94Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̎w\x90j\x82Ƃ\xB5\x82ẮA\x83^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83V\x83\x87\x83\x93\x8A֌W\x81E\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ă̕ύX\x81E\x83}\x83N\x83\x8D\x82̏\x87\x81B</li>
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x8D\xB7\x95\xAA\x82\xAA\x96|\x96󂳂\xEA\x82Ă\xA2\x82邱\x82Ƃ\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>\x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8Fグ\x81A\x93\xFA\x95t\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>teraterm.iss<br />
+          AppVer \x82\xA9\x82\xE7 RC \x82\xF0\x8D폜</li>
+      <li>html/about/hisotry.html</li>
+    </ul>
+    CygTerm+ \x82͗\xE1\x8AO\x82ŁA\x83\x8A\x83\x8A\x81[\x83X\x82Ƃ͊֌W\x82Ȃ\xAD\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x8Fオ\x82\xE9\x81B<br />
+    \x83p\x83b\x83`\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82\xE9\x82Ƒ\xA6\x83\x8A\x83\x8A\x81[\x83X\x88\xB5\x82\xA2\x82ɂȂ\xE8\x81A\x83\x8A\x83\x8A\x81[\x83X\x93\xFA\x82͂\xBB\x82̓\xFA\x95t\x82ƂȂ\xE9\x81B<br />
+    \x82\xB1\x82\xEA\x82́A\x83o\x81[\x83W\x83\x87\x83\x93\x82̖\x96\x94\xF6\x82\xAA patchlevel \x82ł\xA0\x82\xE8\x81A\x83R\x83\x93\x83p\x83C\x83\x89\x82̓\xFC\x8E肪\x97e\x88ՂȂ\xBD\x82߁B
+  </li>
+  <li>\x91O\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82\xA9\x82\xE7CygTerm+\x82ɕύX\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x82́A64bit Cygwin\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xC4 cygterm\cygterm+-x86_64\cygterm.exe \x82̍\xB7\x82\xB5\x91ւ\xA6\x82\xF0\x8Ds\x82\xA4\x81B</li>
+  <li>\x93\xAE\x8D\xEC\x8Am\x94F\x82\xF0\x82\xB7\x82\xE9
+    <ul>
+      <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
+          ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A[Project]-[Compile Setup]\x82ō쐬\x82\xB3\x82\xEA\x82\xE9\x81B</li>
+      <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xA8\x82\xE6\x82ю\xC0\x8Ds\x82\xF0\x83e\x83X\x83g\x82\xB7\x82\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>SVN \x82̃^\x83O\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
+      \x83^\x83O\x96\xBC\x82́uteraterm-\x83o\x81[\x83W\x83\x87\x83\x93\x81v\x81B\x82\xBD\x82Ƃ\xA6\x82΁Av4.82\x82Ȃ\xE7\x82\xCE"teraterm-4_82"\x81B<br />
+      <pre>
+svn copy -m "Release 4.82" svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_82
+      </pre>
+  </li>
+  <li>\x83\x8A\x83\x8A\x81[\x83X\x97p\x82̃^\x83O\x82Ń`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB5\x92\xBC\x82\xB7\x81B</li>
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>teraterm\installer\teraterm.iss \x82\xF0\x95ҏW\x82\xB7\x82\xE9
+<pre>
+#define AppVer "4.???"
+;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+
+[InnoIDE_PreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[InnoIDE_PostCompile]
+Name: makearchive.bat; Parameters: release
+
+[PreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[PostCompile]
+Name: makearchive.bat; Parameters: release
+
+[_ISToolPreCompile]
+Name: makechm.bat
+;Name: build.bat
+Name: build.bat; Parameters: rebuild
+
+[_ISToolPostCompile]
+Name: makearchive.bat; Parameters: release
+</pre>
+      </li>
+      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A[Project]-[Compile Setup]\x82ō쐬\x82\xB3\x82\xEA\x82\xE9</li>
+    </ul>
+  </li>
+  <li>OSDN \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x81B
+    <ul>
+      <li>[\x83_\x83E\x83\x93\x83\x8D\x81[\x83h]-[\x8AǗ\x9D]-[\x90V\x8BK\x8D쐬]<br />
+          \x95ύX\x97\x9A\x97\xF0\x82\xF0\x93\xFC\x97͂\xB5\x82ă\x8A\x83\x8A\x81[\x83X\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B</li>
+      <li>[\x83j\x83\x85\x81[\x83X\x88ꗗ]-[\x90V\x8BK\x93o\x98^]<br />
+          \x83j\x83\x85\x81[\x83X\x8BL\x8E\x96\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>\x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g\x82ɃA\x83i\x83E\x83\x93\x83X\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83y\x81[\x83W\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x81B</li>
+  <li>\x83X\x83i\x83b\x83v\x83V\x83\x87\x83b\x83g\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B</li>
+  <li>Twitter \x82ɍ\x90\x92m\x82\xB7\x82\xE9\x81B<br />
+      https://twitter.com/Tera_Term<br />
+      \x83\x8A\x83\x8A\x81[\x83X\x8D\x90\x92m\x82\xF0\x83c\x83C\x81[\x83g\x82\xB5\x82ČŒ肷\x82\xE9\x81B</li>
+  </li>
+  <li>\x83t\x83H\x81[\x83\x89\x83\x80\x82ɍ\x90\x92m\x82\xB7\x82\xE9\x81B<br />
+      Announcements http://logmett.com/support-forums/5<br />
+      Announcements \x82ɐV\x8BK\x93\x8A\x8De\x82\xB7\x82\xE9\x81B\x8E\xED\x97ނ\xCD Announcement\x81B<br />
+      \x88\xEA\x82‘O\x82\xCC Announcement \x82̎\xED\x97ނ\xF0 Normal \x82ɕύX\x82\xB7\x82\xE9\x81B<br />
+      Announcement \x82͎O\x8CŽc\x82\xB7\x82\xB1\x82ƂɂȂ\xC1\x82Ă\xA2\x82\xE9\x82̂ŁA\x8EO\x82‘O\x82\xCC Announcement \x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B</li>
+  <li>Chocolatey \x82̓o\x98^\x82\xF0\x8DX\x90V</li>
+</ol>
+
+</body>
+</html>

Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc	2022-01-12 16:09:55 UTC (rev 9684)
+++ trunk/doc/ja/teraterm.hhc	2022-01-12 16:16:38 UTC (rev 9685)
@@ -642,7 +642,7 @@
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="\x8AJ\x94\xAD\x8EҌ\xFC\x82\xAF">
-			<param name="Local" value="html\reference\develop.txt">
+			<param name="Local" value="html\reference\develop.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<UL>

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2022-01-12 16:09:55 UTC (rev 9684)
+++ trunk/doc/ja/teraterm.hhp	2022-01-12 16:16:38 UTC (rev 9685)
@@ -179,7 +179,7 @@
 HlpRefRe=html\reference\RE.txt
 HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
-HlpRefDev=html\reference\develop.txt
+HlpRefDev=html\reference\develop.html
 HlpRefPutty=html\reference\PuTTY-LICENSE.txt
 HlpRefSource=html\reference\sourcecode.html
 HlpRefOniguruma=html\reference\Oniguruma-LICENSE.txt

Modified: trunk/libs/Refer to develop.txt
===================================================================
--- trunk/libs/Refer to develop.txt	2022-01-12 16:09:55 UTC (rev 9684)
+++ trunk/libs/Refer to develop.txt	2022-01-12 16:16:38 UTC (rev 9685)
@@ -1,3 +1,3 @@
 
-Refer to the ttssh2\doc\en\html\reference\develop.txt for these folders.
+Refer to the ttssh2\doc\en\html\reference\develop.html for these folders.
 

From scmnotify ＠ osdn.net  Thu Jan 13 21:54:13 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 13 Jan 2022 21:54:13 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2ODZdIGNtYWtl44OT44Or44OJ5pmC44CB?=
 =?utf-8?b?b25pZ3VydW1hIDYuOS43LjEg44KS5L2/55So44GZ44KL44KI44GG44Gr44GX?=
 =?utf-8?b?44Gf?=
Message-ID: <1642078453.006287.30807.nullmailer@users.osdn.me>

Revision: 9686
          https://osdn.net/projects/ttssh2/scm/svn/commits/9686
Author:   zmatsuo
Date:     2022-01-13 21:54:12 +0900 (Thu, 13 Jan 2022)
Log Message:
-----------
cmakeビルド時、oniguruma 6.9.7.1 を使用するようにした

Modified Paths:
--------------
    trunk/libs/oniguruma.cmake

-------------- next part --------------
Modified: trunk/libs/oniguruma.cmake
===================================================================
--- trunk/libs/oniguruma.cmake	2022-01-12 16:16:38 UTC (rev 9685)
+++ trunk/libs/oniguruma.cmake	2022-01-13 12:54:12 UTC (rev 9686)
@@ -58,14 +58,14 @@
 
 include(script_support.cmake)
 
-set(SRC_DIR_BASE "5adee14d43128abe8170e0e5de66c43f89df5295")
+set(SRC_DIR_BASE "onig-6.9.7.1")
 set(SRC_ARC "${SRC_DIR_BASE}.tar.gz")
-set(SRC_URL "https://github.com/kkos/oniguruma/archive/${SRC_ARC}")
-set(SRC_ARC_HASH_SHA1 ede358aca7d8b8392d60003cc5810e0684053ed8)
+set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.9.7.1/${SRC_ARC}")
+set(SRC_ARC_HASH_SHA256 6444204b9c34e6eb6c0b23021ce89a0370dad2b2f5c00cd44c342753e0b204d9)
 
 set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/oniguruma")
 set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src")
-set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src/oniguruma-5adee14d43128abe8170e0e5de66c43f89df5295")
+set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src/onig-6.9.7")
 set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/build_${TOOLSET}")
 set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/oniguruma_${TOOLSET}")
 if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
@@ -80,7 +80,7 @@
   file(DOWNLOAD
     ${SRC_URL}
     ${DOWN_DIR}/${SRC_ARC}
-    EXPECTED_HASH SHA1=${SRC_ARC_HASH_SHA1}
+    EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
     SHOW_PROGRESS
     )
 

From scmnotify ＠ osdn.net  Thu Jan 13 21:54:25 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 13 Jan 2022 21:54:25 +0900
Subject: [ttssh2-commit] =?utf-8?q?=5B9687=5D_Visual_Studio_2022_Preview_?=
 =?utf-8?b?54mI5ZCR44GR6KiY6L+w44KS5YmK6Zmk?=
Message-ID: <1642078465.550212.30980.nullmailer@users.osdn.me>

Revision: 9687
          https://osdn.net/projects/ttssh2/scm/svn/commits/9687
Author:   zmatsuo
Date:     2022-01-13 21:54:25 +0900 (Thu, 13 Jan 2022)
Log Message:
-----------
Visual Studio 2022 Preview 版向け記述を削除

- Visual Studio 2022 は 2021/11/08 に公開された

Modified Paths:
--------------
    trunk/libs/openssl11.cmake

-------------- next part --------------
Modified: trunk/libs/openssl11.cmake
===================================================================
--- trunk/libs/openssl11.cmake	2022-01-13 12:54:12 UTC (rev 9686)
+++ trunk/libs/openssl11.cmake	2022-01-13 12:54:25 UTC (rev 9687)
@@ -197,7 +197,6 @@
   elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
     find_program(
       VCVARS32 vcvarsall.bat
-      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Auxiliary/Build"
       HINTS "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build"
       HINTS "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Auxiliary/Build"
       HINTS "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build"
@@ -386,4 +385,3 @@
     message(FATAL_ERROR "cmake install fail ${rv}")
   endif()
 endif()
-

From scmnotify ＠ osdn.net  Thu Jan 13 21:54:35 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 13 Jan 2022 21:54:35 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2ODhdIOaIu+OCiuWApOOBruiqpOOCig==?=
 =?utf-8?b?44KS5L+u5q2j?=
Message-ID: <1642078475.900104.31178.nullmailer@users.osdn.me>

Revision: 9688
          https://osdn.net/projects/ttssh2/scm/svn/commits/9688
Author:   zmatsuo
Date:     2022-01-13 21:54:35 +0900 (Thu, 13 Jan 2022)
Log Message:
-----------
戻り値の誤りを修正

Modified Paths:
--------------
    trunk/teraterm/teraterm/telnet.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/telnet.c
===================================================================
--- trunk/teraterm/teraterm/telnet.c	2022-01-13 12:54:25 UTC (rev 9687)
+++ trunk/teraterm/teraterm/telnet.c	2022-01-13 12:54:35 UTC (rev 9688)
@@ -704,7 +704,7 @@
 
 	*Size = tr.ChangeWinSize;
 	*nx = tr.WinSize.x;
-	*ny = tr.WinSize.x;
+	*ny = tr.WinSize.y;
 }
 
 void TelEnableHisOpt(BYTE b)

From scmnotify ＠ osdn.net  Thu Jan 13 21:54:46 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 13 Jan 2022 21:54:46 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2ODldIOODl+ODreODiOOCv+OCpOODlw==?=
 =?utf-8?b?44KS5Y6z5a+G44Gr44GX44Gf?=
Message-ID: <1642078486.218437.31292.nullmailer@users.osdn.me>

Revision: 9689
          https://osdn.net/projects/ttssh2/scm/svn/commits/9689
Author:   zmatsuo
Date:     2022-01-13 21:54:46 +0900 (Thu, 13 Jan 2022)
Log Message:
-----------
プロトタイプを厳密にした

- 引数未指定をvoid指定に変更
  - func() -> func(void)
- ファイル内のみの関数に static を付けた

Modified Paths:
--------------
    trunk/teraterm/teraterm/telnet.c
    trunk/teraterm/teraterm/telnet.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/telnet.c
===================================================================
--- trunk/teraterm/teraterm/telnet.c	2022-01-13 12:54:35 UTC (rev 9688)
+++ trunk/teraterm/teraterm/telnet.c	2022-01-13 12:54:46 UTC (rev 9689)
@@ -89,7 +89,7 @@
 	return NumberOfBytesWritten;
 }
 
-void DefaultTelRec()
+static void DefaultTelRec(void)
 {
 	int i;
 
@@ -107,7 +107,7 @@
 	tr.ChangeWinSize = FALSE;
 }
 
-void InitTelnet()
+void InitTelnet(void)
 {
 	TelStatus = TelIdle;
 
@@ -134,7 +134,7 @@
 		tr.LogFile = 0;
 }
 
-void EndTelnet()
+void EndTelnet(void)
 {
 	if (tr.LogFile) {
 		CloseHandle(tr.LogFile);
@@ -144,7 +144,7 @@
 	TelStopKeepAliveThread();
 }
 
-void TelWriteLog1(BYTE b)
+static void TelWriteLog1(BYTE b)
 {
 	BYTE Temp[3];
 	BYTE Ch;
@@ -166,7 +166,7 @@
 	win16_lwrite(tr.LogFile, Temp, 3);
 }
 
-void TelWriteLog(PCHAR Buf, int C)
+static void TelWriteLog(PCHAR Buf, int C)
 {
 	int i;
 
@@ -175,7 +175,7 @@
 		TelWriteLog1(Buf[i]);
 }
 
-void SendBack(BYTE a, BYTE b)
+static void SendBack(BYTE a, BYTE b)
 {
 	BYTE Str3[3];
 
@@ -187,7 +187,7 @@
 		TelWriteLog(Str3, 3);
 }
 
-void SendWinSize()
+static void SendWinSize(void)
 {
 	int i;
 	BYTE TmpBuff[21];
@@ -226,7 +226,7 @@
 		TelWriteLog(TmpBuff, i);
 }
 
-void ParseTelIAC(BYTE b)
+static void ParseTelIAC(BYTE b)
 {
 	switch (b) {
 	case SE: break;
@@ -265,7 +265,7 @@
 	}
 }
 
-void ParseTelSB(BYTE b)
+static void ParseTelSB(BYTE b)
 {
 	BYTE TmpStr[51];
 	int i;
@@ -362,7 +362,7 @@
 	}
 }
 
-void ParseTelWill(BYTE b)
+static void ParseTelWill(BYTE b)
 {
 	if (b <= MaxTelOpt) {
 		switch (tr.HisOpt[b].Status) {
@@ -452,7 +452,7 @@
 	TelStatus = TelIdle;
 }
 
-void ParseTelWont(BYTE b)
+static void ParseTelWont(BYTE b)
 {
 	if (b <= MaxTelOpt) {
 		switch (tr.HisOpt[b].Status) {
@@ -532,7 +532,7 @@
 	TelStatus = TelIdle;
 }
 
-void ParseTelDo(BYTE b)
+static void ParseTelDo(BYTE b)
 {
 	if (b <= MaxTelOpt) {
 		switch (tr.MyOpt[b].Status) {
@@ -608,7 +608,7 @@
 	TelStatus = TelIdle;
 }
 
-void ParseTelDont(BYTE b)
+static void ParseTelDont(BYTE b)
 {
 	if (b <= MaxTelOpt) {
 		switch (tr.MyOpt[b].Status) {
@@ -732,7 +732,7 @@
 	}
 }
 
-void TelDisableHisOpt(BYTE b)
+static void TelDisableHisOpt(BYTE b)
 {
 	if (b <= MaxTelOpt) {
 		switch (tr.HisOpt[b].Status) {
@@ -782,7 +782,7 @@
 	}
 }
 
-void TelDisableMyOpt(BYTE b)
+static void TelDisableMyOpt(BYTE b)
 {
 	if (b <= MaxTelOpt) {
 		switch (tr.MyOpt[b].Status) {
@@ -818,7 +818,7 @@
 	}
 }
 
-void TelSendAYT()
+void TelSendAYT(void)
 {
 	BYTE Str[2];
 
@@ -830,7 +830,7 @@
 		TelWriteLog(Str, 2);
 }
 
-void TelSendBreak()
+void TelSendBreak(void)
 {
 	BYTE Str[2];
 
@@ -842,7 +842,7 @@
 		TelWriteLog(Str, 2);
 }
 
-void TelChangeEcho()
+void TelChangeEcho(void)
 {
 	if (ts.LocalEcho==0)
 		TelEnableHisOpt(ECHO);
@@ -850,7 +850,7 @@
 		TelDisableHisOpt(ECHO);
 }
 
-static void TelSendNOP()
+static void TelSendNOP(void)
 {
 	BYTE Str[2];
 
@@ -901,7 +901,8 @@
 }
 
 
-static unsigned _stdcall TelKeepAliveThread(void *dummy) {
+static unsigned _stdcall TelKeepAliveThread(void *dummy)
+{
 	static int instance = 0;
 
 	if (instance > 0)
@@ -919,7 +920,8 @@
 	return 0;
 }
 
-void TelStartKeepAliveThread() {
+void TelStartKeepAliveThread(void)
+{
 	unsigned tid;
 
 	if (ts.TelKeepAliveInterval > 0) {
@@ -937,7 +939,8 @@
 	}
 }
 
-static void TelStopKeepAliveThread() {
+static void TelStopKeepAliveThread(void)
+{
 	if (keepalive_thread != INVALID_HANDLE_VALUE) {
 		nop_interval = 0;
 		WaitForSingleObject(keepalive_thread, INFINITE);
@@ -948,7 +951,8 @@
 	}
 }
 
-void TelUpdateKeepAliveInterval() {
+void TelUpdateKeepAliveInterval(void)
+{
 	if (cv.Open && cv.TelFlag && ts.TCPPort==ts.TelPort) {
 		if (ts.TelKeepAliveInterval > 0 && keepalive_thread == INVALID_HANDLE_VALUE)
 			TelStartKeepAliveThread();

Modified: trunk/teraterm/teraterm/telnet.h
===================================================================
--- trunk/teraterm/teraterm/telnet.h	2022-01-13 12:54:35 UTC (rev 9688)
+++ trunk/teraterm/teraterm/telnet.h	2022-01-13 12:54:46 UTC (rev 9689)
@@ -101,17 +101,17 @@
 extern "C" {
 #endif
 
-void InitTelnet();
-void EndTelnet();
+void InitTelnet(void);
+void EndTelnet(void);
 void ParseTel(BOOL *Size, int *Nx, int *Ny);
 void TelEnableHisOpt(BYTE b);
 void TelEnableMyOpt(BYTE b);
 void TelInformWinSize(int nx, int ny);
-void TelSendAYT();
-void TelSendBreak();
-void TelChangeEcho();
-void TelStartKeepAliveThread();
-void TelUpdateKeepAliveInterval();
+void TelSendAYT(void);
+void TelSendBreak(void);
+void TelChangeEcho(void);
+void TelStartKeepAliveThread(void);
+void TelUpdateKeepAliveInterval(void);
 
 extern int TelStatus;
 

From scmnotify ＠ osdn.net  Thu Jan 13 21:54:56 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Thu, 13 Jan 2022 21:54:56 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OTBdIGN5Z3Rlcm3jgpLotbfli5XjgZk=?=
 =?utf-8?b?44KLYmF05YaF44Gn55Kw5aKD5aSJ5pWwUEFUSOOBq2N5Z3dpbjEuZGxs44G4?=
 =?utf-8?b?44Gu44OR44K544KS6Kit5a6a?=
Message-ID: <1642078496.712319.31420.nullmailer@users.osdn.me>

Revision: 9690
          https://osdn.net/projects/ttssh2/scm/svn/commits/9690
Author:   zmatsuo
Date:     2022-01-13 21:54:56 +0900 (Thu, 13 Jan 2022)
Log Message:
-----------
cygtermを起動するbat内で環境変数PATHにcygwin1.dllへのパスを設定

- 追加するパスは cygwin のデフォルトインストールフォルダ
- batを起動すれば Tera Term 内で WSL 等が使える

Modified Paths:
--------------
    trunk/cygwin/cyglaunch/README.md
    trunk/cygwin/cyglaunch/cyglaunch_cmd.bat
    trunk/cygwin/cyglaunch/cyglaunch_powershell.bat
    trunk/cygwin/cyglaunch/cyglaunch_wsl.bat

-------------- next part --------------
Modified: trunk/cygwin/cyglaunch/README.md
===================================================================
--- trunk/cygwin/cyglaunch/README.md	2022-01-13 12:54:46 UTC (rev 9689)
+++ trunk/cygwin/cyglaunch/README.md	2022-01-13 12:54:56 UTC (rev 9690)
@@ -46,26 +46,14 @@
 
 cyglaunchを拡張して次のbatと同等に起動させれば、Tera Termから使用できる
 
-### cmd.exe
+- cyglaunch_cmd.bat
+  - cmd.exe を Tera Term 内で動作させる
+  - Microsoft Windows [Version 10.0.19043.1348] で動作確認
+- cyglaunch_powershell.bat
+  - powershell を Tera Term 内で動作させる
+- cyglaunch_wsl.bat
+  - wsl を Tera Term 内で動作させる
 
-```
-start "" "\path\to\cygterm.exe" -t "\path\to\ttermpro.exe %%s %%d /E /KR=UTF8 /KT=UTF8 /nossh /VTICON=TTERM" -s "%COMSPEC%"
-```
-
-Microsoft Windows [Version 10.0.19043.1348] で動作確認
-
-### powershell.exe
-
-```
-start "" "\path\to\cygterm.exe" -t "\path\to\ttermpro.exe %%s %%d /E /KR=UTF8 /KT=UTF8 /nossh /VTICON=TTERM" -s "C:/Windows/System32/WindowsPowerShell/v1.0/powershell.exe"
-```
-
-### WSL (Windows Subsystem for Linux)
-
-```
-start "" "\path\to\cygterm.exe" -t "\path\to\ttermpro.exe %%s %%d /E /KR=UTF8 /KT=UTF8 /nossh /VTICON=TTERM" -s "c:/windows/system32/wsl.exe"
-```
-
 ## 歴史
 
 - cyglaunch は通常のexeファイル

Modified: trunk/cygwin/cyglaunch/cyglaunch_cmd.bat
===================================================================
--- trunk/cygwin/cyglaunch/cyglaunch_cmd.bat	2022-01-13 12:54:46 UTC (rev 9689)
+++ trunk/cygwin/cyglaunch/cyglaunch_cmd.bat	2022-01-13 12:54:56 UTC (rev 9690)
@@ -1,2 +1,4 @@
 set DIR=%~dp0
+if exist c:\cygwin\bin set PATH=c:\cygwin\bin;%PATH%
+if exist c:\cygwin64\bin set PATH=c:\cygwin64\bin;%PATH%
 start "" "%DIR%\cygterm.exe" -t "%DIR%\ttermpro.exe %%s %%d /E /KR=UTF8 /KT=UTF8 /nossh /VTICON=TTERM" -s "c:/windows/system32/cmd.exe"

Modified: trunk/cygwin/cyglaunch/cyglaunch_powershell.bat
===================================================================
--- trunk/cygwin/cyglaunch/cyglaunch_powershell.bat	2022-01-13 12:54:46 UTC (rev 9689)
+++ trunk/cygwin/cyglaunch/cyglaunch_powershell.bat	2022-01-13 12:54:56 UTC (rev 9690)
@@ -1,2 +1,4 @@
 set DIR=%~dp0
+if exist c:\cygwin\bin set PATH=c:\cygwin\bin;%PATH%
+if exist c:\cygwin64\bin set PATH=c:\cygwin64\bin;%PATH%
 start "" "%DIR%\cygterm.exe" -t "%DIR%\ttermpro.exe %%s %%d /E /KR=UTF8 /KT=UTF8 /nossh /VTICON=TTERM" -s ""C:/Windows/System32/WindowsPowerShell/v1.0/powershell.exe""

Modified: trunk/cygwin/cyglaunch/cyglaunch_wsl.bat
===================================================================
--- trunk/cygwin/cyglaunch/cyglaunch_wsl.bat	2022-01-13 12:54:46 UTC (rev 9689)
+++ trunk/cygwin/cyglaunch/cyglaunch_wsl.bat	2022-01-13 12:54:56 UTC (rev 9690)
@@ -1,2 +1,4 @@
 set DIR=%~dp0
+if exist c:\cygwin\bin set PATH=c:\cygwin\bin;%PATH%
+if exist c:\cygwin64\bin set PATH=c:\cygwin64\bin;%PATH%
 start "" "%DIR%\cygterm.exe" -t "%DIR%\ttermpro.exe %%s %%d /E /KR=UTF8 /KT=UTF8 /nossh /VTICON=TTERM" -s "c:/windows/system32/wsl.exe"

From scmnotify ＠ osdn.net  Mon Jan 17 00:11:56 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 17 Jan 2022 00:11:56 +0900
Subject: [ttssh2-commit] [9691] Fix typo
Message-ID: <1642345916.265101.18405.nullmailer@users.osdn.me>

Revision: 9691
          https://osdn.net/projects/ttssh2/scm/svn/commits/9691
Author:   nmaya
Date:     2022-01-17 00:11:55 +0900 (Mon, 17 Jan 2022)
Log Message:
-----------
Fix typo

Modified Paths:
--------------
    branches/openssl_3_0_1/ttssh2/ttxssh/CMakeLists.txt

-------------- next part --------------
Modified: branches/openssl_3_0_1/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/openssl_3_0_1/ttssh2/ttxssh/CMakeLists.txt	2022-01-13 12:54:56 UTC (rev 9690)
+++ branches/openssl_3_0_1/ttssh2/ttxssh/CMakeLists.txt	2022-01-16 15:11:55 UTC (rev 9691)
@@ -211,7 +211,7 @@
   ${ZLIB_LIB}
   )
 
-if(TTXSSH_LIBRESSL)
+if(TTXSSH_OPENSSL3)
   target_link_libraries(
     ${PACKAGE_NAME}
     PRIVATE

From scmnotify ＠ osdn.net  Mon Jan 17 00:16:21 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 17 Jan 2022 00:16:21 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OTJdIOaal+WPt+ODqeOCpOODluODqQ==?=
 =?utf-8?b?44Oq44KSIE9wZW5TU0wg44GL44KJIExpYnJlU1NMIOOBq+WkieabtA==?=
Message-ID: <1642346181.027663.27692.nullmailer@users.osdn.me>

Revision: 9692
          https://osdn.net/projects/ttssh2/scm/svn/commits/9692
Author:   nmaya
Date:     2022-01-17 00:16:19 +0900 (Mon, 17 Jan 2022)
Log Message:
-----------
暗号ライブラリを OpenSSL から LibreSSL に変更

#43469

merge from libressl_3_4_2:
r9623,r9624,r9637,r9648,r9658,r9660,r9676,r9677,r9679,r9680,r9683

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9623
    https://osdn.net/projects/ttssh2/scm/svn/commits/9624
    https://osdn.net/projects/ttssh2/scm/svn/commits/9637
    https://osdn.net/projects/ttssh2/scm/svn/commits/9648
    https://osdn.net/projects/ttssh2/scm/svn/commits/9658
    https://osdn.net/projects/ttssh2/scm/svn/commits/9660
    https://osdn.net/projects/ttssh2/scm/svn/commits/9676
    https://osdn.net/projects/ttssh2/scm/svn/commits/9677
    https://osdn.net/projects/ttssh2/scm/svn/commits/9679
    https://osdn.net/projects/ttssh2/scm/svn/commits/9680
    https://osdn.net/projects/ttssh2/scm/svn/commits/9683

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43469

Modified Paths:
--------------
    trunk/doc/convtext.bat
    trunk/doc/en/html/about/copyright.html
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/index.html
    trunk/doc/en/html/reference/.gitignore
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/en/html/reference/sourcecode.html
    trunk/doc/en/teraterm.hhc
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/html/about/copyright.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/index.html
    trunk/doc/ja/html/reference/.gitignore
    trunk/doc/ja/html/reference/develop.txt
    trunk/doc/ja/html/reference/sourcecode.html
    trunk/doc/ja/teraterm.hhc
    trunk/doc/ja/teraterm.hhp
    trunk/libs/buildall.bat
    trunk/libs/buildall.cmake
    trunk/ttssh2/ttxssh/CMakeLists.txt
    trunk/ttssh2/ttxssh/arc4random.c
    trunk/ttssh2/ttxssh/cipher-3des1.c
    trunk/ttssh2/ttxssh/cipher-ctr.c
    trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj

Added Paths:
-----------
    trunk/libs/buildlibressl.bat
    trunk/libs/buildlibressl.cmake
    trunk/libs/lib_libressl.cmake
    trunk/libs/libressl/

Property Changed:
----------------
    trunk/

-------------- next part --------------
Index: trunk
===================================================================
--- trunk	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk	2022-01-16 15:16:19 UTC (rev 9692)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,8 ##
 /branches/4-stable:8924,9256-9257
 /branches/drag_and_drop:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr:7825-7827
+/branches/libressl_3_4_2:9623-9624,9637,9648,9658,9660,9676-9677,9679-9680,9683
+/branches/libressl_3_4_2_cmake:9673-9675
 /branches/move_code_script:9026-9185
 /branches/openssl_1_1_1_v2:7785-7786,7788-7808,7811-7812,7814-7815,7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7873-7877,7880-7881,7884-7888,7890-7892,7894-7895,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980,8019,8208,8256
 /branches/openssl_1_1_1_v3:8258,8264-8265
Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/convtext.bat	2022-01-16 15:16:19 UTC (rev 9692)
@@ -5,8 +5,8 @@
 %TOSJIS% -i ..\libs\oniguruma\COPYING   -o %REF_J%\Oniguruma-LICENSE.txt -l unix
 %TOSJIS% -i ..\libs\oniguruma\doc\RE    -o %REF_E%\RE.txt                -l unix
 %TOSJIS% -i ..\libs\oniguruma\doc\RE.ja -o %REF_J%\RE.txt      -c utf8   -l unix
-%TOSJIS% -i ..\libs\openssl\LICENSE     -o %REF_E%\OpenSSL-LICENSE.txt   -l unix
-%TOSJIS% -i ..\libs\openssl\LICENSE     -o %REF_J%\OpenSSL-LICENSE.txt   -l unix
+%TOSJIS% -i ..\libs\libressl\COPYING    -o %REF_E%\LibreSSL-LICENSE.txt  -l unix
+%TOSJIS% -i ..\libs\libressl\COPYING    -o %REF_J%\LibreSSL-LICENSE.txt  -l unix
 %TOSJIS% -i ..\libs\putty\LICENCE       -o %REF_E%\PuTTY-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\putty\LICENCE       -o %REF_J%\PuTTY-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\SFMT\LICENSE.txt    -o %REF_E%\SFMT-LICENSE.txt      -l unix

Modified: trunk/doc/en/html/about/copyright.html
===================================================================
--- trunk/doc/en/html/about/copyright.html	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/en/html/about/copyright.html	2022-01-16 15:16:19 UTC (rev 9692)
@@ -29,7 +29,7 @@
   <li><a href="https://github.com/kkos/oniguruma">Oniguruma</a> ... <a href="../reference/Oniguruma-LICENSE.txt">2-clause BSD license</a></li>
   <li><a href="http://www.math.sci.hiroshima-u.ac.jp/m-mat/MT/SFMT/index.html">SFMT</a> ... <a href="../reference/SFMT-LICENSE.txt">3-clause BSD license</a></li>
   <li><a href="https://www.openssh.com">OpenSSH</a> ... <a href="../reference/OpenSSH-LICENSE.txt">BSD style license</a></li>
-  <li><a href="https://www.openssl.org">OpenSSL</a> ... <a href="../reference/OpenSSL-LICENSE.txt">Dual(both) license, OpenSSL License(Apache License 1.0) and SSLeay License(4-clause BSD license)</a></li>
+  <li><a href="https://www.libressl.org">LibreSSL</a> ... <a href="../reference/LibreSSL-LICENSE.txt">OpenSSL License(Apache License 1.0)" and "SSLeay License(4-clause BSD license)" and "ISC license" and "public domain"</a></li>
   <li><a href="https://zlib.net">zlib</a> ... <a href="../reference/zlib-LICENSE.txt">zlib License</a></li>
   <li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">PuTTY</a> ... <a href="../reference/PuTTY-LICENSE.txt">MIT License</a></li>
   <li><a href="https://github.com/P-H-C/phc-winner-argon2">The reference C implementation of Argon2</a> ... <a href="../reference/argon2-LICENSE.txt">Creative Commons CC0 1.0 License/Waiver or the Apache License 2.0</a></li>
@@ -153,8 +153,8 @@
 
   Copyright of original TTSSH belongs to Robert O'Callahan.
   Copyright of TTSSH supporting SSH2 belongs to Yutaka Hirata.
-  Copyright of OpenSSL belongs to OpenSSL project. Please see <a href="../reference/OpenSSL-LICENSE.txt">OpenSSL-LICENSE.txt</a> for more information about license.
-    OpenSSL is linked to this program statically.
+  Copyright of LibreSSL belongs to OpenBSD project. Please see <a href="../reference/LibreSSL-LICENSE.txt">LibreSSL-LICENSE.txt</a> for more information about license.
+    LibreSSL is linked to this program statically.
   Copyright of zlib belongs to Greg Roelofs and Jean-loup Gaill. Please see <a href="../reference/zlib-LICENSE.txt">OpenSSL-LICENSE.txt</a> for more information about license.
     zlib is linked to this program statically.
   Copyright of OpenSSH belongs to each developers. Please see <a href="../reference/OpenSSH-LICENSE.txt">OpenSSH-LICENSE.txt</a> for more information.

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/en/html/about/history.html	2022-01-16 15:16:19 UTC (rev 9692)
@@ -31,7 +31,7 @@
 
 <h2 id="teraterm">Tera Term</h2>
 
-<h3 id="teraterm_5.0">202x.xx.xx (Ver 5.0)</h3>
+<h3 id="teraterm_5.0">2022.xx.xx (Ver 5.0 not released)</h3>
 <ul class="history">
   <li>Changes
     <ul>
@@ -3303,7 +3303,7 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
-<h3 id="ttssh_2.93">202x.x.x (Ver 2.93 not released)</h3>
+<h3 id="ttssh_2.93">2022.xx.xx (Ver 2.93 not released)</h3>
 <ul class="history">
   <!--li>Changes
     <ul>
@@ -3317,6 +3317,7 @@
 
   <li>Misc
     <ul>
+      <li>Changed cryptography library from OpenSSL to LibreSSL 3.4.2.</li>
       <li>Upgraded PuTTY to PuTTY 0.76.</li>
     </ul>
   </li>

Modified: trunk/doc/en/html/index.html
===================================================================
--- trunk/doc/en/html/index.html	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/en/html/index.html	2022-01-16 15:16:19 UTC (rev 9692)
@@ -142,7 +142,7 @@
  <LI><A HREF="reference/Oniguruma-LICENSE.txt">License of Oniguruma</A></LI>
  <LI><A HREF="reference/SFMT-LICENSE.txt">License of SFMT</A></LI>
  <LI><A HREF="reference/OpenSSH-LICENSE.txt">License of OpenSSH</A></LI>
- <LI><A HREF="reference/OpenSSL-LICENSE.txt">License of OpenSSL</A></LI>
+ <LI><A HREF="reference/LibreSSL-LICENSE.txt">License of LibreSSL</A></LI>
  <LI><A HREF="reference/zlib-LICENSE.txt">License of zlib</A></LI>
  <LI><A HREF="reference/PuTTY-LICENSE.txt">License of PuTTY</A></LI>
  <LI><A HREF="reference/argon2-LICENSE.txt">License of The reference C implementation of Argon2</A></LI>

Modified: trunk/doc/en/html/reference/.gitignore
===================================================================
--- trunk/doc/en/html/reference/.gitignore	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/en/html/reference/.gitignore	2022-01-16 15:16:19 UTC (rev 9692)
@@ -1,6 +1,7 @@
 CygTerm+-LICENSE.txt
 Oniguruma-LICENSE.txt
 OpenSSL-LICENSE.txt
+LibreSSL-LICENSE.txt
 PuTTY-LICENSE.txt
 RE.txt
 SFMT-LICENSE.txt

Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/en/html/reference/develop.txt	2022-01-16 15:16:19 UTC (rev 9692)
@@ -77,7 +77,7 @@
 
 * Libraries
 - Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.1k (http://www.openssl.org/)
+- LibreSSL 3.4.2 (https://www.libressl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.76 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)
@@ -163,11 +163,10 @@
      (2) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
      (3) Move 'libs' directory on the command prompt. And run buildoniguruma6.bat.
 
-  3. OpenSSL (used by TTSSH)
-     (1) Extract openssl source into libs/openssl directory.
-     (2) When the libs/openssl/Makefile.bak file exists on the OpenSSL 1.0.0e or later, delete the file only once
-     (3) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
-     (4) Move 'libs' directory on the command prompt. And run buildopenssl11.bat.
+  3. LibreSSL (used by TTSSH)
+     (1) Extract LibreSSL source into libs/libressl directory.
+     (2) Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
+     (3) Move 'libs' directory on the command prompt. And run buildlibressl.bat.
 
   4. Zlib (used by TTSSH)
      (1) Extract zlib source into libs/zlib directory.
@@ -317,8 +316,8 @@
        http://www.jrsoftware.org/isdl.php
      Oniguruma
        https://github.com/kkos/oniguruma
-     OpenSSL
-       http://www.openssl.org/
+     LibreSSL
+       https://www.libressl.org/
      zlib
        http://www.zlib.net/
      PuTTY

Modified: trunk/doc/en/html/reference/sourcecode.html
===================================================================
--- trunk/doc/en/html/reference/sourcecode.html	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/en/html/reference/sourcecode.html	2022-01-16 15:16:19 UTC (rev 9692)
@@ -99,7 +99,7 @@
   The macro program is linked to pseudorandom number generator "SFMT", which allows to generate random number in "random" macro command.
 </p>
 <p>
-  "TTSSH" module is linkd to "OpenSSL" library to perform cryptography related operations. One may think that OpenSSL library contains only Secure Socket Layer (SSL) protocol related functions used for secure web access, however that is wrong assumption. OpenSSL library also supports basic cipher algorithms, which are utilized by "TTSSH" module. Since Secure Layer related functions of the library are not used, it is very unlikely that "TTSSH" module will be compromised if a SSL related security hole is found in OpenSSL library.
+  "TTSSH" module is linkd to "LibreSSL" library to perform cryptography related operations. One may think that LibreSSL library contains only Secure Socket Layer (SSL) protocol related functions used for secure web access, however that is wrong assumption. LibreSSL library also supports basic cipher algorithms, which are utilized by "TTSSH" module. Since Secure Layer related functions of the library are not used, it is very unlikely that "TTSSH" module will be compromised if a SSL related security hole is found in LibreSSL library.
 </p>
 <p>
   "TTSSH" module is linkd to compression Library "zlib" to compress SSH packets. Packet compression is effective on low speed networks like for example with dial-up connections, however in high speed networks it may slow down communication. That's why packet compression function is disabled by default. <br>

Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/en/teraterm.hhc	2022-01-16 15:16:19 UTC (rev 9692)
@@ -578,8 +578,8 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="License of OpenSSL">
-			<param name="Local" value="html\reference\OpenSSL-LICENSE.txt">
+			<param name="Name" value="License of LibreSSL">
+			<param name="Local" value="html\reference\LibreSSL-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">

Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/en/teraterm.hhp	2022-01-16 15:16:19 UTC (rev 9692)
@@ -170,7 +170,7 @@
 HlpSetupLang=html\setup\lng.html
 HlpRefKeycode=html\reference\keycode.txt
 HlpRefRe=html\reference\RE.txt
-HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
+HlpRefOpenssl=html\reference\LibreSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
 HlpRefDev=html\reference\develop.html
 HlpRefPutty=html\reference\PuTTY-LICENSE.txt

Modified: trunk/doc/ja/html/about/copyright.html
===================================================================
--- trunk/doc/ja/html/about/copyright.html	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/ja/html/about/copyright.html	2022-01-16 15:16:19 UTC (rev 9692)
@@ -29,7 +29,7 @@
   <li><a href="https://github.com/kkos/oniguruma">Oniguruma</a> ... <a href="../reference/Oniguruma-LICENSE.txt">\x93\xF1\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="http://www.math.sci.hiroshima-u.ac.jp/m-mat/MT/SFMT/index-jp.html">SFMT</a> ... <a href="../reference/SFMT-LICENSE.txt">\x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://www.openssh.com">OpenSSH</a> ... <a href="../reference/OpenSSH-LICENSE.txt">BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
-  <li><a href="https://www.openssl.org">OpenSSL</a> ... <a href="../reference/OpenSSL-LICENSE.txt">OpenSSL License(Apache License 1.0) \x82\xC6 SSLeay License(\x8El\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X) \x82̃f\x83\x85\x83A\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X(\x97\xBC\x95\xFB\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82\xE9)</a></li>
+  <li><a href="https://www.libressl.org">LibreSSL</a> ... <a href="../reference/LibreSSL-LICENSE.txt">\x81uOpenSSL License(Apache License 1.0)\x81v\x82ƁuSSLeay License(\x8El\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X)\x81v\x82ƁuISC \x83\x89\x83C\x83Z\x83\x93\x83X\x81v\x82Ɓu\x83p\x83u\x83\x8A\x83b\x83N\x83h\x83\x81\x83C\x83\x93\x81v</a></li>
   <li><a href="https://zlib.net">zlib</a> ... <a href="../reference/zlib-LICENSE.txt">zlib\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">PuTTY</a> ... <a href="../reference/PuTTY-LICENSE.txt">MIT\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
   <li><a href="https://github.com/P-H-C/phc-winner-argon2">The reference C implementation of Argon2</a> ... <a href="../reference/argon2-LICENSE.txt">Creative Commons CC0 1.0 License/Waiver \x82܂\xBD\x82\xCD Apache License 2.0</a></li>
@@ -146,8 +146,8 @@
 
   TTSSH\x82\xCDRobert O'Callahan\x8E\x81\x82̒\x98\x8D앨\x82ł\xB7\x81B
   TTSSH\x82\xCCSSH2\x89\xBB\x82̃R\x81[\x83h\x82ɂ‚\xA2\x82ẮA\x92\x98\x8D쌠\x82͕\xBD\x93c\x96L\x82ɂ\xA0\x82\xE8\x82܂\xB7\x81B
-  OpenSSL\x82\xCDOpenSSL Project\x82̒\x98\x8D앨\x82ł\xB7\x81B\x83\x89\x83C\x83Z\x83\x93\x83X\x8F\xEE\x95\xF1\x82ɂ‚\xA2\x82Ă͓\xAF\x8D\xAB\x82\xCC<a href="../reference/OpenSSL-LICENSE.txt">OpenSSL-LICENSE.txt</a>\x82\xF0\x82\xB2\x97\x97\x89\xBA\x82\xB3\x82\xA2\x81B
-    \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́AOpenSSL\x82ƐÓI\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
+  LibreSSL\x82\xCDOpenBSD Project\x82̒\x98\x8D앨\x82ł\xB7\x81B\x83\x89\x83C\x83Z\x83\x93\x83X\x8F\xEE\x95\xF1\x82ɂ‚\xA2\x82Ă͓\xAF\x8D\xAB\x82\xCC<a href="../reference/LibreSSL-LICENSE.txt">LibreSSL-LICENSE.txt</a>\x82\xF0\x82\xB2\x97\x97\x89\xBA\x82\xB3\x82\xA2\x81B
+    \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́ALibreSSL\x82ƐÓI\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
   zlib\x82\xCDGreg Roelofs\x82\xC6Jean-loup Gailly\x8E\x81\x82̒\x98\x8D앨\x82ł\xB7\x81B\x83\x89\x83C\x83Z\x83\x93\x83X\x8F\xEE\x95\xF1\x82ɂ‚\xA2\x82Ă͓\xAF\x8D\xAB\x82\xCC<a href="../reference/zlib-LICENSE.txt">zlib-LICENSE.txt</a>\x82\xF0\x82\xB2\x97\x97\x89\xBA\x82\xB3\x82\xA2\x81B
     \x96{\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́Azlib\x82ƐÓI\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B
   OpenSSH\x82̒\x98\x8D쌠\x82́A\x8Ae\x8AJ\x94\xAD\x8E҂ɂ\xA0\x82\xE8\x82܂\xB7\x81B\x8Fڂ\xB5\x82\xAD\x82͓\xAF\x8D\xAB\x82\xCC<a href="../reference/OpenSSH-LICENSE.txt">OpenSSH-LICENSE.txt</a>\x82\xF0\x82\xB2\x97\x97\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/ja/html/about/history.html	2022-01-16 15:16:19 UTC (rev 9692)
@@ -31,7 +31,7 @@
 
 <h2 id="teraterm">Tera Term</h2>
 
-<h3 id="teraterm_5.0">202x.xx.xx (Ver 5.0)</h3>
+<h3 id="teraterm_5.0">2022.xx.xx (Ver 5.0 not released)</h3>
 <ul class="history">
   <li>\x95ύX
     <ul>
@@ -3309,7 +3309,7 @@
 
 <h2 id="ttssh">TTSSH</h2>
 
-<h3 id="ttssh_2.93">202x.x.x (Ver 2.93 not released)</h3>
+<h3 id="ttssh_2.93">2022.xx.xx (Ver 2.93 not released)</h3>
 <ul class="history">
   <!--li>\x95ύX
     <ul>
@@ -3323,6 +3323,7 @@
 
   <li>\x82\xBB\x82̑\xBC
     <ul>
+      <li>\x88Í\x86\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0 OpenSSL \x82\xA9\x82\xE7 LibreSSL 3.4.2 \x82֕ύX\x82\xB5\x82\xBD\x81B</li>
       <li>PuTTY 0.76 \x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
     </ul>
   </li>

Modified: trunk/doc/ja/html/index.html
===================================================================
--- trunk/doc/ja/html/index.html	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/ja/html/index.html	2022-01-16 15:16:19 UTC (rev 9692)
@@ -144,7 +144,7 @@
  <LI><A HREF="reference/Oniguruma-LICENSE.txt">\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/SFMT-LICENSE.txt">SFMT \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/OpenSSH-LICENSE.txt">OpenSSH \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
- <LI><A HREF="reference/OpenSSL-LICENSE.txt">OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
+ <LI><A HREF="reference/LibreSSL-LICENSE.txt">LibreSSL \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/zlib-LICENSE.txt">zlib \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/PuTTY-LICENSE.txt">PuTTY \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>
  <LI><A HREF="reference/argon2-LICENSE.txt">The reference C implementation of Argon2 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI>

Modified: trunk/doc/ja/html/reference/.gitignore
===================================================================
--- trunk/doc/ja/html/reference/.gitignore	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/ja/html/reference/.gitignore	2022-01-16 15:16:19 UTC (rev 9692)
@@ -1,6 +1,7 @@
 CygTerm+-LICENSE.txt
 Oniguruma-LICENSE.txt
 OpenSSL-LICENSE.txt
+LibreSSL-LICENSE.txt
 PuTTY-LICENSE.txt
 RE.txt
 SFMT-LICENSE.txt

Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/ja/html/reference/develop.txt	2022-01-16 15:16:19 UTC (rev 9692)
@@ -70,7 +70,7 @@
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
 - Oniguruma 6.9.7.1 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.1k (http://www.openssl.org/)
+- LibreSSL 3.4.2 (https://www.libressl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.76 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html)
@@ -159,11 +159,10 @@
      (2) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
      (3) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildoniguruma6.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
 
-  3. OpenSSL (used by TTSSH)
-     (1) openssl \x82̃\\x81[\x83X\x82\xF0 libs/openssl \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B
-     (2) OpenSSL 1.0.0e \x88ȍ~\x82ŁAlibs/openssl/Makefile.bak \x82\xAA\x8Dŏ\x89\x82\xA9\x82瑶\x8D݂\xB7\x82\xE9\x8Fꍇ\x82́A\x88\xEA\x93x\x82\xBE\x82\xAF\x8E蓮\x82ō폜\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-     (3) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
-     (4) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildopenssl11.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
+  3. LibreSSL (used by TTSSH)
+     (1) LibreSSL \x82̃\\x81[\x83X\x82\xF0 libs/libressl \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B
+     (2) \x83X\x83^\x81[\x83g\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uVisual Studio 2005 \x83R\x83}\x83\x93\x83h \x83v\x83\x8D\x83\x93\x83v\x83g\x81v\x82\xF0\x8BN\x93\xAE\x82\xB7\x82\xE9\x81B
+     (3) \x83R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x8Fォ\x82\xE7 libs \x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82Ɉړ\xAE\x82\xB5\x81Abuildlibressl.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
 
   4. Zlib (used by TTSSH)
      (1) zlib \x82̃\\x81[\x83X\x82\xF0 libs/zlib \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B
@@ -316,8 +315,8 @@
        http://www.jrsoftware.org/isdl.php
      Oniguruma
        https://github.com/kkos/oniguruma
-     OpenSSL
-       http://www.openssl.org/
+     LibreSSL
+       https://www.libressl.org/
      zlib
        http://www.zlib.net/
      PuTTY

Modified: trunk/doc/ja/html/reference/sourcecode.html
===================================================================
--- trunk/doc/ja/html/reference/sourcecode.html	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/ja/html/reference/sourcecode.html	2022-01-16 15:16:19 UTC (rev 9692)
@@ -95,7 +95,7 @@
   Tera Term\x83}\x83N\x83\x8D\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82́A\x8B^\x8E\x97\x97\x90\x90\x94\x90\xB6\x90\xAC\x8A\xED"SFMT"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B"random"\x83R\x83}\x83\x93\x83h\x82ɂ\xA8\x82\xA2\x82ė\x90\x90\x94\x82̐\xB6\x90\xAC\x82ɗ\x98\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
 </p>
 <p>
-  SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82́A\x88Í\x86\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82߂\xC9"OpenSSL"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81BOpenSSL\x82Ƃ\xA2\x82\xA4\x83l\x81[\x83~\x83\x93\x83O\x82\xA9\x82\xE7Web\x83A\x83N\x83Z\x83X\x82Ɏg\x82\xED\x82\xEA\x82\xE9SSL(Secure Socket Layer)\x83v\x83\x8D\x83g\x83R\x83\x8B\x90\xEA\x97p\x82̃\x89\x83C\x83u\x83\x89\x83\x8A\x82\xA9\x82Ǝv\x82\xED\x82ꂪ\x82\xBF\x82ł\xB7\x82\xAA\x81A\x82\xBB\x82\xA4\x82ł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81BOpenSSL\x82͊\xEE\x96{\x93I\x82ȈÍ\x86\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA8\x82\xE8\x81ATTSSH\x82ł\xCDOpenSSL\x82Ɋ܂܂\xEA\x82\xE9\x88Í\x86\x89\xBB/\x95\x9C\x8D\x86\x83\x8B\x81[\x83`\x83\x93\x82݂̂𗘗p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B\x82\xB1\x82̂\xB1\x82Ƃ́A\x82\xB7\x82Ȃ킿OpenSSL\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xC9SSL\x8A֘A\x82̃Z\x83L\x83\x85\x83\x8A\x83e\x83B\x83z\x81[\x83\x
 8B\x82\xAA\x94\xAD\x8C\xA9\x82\xB3\x82ꂽ\x82Ƃ\xB5\x82Ă\xE0\x81ATTSSH\x82ւ̉e\x8B\xBF\x82͋ɂ߂ĒႢ\x82Ƃ\xA2\x82\xA4\x82\xB1\x82Ƃł\xB7\x81B
+  SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82́A\x88Í\x86\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82߂\xC9"LibreSSL"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81BLibreSSL\x82Ƃ\xA2\x82\xA4\x83l\x81[\x83~\x83\x93\x83O\x82\xA9\x82\xE7Web\x83A\x83N\x83Z\x83X\x82Ɏg\x82\xED\x82\xEA\x82\xE9SSL(Secure Socket Layer)\x83v\x83\x8D\x83g\x83R\x83\x8B\x90\xEA\x97p\x82̃\x89\x83C\x83u\x83\x89\x83\x8A\x82\xA9\x82Ǝv\x82\xED\x82ꂪ\x82\xBF\x82ł\xB7\x82\xAA\x81A\x82\xBB\x82\xA4\x82ł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81BLibreSSL\x82͊\xEE\x96{\x93I\x82ȈÍ\x86\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA8\x82\xE8\x81ATTSSH\x82ł\xCDLibreSSL\x82Ɋ܂܂\xEA\x82\xE9\x88Í\x86\x89\xBB/\x95\x9C\x8D\x86\x83\x8B\x81[\x83`\x83\x93\x82݂̂𗘗p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B\x82\xB1\x82̂\xB1\x82Ƃ́A\x82\xB7\x82Ȃ킿LibreSSL\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xC9SSL\x8A֘A\x82̃Z\x83L\x83\x85\x83\x8A\x83e\x83B\x83z\x81[\
 x83\x8B\x82\xAA\x94\xAD\x8C\xA9\x82\xB3\x82ꂽ\x82Ƃ\xB5\x82Ă\xE0\x81ATTSSH\x82ւ̉e\x8B\xBF\x82͋ɂ߂ĒႢ\x82Ƃ\xA2\x82\xA4\x82\xB1\x82Ƃł\xB7\x81B
 </p>
 <p>
   SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82́ASSH\x83p\x83P\x83b\x83g\x82̈\xB3\x8Fk\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82߂Ɉ\xB3\x8Fk\x83\x89\x83C\x83u\x83\x89\x83\x8A"zlib"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B\x82\xBD\x82\xBE\x82\xB5\x81A\x83_\x83C\x83\x84\x83\x8B\x83A\x83b\x83v\x89\xF1\x90\xFC\x82Ȃǂ̒ᑬ\x93x\x82ȃl\x83b\x83g\x83\x8F\x81[\x83N\x82ɂ\xA8\x82\xA2\x82ẮA\x83p\x83P\x83b\x83g\x88\xB3\x8Fk\x82͗L\x8C\xF8\x82ł\xB7\x82\xAA\x81A\x8D\xF0\x8D\xA1\x82̍\x82\x91\xAC\x89\xF1\x90\xFC\x82ł͂ނ\xB5\x82둬\x93x\x92ቺ\x82\xF0\x8F\xB5\x82\xAD\x91\xAB\x82\xA9\x82\xB9\x82ƂȂ\xE8\x82܂\xB7\x81B\x82䂦\x82ɁA\x83f\x83t\x83H\x83\x8B\x83g\x82ł̓p\x83P\x83b\x83g\x88\xB3\x8Fk\x8B@\x94\\x82͖\xB3\x8C\x{27B0B3}\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B

Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/ja/teraterm.hhc	2022-01-16 15:16:19 UTC (rev 9692)
@@ -616,8 +616,8 @@
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X">
-			<param name="Local" value="html\reference\OpenSSL-LICENSE.txt">
+			<param name="Name" value="LibreSSL \x83\x89\x83C\x83Z\x83\x93\x83X">
+			<param name="Local" value="html\reference\LibreSSL-LICENSE.txt">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/doc/ja/teraterm.hhp	2022-01-16 15:16:19 UTC (rev 9692)
@@ -177,7 +177,7 @@
 HlpSetupLang=html\setup\lng.html
 HlpRefKeycode=html\reference\keycode.txt
 HlpRefRe=html\reference\RE.txt
-HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
+HlpRefOpenssl=html\reference\LibreSSL-LICENSE.txt
 HlpRefOpenssh=html\reference\OpenSSH-LICENSE.txt
 HlpRefDev=html\reference\develop.html
 HlpRefPutty=html\reference\PuTTY-LICENSE.txt

Modified: trunk/libs/buildall.bat
===================================================================
--- trunk/libs/buildall.bat	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/libs/buildall.bat	2022-01-16 15:16:19 UTC (rev 9692)
@@ -10,7 +10,7 @@
     exit /b 1
 )
 
-CALL buildopenssl11.bat
+CALL buildlibressl.bat
 if ERRORLEVEL 1 (
     echo "buildall.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
     exit /b 1

Modified: trunk/libs/buildall.cmake
===================================================================
--- trunk/libs/buildall.cmake	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/libs/buildall.cmake	2022-01-16 15:16:19 UTC (rev 9692)
@@ -55,5 +55,9 @@
 execute_process(
   COMMAND ${CMAKE_COMMAND} -P argon2.cmake
   )
+message("libressl")
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P buildlibressl.cmake
+  )
 
 message("done buildall.cmake")

Copied: trunk/libs/buildlibressl.bat (from rev 9624, branches/libressl_3_4_2/libs/buildlibressl.bat)
===================================================================
--- trunk/libs/buildlibressl.bat	                        (rev 0)
+++ trunk/libs/buildlibressl.bat	2022-01-16 15:16:19 UTC (rev 9692)
@@ -0,0 +1,68 @@
+rem LibreSSL\x82̃r\x83\x8B\x83h
+
+cd libressl
+
+
+if exist "CMakeCache.txt" goto end
+
+
+if not "%VSINSTALLDIR%" == "" goto vsinstdir
+
+:check_2019
+if "%VS160COMNTOOLS%" == "" goto check_2022
+if not exist "%VS160COMNTOOLS%\VsDevCmd.bat" goto check_2022
+call "%VS160COMNTOOLS%\VsDevCmd.bat"
+goto vs2019
+
+:check_2022
+if "%VS170COMNTOOLS%" == "" goto novs
+if not exist "%VS170COMNTOOLS%\VsDevCmd.bat" goto novs
+call "%VS170COMNTOOLS%\VsDevCmd.bat"
+goto vs2022
+
+:novs
+echo "Can't find Visual Studio"
+goto fail
+
+:vsinstdir
+rem Visual Studio\x82̃o\x81[\x83W\x83\x87\x83\x93\x94\xBB\x95\xCA
+set VSCMNDIR="%VSINSTALLDIR%\Common7\Tools\"
+set VSCMNDIR=%VSCMNDIR:\\=\%
+
+if /I %VSCMNDIR% EQU "%VS160COMNTOOLS%" goto vs2019
+if /I %VSCMNDIR% EQU "%VS170COMNTOOLS%" goto vs2022
+
+echo Unknown Visual Studio version
+goto fail
+
+:vs2019
+set CMAKE_PARAMETER=-G "Visual Studio 16 2019" -A Win32
+goto vsend
+
+:vs2022
+set CMAKE_PARAMETER=-G "Visual Studio 17 2022" -A Win32
+goto vsend
+
+:vsend
+
+set CMAKE=cmake
+rem set CMAKE="C:\Program Files\CMake\bin\cmake"
+rem set CMAKE="%VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake"
+
+%CMAKE% -DMSVC=on -DUSE_STATIC_MSVC_RUNTIMES=on %CMAKE_PARAMETER%
+
+devenv /build Debug LibreSSL.sln /project crypto /projectconfig Debug
+
+devenv /build Release LibreSSL.sln /project crypto /projectconfig Release
+
+
+:end
+cd ..
+exit /b 0
+
+
+:fail
+cd ..
+echo "buildlibressl.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ ＠ echo on
+exit /b 1

Copied: trunk/libs/buildlibressl.cmake (from rev 9680, branches/libressl_3_4_2/libs/buildlibressl.cmake)
===================================================================
--- trunk/libs/buildlibressl.cmake	                        (rev 0)
+++ trunk/libs/buildlibressl.cmake	2022-01-16 15:16:19 UTC (rev 9692)
@@ -0,0 +1,134 @@
+# for libreSSL
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildlibressl.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildlibressl.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P buildlibressl.cmake
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "libressl-3.4.2")
+set(SRC_ARC "libressl-3.4.2.tar.gz")
+set(SRC_URL "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.4.2.tar.gz")
+set(SRC_ARC_HASH_SHA256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/libressl")
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/libressl/src")
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/libressl_${TOOLSET}")
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/libressl/build_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+  set(BUILD_DIR "${BUILD_DIR}_x64")
+endif()
+
+#message("BUILD_DIR=${BUILD_DIR}")
+#message("INSTALL_DIR=${INSTALL_DIR}")
+
+########################################
+
+# Configure + Generate
+function(cmake_generate GENERATOR SRC_DIR WORKING_DIR OPTIONS)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} ${SRC_DIR} .. -G "${GENERATOR}" ${OPTIONS}
+    WORKING_DIRECTORY "${BUILD_DIR}"
+    ENCODING AUTO
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+endfunction()
+
+# build + install
+function(cmake_build WORKING_DIR OPTIONS BUILD_TOOL_OPTIONS)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} --build . ${OPTIONS} --target install -- ${BUILD_TOOL_OPTIONS}
+    WORKING_DIRECTORY "${BUILD_DIR}"
+    ENCODING AUTO
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+endfunction()
+
+########################################
+
+if(NOT EXISTS ${SRC_DIR}/README.md)
+
+  file(DOWNLOAD
+    ${SRC_URL}
+    ${DOWN_DIR}/${SRC_ARC}
+    EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+    SHOW_PROGRESS
+    )
+
+  file(MAKE_DIRECTORY ${EXTRACT_DIR})
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+  file(COPY
+    ${SRC_DIR}/COPYING
+    DESTINATION ${CMAKE_CURRENT_LIST_DIR}/doc_help
+    )
+  file(RENAME
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/COPYING
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/LibreSSL-LICENSE.txt)
+endif()
+
+########################################
+
+file(MAKE_DIRECTORY "${BUILD_DIR}")
+
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+    # multi-configuration
+
+    unset(GENERATE_OPTIONS)
+    list(APPEND GENERATE_OPTIONS -A ${ARCHITECTURE})
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_DEBUG_POSTFIX=d")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}")
+    list(APPEND GENERATE_OPTIONS "-DLIBRESSL_TESTS=off")
+    if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+      list(APPEND GENERATE_OPTIONS "-DMSVC=on")
+      list(APPEND GENERATE_OPTIONS "-DUSE_STATIC_MSVC_RUNTIMES=on")
+    endif()
+
+    cmake_generate("${CMAKE_GENERATOR}" "${SRC_DIR}" "${BUILD_DIR}" "${GENERATE_OPTIONS}")
+
+    unset(BUILD_OPTIONS)
+    list(APPEND BUILD_OPTIONS "--config Debug")
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "")
+
+    unset(BUILD_OPTIONS)
+    list(APPEND BUILD_OPTIONS "--config Release")
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "")
+
+    return()
+  else()
+    # single-configuration
+    unset(GENERATE_OPTIONS)
+    if(CMAKE_HOST_UNIX)
+      list(APPEND GENERATE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_LIST_DIR}/../mingw.toolchain.cmake")
+    endif(CMAKE_HOST_UNIX)
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}")
+    list(APPEND GENERATE_OPTIONS "-DCMAKE_BUILD_TYPE=Release")
+    if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+      list(APPEND GENERATE_OPTIONS "-DMSVC=on")
+      list(APPEND GENERATE_OPTIONS "-DUSE_STATIC_MSVC_RUNTIMES=on")
+    endif()
+
+    cmake_generate("${CMAKE_GENERATOR}" "${SRC_DIR}" "${BUILD_DIR}" "${GENERATE_OPTIONS}")
+
+    if(${CMAKE_GENERATOR} MATCHES "Unix Makefiles")
+      set(APPEND BUILD_TOOL_OPTIONS "-j")
+    endif()
+
+    unset(BUILD_OPTIONS)
+    cmake_build("${BUILD_DIR}" "${BUILD_OPTIONS}" "${BUILD_TOOL_OPTIONS}")
+
+  endif()
+endif()

Copied: trunk/libs/lib_libressl.cmake (from rev 9680, branches/libressl_3_4_2/libs/lib_libressl.cmake)
===================================================================
--- trunk/libs/lib_libressl.cmake	                        (rev 0)
+++ trunk/libs/lib_libressl.cmake	2022-01-16 15:16:19 UTC (rev 9692)
@@ -0,0 +1,27 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(LIBRESSL_ROOT ${CMAKE_CURRENT_LIST_DIR}/libressl_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(LIBRESSL_ROOT "${LIBRESSL_ROOT}_x64")
+endif()
+
+if(MINGW)
+  set(LIBRESSL_INCLUDE_DIRS
+    ${LIBRESSL_ROOT}/include
+    )
+
+  set(LIBRESSL_LIB
+    ${LIBRESSL_ROOT}/lib/libcrypto-47.a
+    bcrypt
+  )
+else()
+  set(LIBRESSL_INCLUDE_DIRS
+    ${LIBRESSL_ROOT}/include
+    )
+
+  set(LIBRESSL_LIB
+    debug ${LIBRESSL_ROOT}/lib/crypto-47d.lib
+    optimized ${LIBRESSL_ROOT}/lib/crypto-47d.lib
+    )
+endif()

Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt	2022-01-16 15:16:19 UTC (rev 9692)
@@ -1,9 +1,15 @@
 set(PACKAGE_NAME "ttxssh")
 
+option(TTXSSH_LIBRESSL "User LibreSSL" on)
+
 project(${PACKAGE_NAME})
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+if(TTXSSH_LIBRESSL)
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_libressl.cmake)
+else()
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
+endif()
 
 add_library(
   ${PACKAGE_NAME} SHARED
@@ -155,10 +161,23 @@
   ../../teraterm/common
   ../matcher
   ../putty
-  ${OPENSSL_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIRS}
-)
+  )
+if(TTXSSH_LIBRESSL)
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${LIBRESSL_INCLUDE_DIRS}
+    )
+else()
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL_INCLUDE_DIRS}
+    )
+endif()
 
+
 set_target_properties(
   ${PACKAGE_NAME}
   PROPERTIES
@@ -188,9 +207,24 @@
   ttpcmn
   argon2
   ${ZLIB_LIB}
-  ${OPENSSL_LIB}
   )
 
+if(TTXSSH_LIBRESSL)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${LIBRESSL_LIB}
+    bcrypt.lib
+    )
+else()
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL_LIB}
+    crypt32.lib		# TODO このlibを使用しないパッチを適応したら削除すること
+    )
+endif()
+
 if(SUPPORT_OLD_WINDOWS)
   target_link_libraries(
     ${PACKAGE_NAME}
@@ -206,8 +240,6 @@
   gdi32
   comdlg32
   comctl32
-  # OpenSSL が使用
-  crypt32.lib		# TODO このlibを使用しないパッチを適応したら削除すること
   )
 
 install(

Modified: trunk/ttssh2/ttxssh/arc4random.c
===================================================================
--- trunk/ttssh2/ttxssh/arc4random.c	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/ttssh2/ttxssh/arc4random.c	2022-01-16 15:16:19 UTC (rev 9692)
@@ -22,8 +22,16 @@
 
 /*
  * ChaCha based random number generator for OpenBSD.
+ *   openssh-portable: openbsd-compat/arc4random.c
  */
 
+/*
+ * with LibreSSL, use getentropy() instead of RAND_bytes().
+ *   OpenBSD: lib/libcrypto/arc4random/getentropy_win.c
+ *   $OpenBSD: getentropy_win.c,v 1.6 2020/11/11 10:41:24 bcook Exp $
+ */
+
+
 #include <sys/types.h>
 
 #include <stdlib.h>
@@ -35,8 +43,12 @@
 #include "arc4random.h"
 #include "chacha.h"
 
+#ifndef LIBRESSL_VERSION_NUMBER
 #include <openssl/rand.h>
 #include <openssl/err.h>
+#else
+#include <bcrypt.h>
+#endif
 
 /* OpenSSH isn't multithreaded */
 #define _ARC4_LOCK()
@@ -64,14 +76,41 @@
 	chacha_ivsetup(&rs, buf + KEYSZ, NULL);
 }
 
+#ifdef LIBRESSL_VERSION_NUMBER
+/*
+ * On Windows, BCryptGenRandom with BCRYPT_USE_SYSTEM_PREFERRED_RNG is supposed
+ * to be a well-seeded, cryptographically strong random number generator.
+ * https://docs.microsoft.com/en-us/windows/win32/api/bcrypt/nf-bcrypt-bcryptgenrandom
+ */
+static int
+getentropy(void *buf, size_t len)
+{
+	if (len > 256) {
+		return (-1);
+	}
+
+	if (FAILED(BCryptGenRandom(NULL, buf, len, BCRYPT_USE_SYSTEM_PREFERRED_RNG))) {
+		return (-1);
+	}
+
+	return (0);
+}
+#endif /* LIBRESSL_VERSION_NUMBER */
+
 static void
 _rs_stir(void)
 {
 	u_char rnd[KEYSZ + IVSZ];
 
+#ifndef LIBRESSL_VERSION_NUMBER
 	if (RAND_bytes(rnd, sizeof(rnd)) <= 0) {
 		return;
 	}
+#else
+	if (getentropy(rnd, sizeof(rnd)) <= 0) {
+		return;
+	}
+#endif
 
 	if (!rs_initialized) {
 		rs_initialized = 1;

Modified: trunk/ttssh2/ttxssh/cipher-3des1.c
===================================================================
--- trunk/ttssh2/ttxssh/cipher-3des1.c	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/ttssh2/ttxssh/cipher-3des1.c	2022-01-16 15:16:19 UTC (rev 9692)
@@ -52,7 +52,6 @@
 };
 
 const EVP_CIPHER * evp_ssh1_3des(void);
-int ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int);
 
 static int ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, int enc)
 {
@@ -124,37 +123,9 @@
 	return 1;
 }
 
-// ssh1_3des_iv \x82͖\xA2\x8Eg\x97p\x81B
-int ssh1_3des_iv(EVP_CIPHER_CTX *evp, int doset, u_char *iv, int len)
-{
-	struct ssh1_3des_ctx *c;
-
-	if (len != 24) {
-		//fatal("%s: bad 3des iv length: %d", __func__, len);
-		return SSH_ERR_INVALID_ARGUMENT;
-	}
-
-	if ((c = EVP_CIPHER_CTX_get_app_data(evp)) == NULL) {
-		//fatal("%s: no 3des context", __func__);
-		return SSH_ERR_INTERNAL_ERROR;
-	}
-
-	if (doset) {
-		//debug3("%s: Installed 3DES IV", __func__);
-		memcpy(EVP_CIPHER_CTX_iv_noconst(c->k1), iv, 8);
-		memcpy(EVP_CIPHER_CTX_iv_noconst(c->k2), iv + 8, 8);
-		memcpy(EVP_CIPHER_CTX_iv_noconst(c->k3), iv + 16, 8);
-	} else {
-		//debug3("%s: Copying 3DES IV", __func__);
-		memcpy(iv, EVP_CIPHER_CTX_iv(c->k1), 8);
-		memcpy(iv + 8, EVP_CIPHER_CTX_iv(c->k2), 8);
-		memcpy(iv + 16, EVP_CIPHER_CTX_iv(c->k3), 8);
-	}
-	return 0;
-}
-
 const EVP_CIPHER *evp_ssh1_3des(void)
 {
+#ifndef LIBRESSL_VERSION_NUMBER
 	static EVP_CIPHER *p = NULL;
 
 	if (p == NULL) {
@@ -169,4 +140,18 @@
 		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH);
 	}
 	return (p);
+#else
+	static EVP_CIPHER ssh1_3des;
+
+	memset(&ssh1_3des, 0, sizeof(EVP_CIPHER));
+	ssh1_3des.nid = NID_undef;
+	ssh1_3des.block_size = 8;
+	ssh1_3des.iv_len = 0;
+	ssh1_3des.key_len = 16;
+	ssh1_3des.init = ssh1_3des_init;
+	ssh1_3des.cleanup = ssh1_3des_cleanup;
+	ssh1_3des.do_cipher = ssh1_3des_cbc;
+	ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH;
+	return (&ssh1_3des);
+#endif
 }

Modified: trunk/ttssh2/ttxssh/cipher-ctr.c
===================================================================
--- trunk/ttssh2/ttxssh/cipher-ctr.c	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/ttssh2/ttxssh/cipher-ctr.c	2022-01-16 15:16:19 UTC (rev 9692)
@@ -133,6 +133,7 @@
 const EVP_CIPHER *
 evp_aes_128_ctr(void)
 {
+#ifndef LIBRESSL_VERSION_NUMBER
 	static EVP_CIPHER *p = NULL;
 
 	if (p == NULL) {
@@ -147,6 +148,22 @@
 		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV);
 	}
 	return (p);
+#else
+	static EVP_CIPHER aes_ctr;
+
+	memset(&aes_ctr, 0, sizeof(EVP_CIPHER));
+	aes_ctr.nid = NID_undef;
+	aes_ctr.block_size = AES_BLOCK_SIZE;
+	aes_ctr.iv_len = AES_BLOCK_SIZE;
+	aes_ctr.key_len = 16;
+	aes_ctr.init = ssh_aes_ctr_init;
+	aes_ctr.cleanup = ssh_aes_ctr_cleanup;
+	aes_ctr.do_cipher = ssh_aes_ctr;
+#ifndef SSH_OLD_EVP
+	aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
+#endif
+	return (&aes_ctr);
+#endif
 }
 
 //============================================================================
@@ -212,6 +229,7 @@
 const EVP_CIPHER *
 evp_des3_ctr(void)
 {
+#ifndef LIBRESSL_VERSION_NUMBER
 	static EVP_CIPHER *p = NULL;
 
 	if (p == NULL) {
@@ -226,6 +244,22 @@
 		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV);
 	}
 	return (p);
+#else
+	static EVP_CIPHER des3_ctr;
+
+	memset(&des3_ctr, 0, sizeof(EVP_CIPHER));
+	des3_ctr.nid = NID_undef;
+	des3_ctr.block_size = DES_BLOCK_SIZE;
+	des3_ctr.iv_len = DES_BLOCK_SIZE;
+	des3_ctr.key_len = 24;
+	des3_ctr.init = ssh_des3_ctr_init;
+	des3_ctr.cleanup = ssh_des3_ctr_cleanup;
+	des3_ctr.do_cipher = ssh_des3_ctr;
+#ifndef SSH_OLD_EVP
+	des3_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
+#endif
+	return (&des3_ctr);
+#endif
 }
 
 //============================================================================
@@ -306,6 +340,7 @@
 const EVP_CIPHER *
 evp_bf_ctr(void)
 {
+#ifndef LIBRESSL_VERSION_NUMBER
 	static EVP_CIPHER *p = NULL;
 
 	if (p == NULL) {
@@ -320,6 +355,22 @@
 		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV);
 	}
 	return (p);
+#else
+	static EVP_CIPHER blowfish_ctr;
+
+	memset(&blowfish_ctr, 0, sizeof(EVP_CIPHER));
+	blowfish_ctr.nid = NID_undef;
+	blowfish_ctr.block_size = BF_BLOCK;
+	blowfish_ctr.iv_len = BF_BLOCK;
+	blowfish_ctr.key_len = 16;
+	blowfish_ctr.init = ssh_bf_ctr_init;
+	blowfish_ctr.cleanup = ssh_bf_ctr_cleanup;
+	blowfish_ctr.do_cipher = ssh_bf_ctr;
+#ifndef SSH_OLD_EVP
+	blowfish_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
+#endif
+	return (&blowfish_ctr);
+#endif
 }
 
 //============================================================================
@@ -400,6 +451,7 @@
 const EVP_CIPHER *
 evp_cast5_ctr(void)
 {
+#ifndef LIBRESSL_VERSION_NUMBER
 	static EVP_CIPHER *p = NULL;
 
 	if (p == NULL) {
@@ -414,6 +466,22 @@
 		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV);
 	}
 	return (p);
+#else
+	static EVP_CIPHER cast5_ctr;
+
+	memset(&cast5_ctr, 0, sizeof(EVP_CIPHER));
+	cast5_ctr.nid = NID_undef;
+	cast5_ctr.block_size = CAST_BLOCK;
+	cast5_ctr.iv_len = CAST_BLOCK;
+	cast5_ctr.key_len = 16;
+	cast5_ctr.init = ssh_cast5_ctr_init;
+	cast5_ctr.cleanup = ssh_cast5_ctr_cleanup;
+	cast5_ctr.do_cipher = ssh_cast5_ctr;
+#ifndef SSH_OLD_EVP
+	cast5_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
+#endif
+	return (&cast5_ctr);
+#endif
 }
 
 //============================================================================
@@ -474,7 +542,7 @@
 const EVP_CIPHER *
 evp_camellia_128_ctr(void)
 {
-
+#ifndef LIBRESSL_VERSION_NUMBER
 	static EVP_CIPHER *p = NULL;
 
 	if (p == NULL) {
@@ -489,4 +557,20 @@
 		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV);
 	}
 	return (p);
+#else
+	static EVP_CIPHER camellia_ctr;
+
+	memset(&camellia_ctr, 0, sizeof(EVP_CIPHER));
+	camellia_ctr.nid = NID_undef;
+	camellia_ctr.block_size = CAMELLIA_BLOCK_SIZE;
+	camellia_ctr.iv_len = CAMELLIA_BLOCK_SIZE;
+	camellia_ctr.key_len = 16;
+	camellia_ctr.init = ssh_camellia_ctr_init;
+	camellia_ctr.cleanup = ssh_camellia_ctr_cleanup;
+	camellia_ctr.do_cipher = ssh_camellia_ctr;
+#ifndef SSH_OLD_EVP
+	camellia_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
+#endif
+	return (&camellia_ctr);
+#endif
 }

Modified: trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj	2022-01-16 15:11:55 UTC (rev 9691)
+++ trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj	2022-01-16 15:16:19 UTC (rev 9692)
@@ -62,7 +62,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\openssl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -79,9 +79,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>common_static.lib;ws2_32.lib;libcrypto.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-47.lib;Bcrypt.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\openssl\out32.dbg;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\libressl\crypto\Debug;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
       <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,7 +106,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\openssl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\libressl\include;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty;$(SolutionDir)argon2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -122,9 +122,9 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>common_static.lib;ws2_32.lib;libcrypto.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common_static.lib;ws2_32.lib;crypto-47.lib;Bcrypt.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\openssl\out32;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\libs\libressl\crypto\Release;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
       <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -243,4 +243,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

From scmnotify ＠ osdn.net  Mon Jan 17 00:35:24 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 17 Jan 2022 00:35:24 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OTNdIE9wZW5TU0wgMyDjga7jg5Pjg6s=?=
 =?utf-8?b?44OJ44Gr5a++5b+c?=
Message-ID: <1642347324.894285.4326.nullmailer@users.osdn.me>

Revision: 9693
          https://osdn.net/projects/ttssh2/scm/svn/commits/9693
Author:   nmaya
Date:     2022-01-17 00:35:24 +0900 (Mon, 17 Jan 2022)
Log Message:
-----------
OpenSSL 3 のビルドに対応

#43469

merge from openssl_3_0_1:
r9621,r9659,r9681,r9691

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9621
    https://osdn.net/projects/ttssh2/scm/svn/commits/9659
    https://osdn.net/projects/ttssh2/scm/svn/commits/9681
    https://osdn.net/projects/ttssh2/scm/svn/commits/9691

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43469

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/CMakeLists.txt
    trunk/ttssh2/ttxssh/cipher.c
    trunk/ttssh2/ttxssh/crypt.c
    trunk/ttssh2/ttxssh/mac.c
    trunk/ttssh2/ttxssh/ssh.c

Added Paths:
-----------
    trunk/libs/buildopenssl3.bat
    trunk/libs/buildopenssl3.cmake
    trunk/libs/lib_openssl3.cmake

Property Changed:
----------------
    trunk/

-------------- next part --------------
Index: trunk
===================================================================
--- trunk	2022-01-16 15:16:19 UTC (rev 9692)
+++ trunk	2022-01-16 15:35:24 UTC (rev 9693)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -6,6 +6,7 ##
 /branches/move_code_script:9026-9185
 /branches/openssl_1_1_1_v2:7785-7786,7788-7808,7811-7812,7814-7815,7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7873-7877,7880-7881,7884-7888,7890-7892,7894-7895,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980,8019,8208,8256
 /branches/openssl_1_1_1_v3:8258,8264-8265
+/branches/openssl_3_0_1:9621,9659,9681,9691
 /branches/portfwd_memleak:7732,7736-7737,7764
 /branches/putty_0_76:9626,9635-9636,9644
 /branches/serial_port_improved:8119,8140-8141,8144,8150,8158-8160,8163,8170-8172,8183,8185,8204,8209,8212-8215
Copied: trunk/libs/buildopenssl3.bat (from rev 9621, branches/openssl_3_0_1/libs/buildopenssl3.bat)
===================================================================
--- trunk/libs/buildopenssl3.bat	                        (rev 0)
+++ trunk/libs/buildopenssl3.bat	2022-01-16 15:35:24 UTC (rev 9693)
@@ -0,0 +1,35 @@
+rem OpenSSL\x82̃r\x83\x8B\x83h
+
+cd openssl
+
+
+rem nmmake clean \x82\xB7\x82\xE9\x82\xC6 ossl_static.pdb \x82\xCD *.pdb \x82Ȃ̂ō폜\x82\xB3\x82\xEA\x82Ă\xB5\x82܂\xA4\x81B
+rem ossl_static.pdb \x82\xCD *.pdb \x82Ȃ̂\xC5 nmake clean \x82\xB7\x82\xE9\x82ƍ폜\x82\xB3\x82\xEA\x82Ă\xB5\x82܂\xA4\x81B
+rem debug \x82̂Ƃ\xAB\x82̂ق\xA4\x82\xAA\x95K\x97v\x82\xBE\x82Ǝv\x82\xED\x82\xEA\x82\xE9\x82̂ŁA
+rem release \x82\xF0\x90\xE6\x82Ƀr\x83\x8B\x83h\x82\xB5\x82\xC4 debug \x82\xCC ossl_static.pdb \x82\xAA\x8Ec\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9\x81B
+
+if exist "out32\libcrypto.lib" goto build_end
+perl Configure no-asm no-async no-shared no-capieng no-dso no-engine VC-WIN32
+perl -e "open(IN,'makefile');while(<IN>){s| /MD| /MT|;print $_;}close(IN);" > makefile.tmp
+move /y makefile.tmp makefile
+nmake -f makefile clean
+nmake -f makefile build_libs
+mkdir out32
+move /y libcrypto.lib out32\
+move /y ossl_static.pdb out32\
+:build_end
+
+if exist "out32.dbg\libcrypto.lib" goto build_dbg_end
+perl Configure no-asm no-async no-shared no-capieng no-dso no-engine VC-WIN32 --debug
+perl -e "open(IN,'makefile');while(<IN>){s| /MDd| /MTd|;print $_;}close(IN);" > makefile.tmp
+move /y makefile.tmp makefile.dbg
+nmake -f makefile.dbg clean
+nmake -f makefile.dbg build_libs
+mkdir out32.dbg
+move /y libcrypto.lib out32.dbg\
+move /y ossl_static.pdb out32.dbg\
+:build_dbg_end
+
+
+cd ..
+exit /b 0

Copied: trunk/libs/buildopenssl3.cmake (from rev 9681, branches/openssl_3_0_1/libs/buildopenssl3.cmake)
===================================================================
--- trunk/libs/buildopenssl3.cmake	                        (rev 0)
+++ trunk/libs/buildopenssl3.cmake	2022-01-16 15:35:24 UTC (rev 9693)
@@ -0,0 +1,341 @@
+# for OpenSSL 1.1.1
+# cmake -DCMAKE_GENERATOR="Visual Studio 17 2022" -DARCHITECTURE=Win32 -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildopenssl3.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P buildopenssl3.cmake
+
+####
+if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
+  if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+    # multi-configuration
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Release
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -DARCHITECTURE=${ARCHITECTURE}
+      -P buildopenssl3.cmake
+      )
+    execute_process(
+      COMMAND ${CMAKE_COMMAND}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_CONFIGURATION_TYPE=Debug
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/VSToolchain.cmake
+      -DARCHITECTURE=${ARCHITECTURE}
+      -P buildopenssl3.cmake
+      )
+    return()
+  elseif("$ENV{MSYSTEM}" MATCHES "MINGW32")
+    # mingw on msys2
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+    # mingw
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  elseif("${CMAKE_GENERATOR}" MATCHES "NMake Makefiles")
+    # VS nmake
+    # single-configuration
+    if("${CMAKE_TOOLCHAIN_FILE}" STREQUAL "")
+      set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/VSToolchain.cmake")
+    endif()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  else()
+    # single-configuration
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+      set(CMAKE_BUILD_TYPE Release)
+    endif()
+  endif()
+endif()
+
+include(script_support.cmake)
+
+set(SRC_DIR_BASE "openssl-3.0.1")
+set(SRC_ARC "openssl-3.0.1.tar.gz")
+set(SRC_URL "https://www.openssl.org/source/openssl-3.0.1.tar.gz")
+set(SRC_ARC_HASH_SHA256 c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1)
+
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/openssl")
+
+set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/openssl3/src_${TOOLSET}")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/openssl3_${TOOLSET}")
+if(("${CMAKE_GENERATOR}" MATCHES "Win64") OR ("$ENV{MSYSTEM_CHOST}" STREQUAL "x86_64-w64-mingw32") OR ("${ARCHITECTURE}" MATCHES "x64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+  set(EXTRACT_DIR "${EXTRACT_DIR}_x64")
+  set(INSTALL_DIR "${INSTALL_DIR}_x64")
+endif()
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Debug"))
+  set(EXTRACT_DIR "${EXTRACT_DIR}_debug")
+  set(INSTALL_DIR "${INSTALL_DIR}_debug")
+endif()
+set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
+
+########################################
+
+file(DOWNLOAD
+  ${SRC_URL}
+  ${DOWN_DIR}/${SRC_ARC}
+  EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+  SHOW_PROGRESS
+  )
+
+########################################
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+  find_program(
+    PERL perl
+    )
+elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+  # Active/Strawberry Perl
+  find_program(
+    PERL perl.exe
+    HINTS ${CMAKE_CURRENT_LIST_DIR}/../buildtools/perl/perl/bin
+    HINTS c:/Perl64/bin
+    HINTS c:/Perl/bin
+    HINTS c:/Strawberry/perl/bin
+    )
+  if("${PERL}" MATCHES "[Cc]ygwin")
+    message(FATAL_ERROR "cygwin perl! ${PERL}")
+  endif()
+else()
+  # MinGW
+  find_program(
+    PERL perl
+    HINTS C:/msys64/usr/bin
+    )
+endif()
+
+if(${PERL} STREQUAL "PERL-NOTFOUND")
+  message(FATAL_ERROR "perl not found")
+endif()
+
+########################################
+
+if(NOT EXISTS "${SRC_DIR}/README.md")
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTRACT_DIR}
+    )
+
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+    WORKING_DIRECTORY ${EXTRACT_DIR}
+    )
+
+  file(COPY
+    ${SRC_DIR}/LICENSE.txt
+    DESTINATION ${CMAKE_CURRENT_LIST_DIR}/doc_help
+    )
+  file(RENAME
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/LICENSE.txt
+    ${CMAKE_CURRENT_LIST_DIR}/doc_help/OpenSSL3-LICENSE.txt)
+
+endif()
+
+########################################
+
+if((${CMAKE_GENERATOR} MATCHES "Visual Studio") OR
+    (${CMAKE_GENERATOR} MATCHES "NMake Makefiles"))
+  ######################################## VS
+  if(${CMAKE_GENERATOR} MATCHES "NMake Makefiles")
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Preview/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    find_program(
+      VCVARS32 vcvarsall.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Auxiliary/Build"
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 14 2015")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 12 2013")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 11 2012")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 10 2010")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    find_program(
+      VCVARS32 vcvars32.bat
+      HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
+      )
+  else()
+    message(FATAL_ERROR "CMAKE_GENERATOR ${CMAKE_GENERATOR} not supported")
+  endif()
+  if(VCVARS32-NOTFOUND OR (${VCVARS32} STREQUAL "VCVARS32-NOTFOUND"))
+    message(FATAL_ERROR "vcvars32.bat not found")
+  endif()
+
+  if((${CMAKE_GENERATOR} MATCHES "Win64") OR ("${ARCHITECTURE}" MATCHES "x64"))
+    set(CONFIG_TARGET "VC-WIN64A")
+  else()
+    set(CONFIG_TARGET "VC-WIN32")
+  endif()
+  if(("${CMAKE_BUILD_TYPE}" STREQUAL "Release") OR ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL "Release"))
+  else()
+    set(CONFIG_TARGET "debug-${CONFIG_TARGET}")
+  endif()
+
+  file(WRITE "${SRC_DIR}/build_cmake.bat"
+    "cd /d %~dp0\n"
+    "setlocal\n"
+    )
+  file(TO_NATIVE_PATH ${PERL} PERL_N)
+  file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+  file(TO_NATIVE_PATH ${VCVARS32} VCVARS32_N)
+  string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
+  file(APPEND "${SRC_DIR}/build_cmake.bat"
+    "set PATH=${PERL_N_PATH};c:\\windows;c:\\windows\\system32\n"
+    )
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+    ## Visual Studio 2005 特別処理
+    # include,libパスの設定
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
+      "set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
+      "set LIB=%SDK%\\lib;%LIB%\n"
+      )
+  endif()
+  if((${CMAKE_GENERATOR} MATCHES "Visual Studio 16 2019") OR ${CMAKE_GENERATOR} MATCHES "Visual Studio 17 2022")
+    if("${ARCHITECTURE}" MATCHES "x64")
+      file(APPEND "${SRC_DIR}/build_cmake.bat"
+        "call \"${VCVARS32_N}\" amd64\n"
+        )
+    else()
+      file(APPEND "${SRC_DIR}/build_cmake.bat"
+        "call \"${VCVARS32_N}\" x86\n"
+        )
+    endif()
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017 Win64")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" amd64\n"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\" x86\n"
+      )
+  elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio")
+    file(APPEND "${SRC_DIR}/build_cmake.bat"
+      "call \"${VCVARS32_N}\"\n"
+      )
+  endif()
+  file(APPEND "${SRC_DIR}/build_cmake.bat"
+    "perl Configure no-asm no-async no-shared no-capieng no-dso no-engine ${CONFIG_TARGET} -D_WIN32_WINNT=0x0501 --prefix=${INSTALL_DIR_N} --openssldir=${INSTALL_DIR_N}\\SSL\n"
+    "nmake -f makefile install\n"
+    )
+  set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
+  file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
+  execute_process(
+    COMMAND cmd /c ${BUILD_CMAKE_BAT_N}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+else()
+  ######################################## MinGW
+  execute_process(
+    COMMAND "uname" -s
+    OUTPUT_VARIABLE ov)
+  string(REGEX MATCH "[A-Za-z0-9]+" UNAME_S ${ov})
+  if("${UNAME_S}" STREQUAL "CYGWIN")
+    find_program(
+      MAKE make.exe
+      HINTS c:/cygwin/usr/bin
+      HINTS c:/cygwin64/usr/bin
+      )
+  elseif(("${UNAME_S}" STREQUAL "MINGW32") OR ("${UNAME_S}" STREQUAL "MINGW64") OR ("${CMAKE_COMMAND}" MATCHES "mingw"))
+    find_program(
+      MAKE make
+      )
+  elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+    find_program(
+      MAKE make
+      )
+  else()
+    message(FATAL_ERROR "unsported")
+  endif()
+  set(ENV{PATH} "/usr/bin;/bin")
+  if(("${UNAME_S}" STREQUAL "MINGW32") OR ("${CMAKE_COMMAND}" MATCHES "mingw32"))
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw32/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/core_perl")
+    set(CONFIG_NAME "mingw")
+  elseif(("${UNAME_S}" STREQUAL "MINGW64") OR ("${CMAKE_COMMAND}" MATCHES "mingw64"))
+    set(CMAKE_C_COMPILER "cc")
+    set(PATH "/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/core_perl")
+    set(CONFIG_NAME "mingw64")
+  else()
+    include(${CMAKE_SOURCE_DIR}/../mingw.toolchain.cmake)
+    set(ENV{CC} ${CMAKE_C_COMPILER})
+    set(ENV{AR} "i686-w64-mingw32-ar")
+    set(ENV{RANLIB} "i686-w64-mingw32-ranlib")
+    set(ENV{RC} "i686-w64-mingw32-windres")
+    set(PATH "/usr/bin:/bin")
+    set(CONFIG_NAME "mingw")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=/usr/bin:/bin" ${PERL} ./Configure no-asm no-async no-shared no-capieng -no-dso -no-engine ${CONFIG_NAME} -D_WIN32_WINNT=0x0501 --prefix=${INSTALL_DIR} --openssldir=${INSTALL_DIR}/SSL
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake configure fail ${rv}")
+  endif()
+  set(MAKE_OPTION "-j")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} CC=${CMAKE_C_COMPILER} ${MAKE_OPTION}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake build fail ${rv}")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E env "PATH=${PATH}" ${MAKE} install ${MAKE_OPTION}
+    WORKING_DIRECTORY ${SRC_DIR}
+    RESULT_VARIABLE rv
+    )
+  if(NOT rv STREQUAL "0")
+    message(FATAL_ERROR "cmake install fail ${rv}")
+  endif()
+endif()

Copied: trunk/libs/lib_openssl3.cmake (from rev 9681, branches/openssl_3_0_1/libs/lib_openssl3.cmake)
===================================================================
--- trunk/libs/lib_openssl3.cmake	                        (rev 0)
+++ trunk/libs/lib_openssl3.cmake	2022-01-16 15:35:24 UTC (rev 9693)
@@ -0,0 +1,33 @@
+
+include(${CMAKE_CURRENT_LIST_DIR}/script_support.cmake)
+
+set(OPENSSL3_ROOT ${CMAKE_CURRENT_LIST_DIR}/openssl3_${TOOLSET})
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(OPENSSL3_ROOT "${OPENSSL3_ROOT}_x64")
+endif()
+
+if(MINGW)
+  set(OPENSSL3_INCLUDE_DIRS
+    ${OPENSSL3_ROOT}/include
+    )
+
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(OPENSSL3_LIB
+      ${OPENSSL3_ROOT}/lib64/libcrypto.a
+      )
+  else()
+    set(OPENSSL3_LIB
+      ${OPENSSL3_ROOT}/lib/libcrypto.a
+      )
+  endif()
+else()
+  set(OPENSSL3_INCLUDE_DIRS
+    "$<$<CONFIG:Debug>:${OPENSSL3_ROOT}_debug/include>"
+    "$<$<CONFIG:Release>:${OPENSSL3_ROOT}/include>"
+    )
+
+  set(OPENSSL3_LIB
+    debug ${OPENSSL3_ROOT}_debug/lib/libcrypto.lib
+    optimized ${OPENSSL3_ROOT}/lib/libcrypto.lib
+    )
+endif()

Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt	2022-01-16 15:16:19 UTC (rev 9692)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt	2022-01-16 15:35:24 UTC (rev 9693)
@@ -1,6 +1,7 @@
 set(PACKAGE_NAME "ttxssh")
 
 option(TTXSSH_LIBRESSL "User LibreSSL" on)
+option(TTXSSH_OPENSSL3 "Use OpenSSL3" off)
 
 project(${PACKAGE_NAME})
 
@@ -7,6 +8,8 @@
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
 if(TTXSSH_LIBRESSL)
   include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_libressl.cmake)
+elseif(TTXSSH_OPENSSL3)
+  include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl3.cmake)
 else()
   include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
 endif()
@@ -163,6 +166,7 @@
   ../putty
   ${ZLIB_INCLUDE_DIRS}
   )
+
 if(TTXSSH_LIBRESSL)
   target_include_directories(
     ${PACKAGE_NAME}
@@ -169,6 +173,12 @@
     PRIVATE
     ${LIBRESSL_INCLUDE_DIRS}
     )
+elseif(TTXSSH_OPENSSL3)
+  target_include_directories(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL3_INCLUDE_DIRS}
+    )
 else()
   target_include_directories(
     ${PACKAGE_NAME}
@@ -216,6 +226,13 @@
     ${LIBRESSL_LIB}
     bcrypt.lib
     )
+elseif(TTXSSH_OPENSSL3)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    ${OPENSSL3_LIB}
+    bcrypt.lib
+    )
 else()
   target_link_libraries(
     ${PACKAGE_NAME}

Modified: trunk/ttssh2/ttxssh/cipher.c
===================================================================
--- trunk/ttssh2/ttxssh/cipher.c	2022-01-16 15:16:19 UTC (rev 9692)
+++ trunk/ttssh2/ttxssh/cipher.c	2022-01-16 15:35:24 UTC (rev 9693)
@@ -46,9 +46,9 @@
 	{SSH2_CIPHER_AES192_CBC,      "aes192-cbc",      16, 24,    0, 0, 0, EVP_aes_192_cbc},      // RFC4253
 	{SSH2_CIPHER_AES256_CBC,      "aes256-cbc",      16, 32,    0, 0, 0, EVP_aes_256_cbc},      // RFC4253
 	{SSH2_CIPHER_BLOWFISH_CBC,    "blowfish-cbc",     8, 16,    0, 0, 0, EVP_bf_cbc},           // RFC4253
-	{SSH2_CIPHER_AES128_CTR,      "aes128-ctr",      16, 16,    0, 0, 0, evp_aes_128_ctr},      // RFC4344
-	{SSH2_CIPHER_AES192_CTR,      "aes192-ctr",      16, 24,    0, 0, 0, evp_aes_128_ctr},      // RFC4344
-	{SSH2_CIPHER_AES256_CTR,      "aes256-ctr",      16, 32,    0, 0, 0, evp_aes_128_ctr},      // RFC4344
+	{SSH2_CIPHER_AES128_CTR,      "aes128-ctr",      16, 16,    0, 0, 0, EVP_aes_128_ctr},      // RFC4344
+	{SSH2_CIPHER_AES192_CTR,      "aes192-ctr",      16, 24,    0, 0, 0, EVP_aes_192_ctr},      // RFC4344
+	{SSH2_CIPHER_AES256_CTR,      "aes256-ctr",      16, 32,    0, 0, 0, EVP_aes_256_ctr},      // RFC4344
 	{SSH2_CIPHER_ARCFOUR,         "arcfour",          8, 16,    0, 0, 0, EVP_rc4},              // RFC4253
 	{SSH2_CIPHER_ARCFOUR128,      "arcfour128",       8, 16, 1536, 0, 0, EVP_rc4},              // RFC4345
 	{SSH2_CIPHER_ARCFOUR256,      "arcfour256",       8, 32, 1536, 0, 0, EVP_rc4},              // RFC4345
@@ -59,9 +59,9 @@
 	{SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc", 16, 16,    0, 0, 0, EVP_camellia_128_cbc}, // draft-kanno-secsh-camellia-02
 	{SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc", 16, 24,    0, 0, 0, EVP_camellia_192_cbc}, // draft-kanno-secsh-camellia-02
 	{SSH2_CIPHER_CAMELLIA256_CBC, "camellia256-cbc", 16, 32,    0, 0, 0, EVP_camellia_256_cbc}, // draft-kanno-secsh-camellia-02
-	{SSH2_CIPHER_CAMELLIA128_CTR, "camellia128-ctr", 16, 16,    0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
-	{SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr", 16, 24,    0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
-	{SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr", 16, 32,    0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
+	{SSH2_CIPHER_CAMELLIA128_CTR, "camellia128-ctr", 16, 16,    0, 0, 0, EVP_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
+	{SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr", 16, 24,    0, 0, 0, EVP_camellia_192_ctr}, // draft-kanno-secsh-camellia-02
+	{SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr", 16, 32,    0, 0, 0, EVP_camellia_256_ctr}, // draft-kanno-secsh-camellia-02
 #ifdef WITH_CAMELLIA_PRIVATE
 	{SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc ＠ openssh.org", 16, 16, 0,  0,  0, EVP_camellia_128_cbc},
 	{SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc ＠ openssh.org", 16, 24, 0,  0,  0, EVP_camellia_192_cbc},
@@ -328,19 +328,30 @@
 		SSH2_CIPHER_AES128_CTR,
 		SSH2_CIPHER_CAMELLIA128_CBC,
 		SSH2_CIPHER_AES128_CBC,
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL
 		SSH2_CIPHER_3DES_CTR,
+#endif
 		SSH2_CIPHER_3DES_CBC,
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL
 		SSH2_CIPHER_BLOWFISH_CTR,
 		SSH2_CIPHER_BLOWFISH_CBC,
 		SSH2_CIPHER_CAST128_CTR,
 		SSH2_CIPHER_CAST128_CBC,
+#endif
 		SSH_CIPHER_3DES,
 		SSH_CIPHER_NONE,
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL
 		SSH2_CIPHER_ARCFOUR256,
 		SSH2_CIPHER_ARCFOUR128,
 		SSH2_CIPHER_ARCFOUR,
+#endif
 		SSH_CIPHER_BLOWFISH,
 		SSH_CIPHER_DES,
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x30000000UL
+		0, 0, 0, // Dummy for SSH2_CIPHER_3DES_CTR, SSH2_CIPHER_BLOWFISH_CTR, SSH2_CIPHER_BLOWFISH_CBC,
+		0, 0,    // Dummy for SSH2_CIPHER_CAST128_CTR, SSH2_CIPHER_CAST128_CBC
+		0, 0, 0, // Dummy for SSH2_CIPHER_ARCFOUR256, SSH2_CIPHER_ARCFOUR128, SSH2_CIPHER_ARCFOUR
+#endif
 		0, 0, 0 // Dummy for SSH_CIPHER_IDEA, SSH_CIPHER_TSS, SSH_CIPHER_RC4
 	};
 

Modified: trunk/ttssh2/ttxssh/crypt.c
===================================================================
--- trunk/ttssh2/ttxssh/crypt.c	2022-01-16 15:16:19 UTC (rev 9692)
+++ trunk/ttssh2/ttxssh/crypt.c	2022-01-16 15:35:24 UTC (rev 9693)
@@ -606,10 +606,13 @@
 		            | (1 << SSH2_CIPHER_AES128_CBC)
 		            | (1 << SSH2_CIPHER_AES192_CBC)
 		            | (1 << SSH2_CIPHER_AES256_CBC)
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL
 		            | (1 << SSH2_CIPHER_BLOWFISH_CBC)
+#endif
 		            | (1 << SSH2_CIPHER_AES128_CTR)
 		            | (1 << SSH2_CIPHER_AES192_CTR)
 		            | (1 << SSH2_CIPHER_AES256_CTR)
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL
 		            | (1 << SSH2_CIPHER_ARCFOUR)
 		            | (1 << SSH2_CIPHER_ARCFOUR128)
 		            | (1 << SSH2_CIPHER_ARCFOUR256)
@@ -617,6 +620,7 @@
 		            | (1 << SSH2_CIPHER_3DES_CTR)
 		            | (1 << SSH2_CIPHER_BLOWFISH_CTR)
 		            | (1 << SSH2_CIPHER_CAST128_CTR)
+#endif
 		            | (1 << SSH2_CIPHER_CAMELLIA128_CBC)
 		            | (1 << SSH2_CIPHER_CAMELLIA192_CBC)
 		            | (1 << SSH2_CIPHER_CAMELLIA256_CBC)

Modified: trunk/ttssh2/ttxssh/mac.c
===================================================================
--- trunk/ttssh2/ttxssh/mac.c	2022-01-16 15:16:19 UTC (rev 9692)
+++ trunk/ttssh2/ttxssh/mac.c	2022-01-16 15:35:24 UTC (rev 9693)
@@ -129,8 +129,10 @@
 		HMAC_SHA2_512,
 		HMAC_SHA2_256,
 		HMAC_SHA1,
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL
 		HMAC_RIPEMD160_EtM,
 		HMAC_RIPEMD160,
+#endif
 		HMAC_MD5_EtM,
 		HMAC_MD5,
 		HMAC_NONE,
@@ -137,7 +139,10 @@
 		HMAC_SHA1_96_EtM,
 		HMAC_MD5_96_EtM,
 		HMAC_SHA1_96,
-		HMAC_MD5_96,
+		HMAC_MD5_96,
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x30000000UL
+		0, 0, // Dummy for HMAC_RIPEMD160_EtM, HMAC_RIPEMD160
+#endif
 		0, // Dummy for HMAC_SHA2_512_96,
 		0, // Dummy for HMAC_SHA2_256_96,
 	};

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2022-01-16 15:16:19 UTC (rev 9692)
+++ trunk/ttssh2/ttxssh/ssh.c	2022-01-16 15:35:24 UTC (rev 9693)
@@ -6413,10 +6413,13 @@
 	                       | 1 << SSH2_CIPHER_AES128_CBC
 	                       | 1 << SSH2_CIPHER_AES192_CBC
 	                       | 1 << SSH2_CIPHER_AES256_CBC
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL
 	                       | 1 << SSH2_CIPHER_BLOWFISH_CBC
+#endif
 	                       | 1 << SSH2_CIPHER_AES128_CTR
 	                       | 1 << SSH2_CIPHER_AES192_CTR
 	                       | 1 << SSH2_CIPHER_AES256_CTR
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x30000000UL
 	                       | 1 << SSH2_CIPHER_ARCFOUR
 	                       | 1 << SSH2_CIPHER_ARCFOUR128
 	                       | 1 << SSH2_CIPHER_ARCFOUR256
@@ -6424,6 +6427,7 @@
 	                       | 1 << SSH2_CIPHER_3DES_CTR
 	                       | 1 << SSH2_CIPHER_BLOWFISH_CTR
 	                       | 1 << SSH2_CIPHER_CAST128_CTR
+#endif
 	                       | 1 << SSH2_CIPHER_CAMELLIA128_CBC
 	                       | 1 << SSH2_CIPHER_CAMELLIA192_CBC
 	                       | 1 << SSH2_CIPHER_CAMELLIA256_CBC

From scmnotify ＠ osdn.net  Mon Jan 17 00:50:48 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 17 Jan 2022 00:50:48 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OTRdIExpYnJlU1NMIOOBq+OBryBjYW1l?=
 =?utf-8?b?bGxpYS1jYmMg44Gu6Zai5pWw44Gv44GC44KL44GMIGNhbWVsbGlhLWN0ciA=?=
 =?utf-8?b?44Gu6Zai5pWw44GM44Gq44GE44Gu44Gn44CBI2lmZGVmIOOBp+S9v+OBhA==?=
 =?utf-8?b?5YiG44GR44KL?=
Message-ID: <1642348248.937750.32339.nullmailer@users.osdn.me>

Revision: 9694
          https://osdn.net/projects/ttssh2/scm/svn/commits/9694
Author:   nmaya
Date:     2022-01-17 00:50:48 +0900 (Mon, 17 Jan 2022)
Log Message:
-----------
LibreSSL には camellia-cbc の関数はあるが camellia-ctr の関数がないので、#ifdef で使い分ける

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/cipher.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/cipher.c
===================================================================
--- trunk/ttssh2/ttxssh/cipher.c	2022-01-16 15:35:24 UTC (rev 9693)
+++ trunk/ttssh2/ttxssh/cipher.c	2022-01-16 15:50:48 UTC (rev 9694)
@@ -59,9 +59,15 @@
 	{SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc", 16, 16,    0, 0, 0, EVP_camellia_128_cbc}, // draft-kanno-secsh-camellia-02
 	{SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc", 16, 24,    0, 0, 0, EVP_camellia_192_cbc}, // draft-kanno-secsh-camellia-02
 	{SSH2_CIPHER_CAMELLIA256_CBC, "camellia256-cbc", 16, 32,    0, 0, 0, EVP_camellia_256_cbc}, // draft-kanno-secsh-camellia-02
+#ifndef LIBRESSL_VERSION_NUMBER
 	{SSH2_CIPHER_CAMELLIA128_CTR, "camellia128-ctr", 16, 16,    0, 0, 0, EVP_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
 	{SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr", 16, 24,    0, 0, 0, EVP_camellia_192_ctr}, // draft-kanno-secsh-camellia-02
 	{SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr", 16, 32,    0, 0, 0, EVP_camellia_256_ctr}, // draft-kanno-secsh-camellia-02
+#else
+	{SSH2_CIPHER_CAMELLIA128_CTR, "camellia128-ctr", 16, 16,    0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
+	{SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr", 16, 24,    0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
+	{SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr", 16, 32,    0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
+#endif
 #ifdef WITH_CAMELLIA_PRIVATE
 	{SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc ＠ openssh.org", 16, 16, 0,  0,  0, EVP_camellia_128_cbc},
 	{SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc ＠ openssh.org", 16, 24, 0,  0,  0, EVP_camellia_192_cbc},

From scmnotify ＠ osdn.net  Mon Jan 17 22:45:31 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 17 Jan 2022 22:45:31 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OTVdIOeogOOBq+OCr+ODqeODg+OCtw==?=
 =?utf-8?b?44Ol44GZ44KL44GT44Go44GM44GC44Gj44Gf?=
Message-ID: <1642427131.087106.25874.nullmailer@users.osdn.me>

Revision: 9695
          https://osdn.net/projects/ttssh2/scm/svn/commits/9695
Author:   zmatsuo
Date:     2022-01-17 22:45:30 +0900 (Mon, 17 Jan 2022)
Log Message:
-----------
稀にクラッシュすることがあった

- URL文字列強調処理内でバッファ外のメモリアクセスを行っていた

Modified Paths:
--------------
    trunk/teraterm/teraterm/buffer.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2022-01-16 15:50:48 UTC (rev 9694)
+++ trunk/teraterm/teraterm/buffer.c	2022-01-17 13:45:30 UTC (rev 9695)
@@ -2491,7 +2491,7 @@
 		if ((cur_y + 1) < NumOfLines) {
 			if ((CodeLineW[x].attr & AttrLineContinued) != 0) {
 				const LONG TmpPtr = GetLinePtr(PageStart + cur_y + 1);
-				if ((CodeLineW[TmpPtr + NumOfColumns - 1].attr & AttrURL) != 0) {
+				if ((CodeBuffW[TmpPtr + NumOfColumns - 1].attr & AttrURL) != 0) {
 					next = TRUE;
 				}
 			}

From scmnotify ＠ osdn.net  Mon Jan 17 22:45:40 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 17 Jan 2022 22:45:40 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OTZdIGNtYWtl5pmC44CBTGlicmVTU0w=?=
 =?utf-8?b?44Op44Kk44K744Oz44K544OV44Kh44Kk44Or44KS44Kz44OU44O8?=
Message-ID: <1642427140.191972.26018.nullmailer@users.osdn.me>

Revision: 9696
          https://osdn.net/projects/ttssh2/scm/svn/commits/9696
Author:   zmatsuo
Date:     2022-01-17 22:45:40 +0900 (Mon, 17 Jan 2022)
Log Message:
-----------
cmake時、LibreSSLライセンスファイルをコピー

Modified Paths:
--------------
    trunk/doc/makechm.cmake

-------------- next part --------------
Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake	2022-01-17 13:45:30 UTC (rev 9695)
+++ trunk/doc/makechm.cmake	2022-01-17 13:45:40 UTC (rev 9696)
@@ -68,8 +68,8 @@
   ConvertHTML("-i ../libs/doc_help/Oniguruma-LICENSE.txt -o ${REF_J}/Oniguruma-LICENSE.txt -l unix")
   ConvertHTML("-i ../libs/doc_help/en/RE                 -o ${REF_E}/RE.txt                -l unix -c utf8")
   ConvertHTML("-i ../libs/doc_help/ja/RE                 -o ${REF_J}/RE.txt                -l unix -c utf8")
-  ConvertHTML("-i ../libs/doc_help/OpenSSL-LICENSE.txt   -o ${REF_E}/OpenSSL-LICENSE.txt   -l unix")
-  ConvertHTML("-i ../libs/doc_help/OpenSSL-LICENSE.txt   -o ${REF_J}/OpenSSL-LICENSE.txt   -l unix")
+  ConvertHTML("-i ../libs/doc_help/LibreSSL-LICENSE.txt  -o ${REF_E}/LibreSSL-LICENSE.txt  -l unix")
+  ConvertHTML("-i ../libs/doc_help/LibreSSL-LICENSE.txt  -o ${REF_J}/LibreSSL-LICENSE.txt  -l unix")
   ConvertHTML("-i ../libs/doc_help/PuTTY-LICENSE.txt     -o ${REF_E}/PuTTY-LICENSE.txt     -l crlf")
   ConvertHTML("-i ../libs/doc_help/PuTTY-LICENSE.txt     -o ${REF_J}/PuTTY-LICENSE.txt     -l crlf")
   ConvertHTML("-i ../libs/doc_help/SFMT-LICENSE.txt      -o ${REF_E}/SFMT-LICENSE.txt      -l unix")

From scmnotify ＠ osdn.net  Mon Jan 17 22:45:49 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 17 Jan 2022 22:45:49 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OTddIOmAo+e1oeWFiOOBruiLseiqng==?=
 =?utf-8?b?54mI?=
Message-ID: <1642427149.507212.26172.nullmailer@users.osdn.me>

Revision: 9697
          https://osdn.net/projects/ttssh2/scm/svn/commits/9697
Author:   zmatsuo
Date:     2022-01-17 22:45:49 +0900 (Mon, 17 Jan 2022)
Log Message:
-----------
連絡先の英語版

- r9678 の英語版

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9678

Modified Paths:
--------------
    trunk/doc/en/html/about/contacts.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/contacts.html
===================================================================
--- trunk/doc/en/html/about/contacts.html	2022-01-17 13:45:40 UTC (rev 9696)
+++ trunk/doc/en/html/about/contacts.html	2022-01-17 13:45:49 UTC (rev 9697)
@@ -3,13 +3,13 @@
 <HTML>
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<TITLE>Contacting the author</TITLE>
+<TITLE>Contact, Infomations</TITLE>
 <META http-equiv="Content-Style-Type" content="text/css">
 <link rel="stylesheet" href="../style.css" type="text/css">
 </HEAD>
 <BODY>
 
-<h1>Contacting the author</h1>
+<h1>Contact, Infomations</h1>
 
 <p>
 Please do not ask the author questions about usage: network configuration, how to connect a host, 
@@ -16,21 +16,29 @@
 host configuration, keyboard configuration, how to write a macro file and so on. Please read the documentation included in the Tera Term package. Useful information and tools may be found at 
 </p>
 
-<p>
-Tera Term Home Page:
-<a href="https://ttssh2.osdn.jp/">https://ttssh2.osdn.jp/</a>
-(The address may be changed in future.)
-</p>
+<h2>web</h2>
 
-<p>
-You may ask the author questions about Tera Term copyrights or a permission for a special way of distributing Tera Term.
-If you want to send just a message without any question, request and bug report, it may be welcome.
-<p>
+<ul>
+  <li><a href="https://ttssh2.osdn.jp/">Tera Term Home Page (https://ttssh2.osdn.jp/)</a></li>
+  <li><a href="https://ja.osdn.net/projects/ttssh2/">Tera Term (Tera Term project page)</a></li>
+    <ul>
+      <li><a href="https://ja.osdn.net/projects/ttssh2/ticket/">Ticket(Bug/Request/vote)</a><br>
+        Please submit new ticket if you found bug<br>
+        Problems that cannot be made public, you can <a href="#ttssh2-contact">Mail</a><br>
+        Ticket with more votes may respond faster<br>
+        Ticket with patch may respond faster<br>
+      </li>
+      <li><a href="https://osdn.net/projects/ttssh2/forums/">forum</a><br>
+        someone may answer your question that you post<br>
+        Q &amp; A will help other users<br>
+        And improve document and program
+      </li>
+      <li><a href="https://ja.osdn.net/projects/ttssh2/releases/">Download</a></li>
+      <li><a href="https://ja.osdn.net/projects/ttssh2/scm/svn/">Source/Repository</a></li>
+    </ul>
+</ul>
 
-<p>
-Before you send bug reports or requests to the author, please read carefully the following:
-</p>
-
+<h2>help documents</h2>
 <ul>
  <li><a href="../about/qanda.html">Q &amp; A</a></li>
  <li><a href="../about/requests.html">Requests</a></li>
@@ -37,23 +45,24 @@
  <li><a href="../setup/teraterm.html">Tera Term setup file</a> (Your request may have already been supported.)</li>
  <li><a href="../macro/index.html">MACRO Help</a></li>
  <li><a href="../reference/keycode.txt">KEYCODE.TXT</a></li>
- <li>Related topics in this help.</li>
 </ul>
 
-<p>
-Before you report a problem, please make sure that it is not caused by bad configuring of Tera Term and Windows.<br>
-If other applications also have the same problem, it may not be a bug of Tera Term. When you report the problem to the author, show the version number of Tera Term and information which may be related to the problem. If possible, please also show how to reproduce the problem.
-</p>
+<h2>Mail, ML</h2>
+<ul>
+  <li>
+    <a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">User ML</a><br>
+    ML for users
+  </li>
+  <li>
+    <a href="https://osdn.net/projects/ttssh2/lists/archive/dev/">Dev ML</a>
+  </li>
+  <li id="ttssh2-contact">
+    <address>ttssh2-contact at lists.osdn.me</address>
+    Mail to project menbers<br>
+    For contacting matter (such as bug) that you do not want to make public<br>
+    The Mail will be shared with project members.
+  </li>
+</ul>
 
-<p>
-The author may not be able to reply your message quickly. The author may ignore bug reports <br>
-already known, requests already received and questions  answered by the Tera Term documentation.
-</p>
-
-<address>
-E-mail address of the author: ttssh2-contact ＠ lists.osdn.me 
-(The address may be changed in future.)
-</address>
-
 </BODY>
 </HTML>

From scmnotify ＠ osdn.net  Wed Jan 19 22:01:28 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 19 Jan 2022 22:01:28 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OThdIHdpa2k644Oq44Oq44O844K544Gu?=
 =?utf-8?b?5pa55rOVIOOCkuODleOCo+ODvOODieODkOODg+OCrw==?=
Message-ID: <1642597288.560493.2763.nullmailer@users.osdn.me>

Revision: 9698
          https://osdn.net/projects/ttssh2/scm/svn/commits/9698
Author:   nmaya
Date:     2022-01-19 22:01:28 +0900 (Wed, 19 Jan 2022)
Log Message:
-----------
wiki:リリースの方法 をフィードバック

Modified Paths:
--------------
    branches/4-stable/doc/en/html/reference/develop.html
    branches/4-stable/doc/ja/html/reference/develop.html

-------------- next part --------------
Modified: branches/4-stable/doc/en/html/reference/develop.html
===================================================================
--- branches/4-stable/doc/en/html/reference/develop.html	2022-01-17 13:45:49 UTC (rev 9697)
+++ branches/4-stable/doc/en/html/reference/develop.html	2022-01-19 13:01:28 UTC (rev 9698)
@@ -423,23 +423,83 @@
 To release Tera Term installation package is shown in the following step:
 </p>
 
+<h3>From start release until create RC</h3>
+
 <ol>
-  <li>Increment the version while RC release process.<br />
-      The binary is released for test in this timing. Prevent that old and new binary have same version number.
+  <li>Confirm ticket and branches.
     <ul>
+      <li>Confirm in project team.
+        <ul>
+          <li>Organize / decide whether to include bug fix / feature in this release or defer.</li>
+        </ul>
+      </li>
+      <li>Merge branches
+        <ul>
+          <li>Verify trunk / 4-stable and working branches.</li>
+        </ul>
+      </li>
+      <li>Close tickets.
+        <ul>
+<!--
+          <li>\x82\xB7\x82łɏC\x90\xB3\x8Dς݁A\x8F\x88\x97\x9D\x8Dς݂̂\xE0\x82̂̓N\x83\x8D\x81[\x83Y\x82\xB7\x82\xE9<br />
+              \x83\x8A\x83\x8A\x81[\x83X\x8E\x9E\x82ɂ́A\x91Ώۂ̃}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82̃`\x83P\x83b\x83g\x82͂\xB7\x82ׂăN\x83\x8D\x81[\x83Y\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91ԂɂȂ\xE9</li>
+          <li>\x8E\x9F\x82̃\x8A\x83\x8A\x81[\x83X\x82։񂷂\xE0\x82̂̓}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82\xF0\x95ύX\x82\xB7\x82\xE9<br />
+              \x8E\x9F\x82̃\x8A\x83\x8A\x81[\x83X\x97p\x83}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li>
+-->
+        </ul>
+      </li>
+<!--
+      <li>\x82\xB1\x82̎\x9E\x93_\x82ŐV\x82\xBD\x82ɏo\x82Ă\xAD\x82\xE9\x83`\x83P\x83b\x83g\x82̑Ή\x9E\x82\xF0\x8C\x9F\x93\xA2\x82\xB7\x82\xE9</li>
+-->
+    </ul>
+  </li>
+  <li>Confirm tools, libraries, import sources.
+    <ul>
+      <li>Visual Studio (<a href="https://visualstudio.microsoft.com">https://visualstudio.microsoft.com</a>)</li>
+      <li>Inno Setup (<a href="https://jrsoftware.org/isdl.php">https://jrsoftware.org/isdl.php</a>)</li>
+      <li>Oniguruma (<a href="https://github.com/kkos/oniguruma">https://github.com/kkos/oniguruma</a>)</li>
+      <li>OpenSSL (<a href="https://www.openssl.org">https://www.openssl.org</a>)</li>
+      <li>zlib (<a href="https://www.zlib.net">http://www.zlib.net</a>)</li>
+      <li>PuTTY (<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>)</li>
+      <li>SFMT (<a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html">http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html</a>)</li>
+      <li>The reference C implementation of Argon2 (<a href="https://github.com/P-H-C/phc-winner-argon2">https://github.com/P-H-C/phc-winner-argon2</a>)</li>
+    </ul>
+<!--
+    <p>\x83\x8A\x83\x8A\x81[\x83X\x82Ɏg\x82\xA4\x83o\x81[\x83W\x83\x87\x83\x93\x82͂\xB1\x82̎\x9E\x93_\x82ł\xA8\x82\xA8\x82ނˌ\x88\x92肷\x82\xE9\x81B</p>
+-->
+  </li>
+<!--
+  <!--li>\x8D\xA1\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82ɓ\xFC\x82ꂽ\x82\xA2\x82\xE0\x82̂\xAA\x97\x8E\x82\xBF\x92\x85\x82\xAD</li>
+-->
+</ol>
+
+<h3>From create RC until release</h3>
+
+<ol>
+  <li>Confirm documents.
+    <ul>
+<!--
+      <li>\x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82̐ݒ荀\x96ځEUI\x82̂Ȃ\xA2\x93\xC1\x95ʃI\x83v\x83V\x83\x87\x83\x93\x81E\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x81E\x90V\x8BK\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ȂǁA\x91Ή\x9E\x82\xB7\x82\xE9\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82ɘR\x82ꂪ\x82Ȃ\xA2\x82\xA9\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82\xF0\x8Am\x94F\x82\xB5\x81A\x8F\x91\x82\xAB\x96Y\x82ꂪ\x82\xA0\x82\xEA\x82ΒNjL\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82̏\x87\x94Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̎w\x90j\x82Ƃ\xB5\x82ẮA\x83^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83V\x83\x87\x83\x93\x8A֌W\x81E\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ă̕ύX\x81E\x83}\x83N\x83\x8D\x82̏\x87\x81B</li>
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x8D\xB7\x95\xAA\x82\xAA\x96|\x96󂳂\xEA\x82Ă\xA2\x82邱\x82Ƃ\xF0\x8Am\x94F\x82\xB5\x81A\x96|\x96\xF3\x96Y\x82ꂪ\x82\xA0\x82\xEA\x82Ζ|\x96󂷂\xE9\x81B</li>
+-->
+    </ul>
+  </li>
+  <li>Increment the version while RC release process.
+    <p>The binary is released for test in this timing. Prevent that old and new binary have same version number.</p>
+    <ul>
       <li>teraterm\common\tt-version.h</li>
       <li>ttssh2\ttxssh\ttxssh-version.h</li>
-      <li>ttpmenu\ttpmenu.rc // only modifying</li>
+      <li>Onttpmenu\ttpmenu.rc // only modifying</li>
       <li>TTProxy\TTProxy.rc // only modifying</li>
       <li>TTXKanjiMenu\ttxkanjimenu.rc // only modifying</li>
-      <li>installer\teraterm.iss
-        <ul>
-          <li>version up AppVer and add "RC"</li>
-          <li>comment out snapshot</li>
-          <li>change called batch files</li>
-        </ul>
-      </li>
     </ul>
+    <p>
+      By way of exception, CygTerm+ always upgrades not regarding Tera Term release process when the patch is committed.<br />
+      The release date is the day committed by a developer. <!--\x82\xBB\x82̂\xBD\x82߁A\x8FC\x90\xB3\x81E\x83o\x81[\x83W\x83\x87\x83\x93\x82̃C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x81E\x95ύX\x97\x9A\x97\xF0\x82𓯎\x9E\x82ɃR\x83~\x83b\x83g\x82\xB7\x82\xE9\x81B--><br />
+      Because user can get gcc compiler for free.
+    </p>
   </li>
   <li>Increment the year of last publication of copyright notice if it is first release in this year.
     <ul>
@@ -466,101 +526,197 @@
       <li>doc\ja\html\macro\index.html</li>
     </ul>
   </li>
-  <li>Check latest libraries and tools.
+  <li>Replace 64bit Cygwin binary
+    <p>
+<!--
+      \x91O\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82\xA9\x82\xE7 CygTerm+ \x82ɕύX\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x82́A64bit Cygwin\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xBD cygterm\cygterm+-x86_64\cygterm.exe \x82\xF0\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9\x81B<br />
+      \x83\\x81[\x83X\x8FC\x90\xB3\x82\xF0\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9\x82Ƃ\xAB\x82ɁA\x93\xAF\x8E\x9E\x82Ƀo\x83C\x83i\x83\x8A\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xEA\x82΁A\x83\x8A\x83\x8A\x81[\x83X\x8E\x9E\x82ɂ\xB1\x82̍H\x92\xF6\x82\xF0\x8Ds\x82\xA4\x95K\x97v\x82͂Ȃ\xA2\x81B
+-->
+    </p>
+  </li>
+  <li>Create installer.
     <ul>
-      <li>Visual Studio<br />
-          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
-      <li>Inno Setup<br />
-          http://www.jrsoftware.org/isdl.php</li>
-      <li>Oniguruma<br />
-          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
-      <li>OpenSSL<br />
-          http://www.openssl.org/</li>
-      <li>zlib<br />
-          http://www.zlib.net/</li>
-      <li>PuTTY<br />
-          http://www.chiark.greenend.org.uk/~sgtatham/putty/</li>
-      <li>SFMT<br />
-          http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</li>
-      <li>CygTerm<br />
-          https://googledrive.com/host/0B1s-dM6d6yC4fmhEZ3c0VTNFWEFtV3daUlRGQmFHVnBmVHRybUNnUVliNWktNDRlZ2NnZTQ/index-e.html</li>
+      <li>Version up AppVer and add "RC" in teraterm.iss.
+        <pre>
+- #define AppVer "4.105"
++ #define AppVer "4.106-RC1"
+        </pre>
+      </li>
+      <li>Comment out snapshot in teraterm.iss.
+        <pre>
+- #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
++ ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+        </pre>
+      </li>
+      <li>Change calling batch file to enable rebuild and create archive.
+        <pre>
+  [InnoIDE_PreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [InnoIDE_PostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+  
+  [PreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [PostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+  
+  [_ISToolPreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [_ISToolPostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+        </pre>
+      </li>
+      <li id="RC_commit">Commit this state.</li>
+      <li>Open teraterm\installer\teraterm.iss with ISTool, and create installer by "Project"-"Compile Setup."</li>
+      <li>Compress portable version with zip.</li>
     </ul>
   </li>
-  <li>Check the document files.</li>
-  <li>Increase the software version and modify date.
+  <li>Test run installer, run and connect in all supported OS.</li>
+  <li>Add to OSDN Release
     <ul>
-      <li>teraterm.iss<br />
-          remove "RC" from AppVer</li>
-      <li>html/about/hisotry.html</li>
+      <li>Add new release (e.g. "4.106 RC") to "Tera Term RC" Package.</li>
+      <li>Add installer and portable zip file to new release.</li>
     </ul>
-    Note: Don't update the version number until the release, because the installer does not overwrite file when versions are same.<br />
-    Note: By way of exception, CygTerm+ always upgrades not regarding Tera Term release process when the patch is committed. The release date is the day committed by a developer. The suffix of CygTerm+ version is patchlevel, and then a user can get gcc compiler for free.
   </li>
-  <li>When CygTerm+ is changed from previous version, please build the software with 64bit Cygwin and replace cygterm\cygterm+-x86_64\cygterm.exe.</li>
-  <li>Evaluate executable program file.
+  <li>Announce RC release.
     <ul>
-      <li>Make installer package<br />
-          Open "teraterm\installer\teraterm.iss" with ISTool and call [Project]-[Compile Setup] with InnoSetup.</li>
-      <li>Test Tera Term installation and evaluate it.</li>
+      <li><a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">ttssh2-users</a> mailing list</li>
+      <li>Twitter (<a href="https://twitter.com/Tera_Term">https://twitter.com/Tera_Term</a>)</li>
     </ul>
   </li>
-  <li>Create SVN tag.<br />
-      The naming rule is `teraterm-version'(ex. teraterm-4_106).<br />
-<pre>
-svn copy -m "Release 4.106" svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106
-</pre>
+  <li>Get feedbacks.
+    <p>If changed source code, redo "Confirm documents" and "Test run and connect in all supported OS."</p>
   </li>
-  <li>Re-checkout from svn tag.</li>
-  <li>Make installer package
-    <ul>
-      <li>Edit "teraterm\installer\teraterm.iss"
-<pre>
-#define AppVer "4.???"
-;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+</ol>
 
-[InnoIDE_PreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+<h3>Release</h3>
 
-[InnoIDE_PostCompile]
-Name: makearchive.bat; Parameters: release
 
-[PreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[PostCompile]
-Name: makearchive.bat; Parameters: release
-
-[_ISToolPreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[_ISToolPostCompile]
-Name: makearchive.bat; Parameters: release
-</pre>
+<ol>
+  <li>Confirm documents. (same as above)</li>
+  <li>Modify release date.
+    <ul>
+      <li>html/about/hisotry.html</li>
+    </ul>
+  </li>
+  <li>Create installer.
+    <ul>
+      <li>Change AppVer in teraterm.iss.
+        <pre>
+- #define AppVer "4.106-RC1"
++ #define AppVer "4.106"
+        </pre>
       </li>
-      <li>Open "teraterm\installer\teraterm.iss" with ISTool and call [Project]-[Compile Setup] with InnoSetup.</li>
+      <li>Open teraterm\installer\teraterm.iss with ISTool, and create installer by "Project"-"Compile Setup."</li>
     </ul>
   </li>
+  <li>Commit this state.</li>
+  <li>Create SVN tag.<br />
+    The naming rule is `teraterm-version' (e.g. teraterm-4_106).
+    <pre>
+svn copy -m "Release 4.106" \
+    svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable \
+    svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106
+    </pre>
+  </li>
+  <li>Re-checkout from svn tag.<br />
+    <p>All source code is same as development branch. Only SVN revision is different.</p>
+  </li>
+  <li>Create installer.
+    <ul>
+      <li>Open teraterm\installer\teraterm.iss with ISTool, and create installer by "Project"-"Compile Setup."</li>
+      <li>Compress portable version with zip.</li>
+    </ul>
+  </li>
   <li>Update OSDN project site.
     <ul>
-      <li>Add new release.</li>
+      <li>add new release (e.g. "4.106") to "Tera Term" Package.</li>
+      <li>Add installer and portable zip file to new release.</li>
+<!--
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82̕ύX\x97\x9A\x97\xF0\x82\xA9\x82\xE7\x81A\x83\x8A\x83\x8A\x81[\x83X\x82́u\x95ύX\x97\x9A\x97\xF0\x81v\x82ɁiWiki\x83t\x83H\x81[\x83}\x83b\x83g\x82Łj\x93]\x8BL\x82\xB7\x82\xE9\x81i\x93\xFA\x96{\x8C\xEA\x81E\x89p\x8C\xEA\x82Ƃ\xE0\x81j</li>
+-->
       <li>Submit news.</li>
     </ul>
   </li>
-  <li>Announce release to mailing list(in Japan).</li>
-  <li>Update OSDN project home page.</li>
-  <li>Delete snapshots.</li>
-  <li>Announce release to Twitter.<br />
-      https://twitter.com/Tera_Term<br />
-      Post release announcement and pin.</li>
+  <li>Update OSDN project home page (<a href="https://ttssh2.osdn.jp">https://ttssh2.osdn.jp</a>).
+    <p><a href="https://osdn.net/projects/ttssh2/wiki/%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%83%9A%E3%83%BC%E3%82%B8%E3%81%AE%E6%9B%B4%E6%96%B0%E6%89%8B%E9%A0%86">How to update project home page (in Japanese).</a></p>
   </li>
-  <li>Update Chocolatey</li>
+  <li>Announce release.
+    <ul>
+      <li><a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">ttssh2-users</a> mailing list</li>
+      <li>Twitter (<a href="https://twitter.com/Tera_Term">https://twitter.com/Tera_Term</a>)
+        <ul>
+          <li>Pin announce tweet.</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li id="revert_teraterm_iss">Revert teraterm.iss in development branch.
+    <pre>
+- ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
++ #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+
+  [InnoIDE_PreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [InnoIDE_PostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+  
+  [PreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [PostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+  
+  [_ISToolPreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [_ISToolPostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+    </pre>
+  </li>
+  <li>Update Chocolatey.</li>
 </ol>
 
+<h3>About code freeze.</h3>
+
+<p>
+After code freeze, only critical bug fix is able to committed.<br />
+Code freeze start with <a href="#RC_commit">RC commit in development branch</a>, and end with <a href="#revert_teraterm_iss">revert teraterm.iss commit in development branch</a>.
+</p>
+
 </body>
 </html>

Modified: branches/4-stable/doc/ja/html/reference/develop.html
===================================================================
--- branches/4-stable/doc/ja/html/reference/develop.html	2022-01-17 13:45:49 UTC (rev 9697)
+++ branches/4-stable/doc/ja/html/reference/develop.html	2022-01-19 13:01:28 UTC (rev 9698)
@@ -27,7 +27,7 @@
   <li><a href="#build-cygterm">CygTerm\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
   <li><a href="#build-ttxsamples">TTXSamples\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
   <li><a href="#build-htmlhelp">\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
-  <li><a href="#release">\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@</a></li>
+  <li><a href="#release">\x83\x8A\x83\x8A\x81[\x83X\x82̎菇</a></li>
 </ol>
 
 <hr>
@@ -435,32 +435,82 @@
 </ol>
 
 
-<h2 id="release">\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@</h2>
+<h2 id="release">\x83\x8A\x83\x8A\x81[\x83X\x82̎菇</h2>
 
 <p>
-\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+TeraTerm Project \x82ł̃\x8A\x83\x8A\x81[\x83X\x8E菇\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
 </p>
 
+<h3>\x83\x8A\x83\x8A\x81[\x83X\x8D\xEC\x8BƂ̊J\x8En\x82\xA9\x82\xE7RC\x8D쐬\x82܂\xC5</h3>
+
 <ol>
-  <li>RC \x8D쐬\x8E\x9E\x82Ƀo\x81[\x83W\x83\x87\x83\x93\x82\xF0\x88\xEA\x82ƒC\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9\x81B<br />
-      \x88\xEA\x94ʂɃe\x83X\x83g\x82\xF0\x8CĂт\xA9\x82\xAF\x81A\x8B\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82Ƃ̓\xAF\x8E\x9E\x8E\xC0\x8Ds\x82\xAA\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82邽\x82߁A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ƃ\xB7\x82\xE9(cf. TT_FILEMAPNAME \x92\xE8\x8B`)\x81B
+  <li>\x83`\x83P\x83b\x83g\x81A\x83u\x83\x89\x83\x93\x83`\x82Ȃǂ\xF0\x8Am\x94F\x82\xB7\x82\xE9
     <ul>
-      <li>teraterm\common\tt-version.h</li>
-      <li>ttssh2\ttxssh\ttxssh-version.h</li>
-      <li>ttpmenu\ttpmenu.rc // only modifying</li>
-      <li>TTProxy\TTProxy.rc // only modifying</li>
-      <li>TTXKanjiMenu\ttxkanjimenu.rc // only modifying</li>
-      <li>installer\teraterm.iss
+      <li>\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83`\x81[\x83\x80\x93\xE0\x82Ŋm\x94F\x82\xB7\x82\xE9
         <ul>
-          <li>AppVer \x82\xF0\x8Fグ\x81A"RC" \x82\xF0\x92lj\xC1</li>
-          <li>snapshot \x82\xF0 \x83R\x83\x81\x83\x93\x83g\x83A\x83E\x83g</li>
-          <li>\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82̌Ăяo\x82\xB5\x82\xF0\x8FC\x90\xB3</li>
+          <li>\x8D\xA1\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82ɓ\xFC\x82\xEA\x82\xE9\x82\xE0\x82́E\x8E\x9F\x89\xF1\x88ȍ~\x82ɉ\x84\x8A\xFA\x82\xB7\x82\xE9\x82\xE0\x82̂𐮗\x9D\x81E\x8C\x88\x92肷\x82\xE9</li>
         </ul>
       </li>
+      <li>\x83u\x83\x89\x83\x93\x83`\x82\xF0\x83}\x81[\x83W\x82\xB7\x82\xE9
+        <ul>
+          <li>trunk \x82\xC6 4-stable \x8AԁA\x8D\xEC\x8Bƒ\x86\x82̃u\x83\x89\x83\x93\x83`\x82Ȃ\xC7</li>
+        </ul>
+      </li>
+      <li>\x83`\x83P\x83b\x83g\x82\xF0\x83N\x83\x8D\x81[\x83Y\x82\xB7\x82\xE9
+        <ul>
+          <li>\x82\xB7\x82łɏC\x90\xB3\x8Dς݁A\x8F\x88\x97\x9D\x8Dς݂̂\xE0\x82̂̓N\x83\x8D\x81[\x83Y\x82\xB7\x82\xE9<br />
+              \x83\x8A\x83\x8A\x81[\x83X\x8E\x9E\x82ɂ́A\x91Ώۂ̃}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82̃`\x83P\x83b\x83g\x82͂\xB7\x82ׂăN\x83\x8D\x81[\x83Y\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91ԂɂȂ\xE9</li>
+          <li>\x8E\x9F\x82̃\x8A\x83\x8A\x81[\x83X\x82։񂷂\xE0\x82̂̓}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82\xF0\x95ύX\x82\xB7\x82\xE9<br />
+              \x8E\x9F\x82̃\x8A\x83\x8A\x81[\x83X\x97p\x83}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li>
+        </ul>
+      </li>
+      <li>\x82\xB1\x82̎\x9E\x93_\x82ŐV\x82\xBD\x82ɏo\x82Ă\xAD\x82\xE9\x83`\x83P\x83b\x83g\x82̑Ή\x9E\x82\xF0\x8C\x9F\x93\xA2\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>\x82\xB1\x82̔N\x82ɂ\xA8\x82\xAF\x82\xE9\x8Dŏ\x89\x82̃\x8A\x83\x8A\x81[\x83X\x82̏ꍇ\x82́A\x92\x98\x8D쌠\x95\\x8E\xA6\x82́u\x8DŌ\xE3\x82̔\xAD\x8Ds\x82̔N\x81v\x82\xF0\x83C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9\x81B
+  <li>\x83c\x81[\x83\x8B\x81A\x83\x89\x83C\x83u\x83\x89\x83\x8A\x81A\x83C\x83\x93\x83|\x81[\x83g\x8C\xB3\x82̍ŐV\x94ł\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9
     <ul>
+      <li>Visual Studio (<a href="https://visualstudio.microsoft.com">https://visualstudio.microsoft.com</a>)</li>
+      <li>Inno Setup (<a href="https://jrsoftware.org/isdl.php">https://jrsoftware.org/isdl.php</a>)</li>
+      <li>Oniguruma (<a href="https://github.com/kkos/oniguruma">https://github.com/kkos/oniguruma</a>)</li>
+      <li>OpenSSL (<a href="https://www.openssl.org">https://www.openssl.org</a>)</li>
+      <li>zlib (<a href="https://www.zlib.net">http://www.zlib.net</a>)</li>
+      <li>PuTTY (<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>)</li>
+      <li>SFMT (<a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html">http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html</a>)</li>
+      <li>The reference C implementation of Argon2 (<a href="https://github.com/P-H-C/phc-winner-argon2">https://github.com/P-H-C/phc-winner-argon2</a>)</li>
+    </ul>
+    <p>\x83\x8A\x83\x8A\x81[\x83X\x82Ɏg\x82\xA4\x83o\x81[\x83W\x83\x87\x83\x93\x82͂\xB1\x82̎\x9E\x93_\x82ł\xA8\x82\xA8\x82ނˌ\x88\x92肷\x82\xE9\x81B</p>
+  </li>
+  <li>\x8D\xA1\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82ɓ\xFC\x82ꂽ\x82\xA2\x82\xE0\x82̂\xAA\x97\x8E\x82\xBF\x92\x85\x82\xAD</li>
+</ol>
+
+<h3>RC\x8D쐬\x82\xA9\x82烊\x83\x8A\x81[\x83X\x82܂\xC5</h3>
+
+<ol>
+  <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9
+    <ul>
+      <li>\x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82̐ݒ荀\x96ځEUI\x82̂Ȃ\xA2\x93\xC1\x95ʃI\x83v\x83V\x83\x87\x83\x93\x81E\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x81E\x90V\x8BK\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ȂǁA\x91Ή\x9E\x82\xB7\x82\xE9\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82ɘR\x82ꂪ\x82Ȃ\xA2\x82\xA9\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82\xF0\x8Am\x94F\x82\xB5\x81A\x8F\x91\x82\xAB\x96Y\x82ꂪ\x82\xA0\x82\xEA\x82ΒNjL\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82̏\x87\x94Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̎w\x90j\x82Ƃ\xB5\x82ẮA\x83^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83V\x83\x87\x83\x93\x8A֌W\x81E\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ă̕ύX\x81E\x83}\x83N\x83\x8D\x82̏\x87\x81B</li>
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x8D\xB7\x95\xAA\x82\xAA\x96|\x96󂳂\xEA\x82Ă\xA2\x82邱\x82Ƃ\xF0\x8Am\x94F\x82\xB5\x81A\x96|\x96\xF3\x96Y\x82ꂪ\x82\xA0\x82\xEA\x82Ζ|\x96󂷂\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>\x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x88\xEA\x82ƒC\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9
+    <p>\x88\xEA\x94ʂɃe\x83X\x83g\x82\xF0\x8CĂт\xA9\x82\xAF\x81A\x8B\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82Ƃ̓\xAF\x8E\x9E\x8E\xC0\x8Ds\x82\xAA\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82邽\x82߁A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ƃ\xB7\x82\xE9\x81i\x97\xE1: TT_FILEMAPNAME \x92\xE8\x8B` \x82Ȃǁj\x81B</p>
+    <ul>
+      <li>teraterm\common\tt-version.h</li>
+      <li>ttssh2\ttxssh\ttxssh-version.h</li>
+      <li>Onttpmenu\ttpmenu.rc // \x95ύX\x8E\x9E\x82̂\xDD</li>
+      <li>TTProxy\TTProxy.rc // \x95ύX\x8E\x9E\x82̂\xDD</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // \x95ύX\x8E\x9E\x82̂\xDD</li>
+    </ul>
+    <p>
+      CygTerm+ \x82͗\xE1\x8AO\x82ŁA\x83\x8A\x83\x8A\x81[\x83X\x82Ƃ͊֌W\x82Ȃ\xAD\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x8Fオ\x82\xE9\x81B<br />
+      \x8FC\x90\xB3\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82\xE9\x82Ƒ\xA6\x83\x8A\x83\x8A\x81[\x83X\x88\xB5\x82\xA2\x82ɂȂ\xE8\x81A\x83\x8A\x83\x8A\x81[\x83X\x93\xFA\x82͂\xBB\x82̓\xFA\x95t\x82ƂȂ\xE9\x81B\x82\xBB\x82̂\xBD\x82߁A\x8FC\x90\xB3\x81E\x83o\x81[\x83W\x83\x87\x83\x93\x82̃C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x81E\x95ύX\x97\x9A\x97\xF0\x82𓯎\x9E\x82ɃR\x83~\x83b\x83g\x82\xB7\x82\xE9\x81B<br />
+      \x82\xB1\x82\xEA\x82̓R\x83\x93\x83p\x83C\x83\x89\x82̓\xFC\x8E肪\x97e\x88ՂȂ\xBD\x82߁B
+    </p>
+  </li>
+  <li>\x82\xB1\x82̔N\x82ɂ\xA8\x82\xAF\x82\xE9\x8Dŏ\x89\x82̃\x8A\x83\x8A\x81[\x83X\x82̏ꍇ\x82́A\x92\x98\x8D쌠\x95\\x8E\xA6\x82́u\x8DŌ\xE3\x82̔\xAD\x8Ds\x82̔N\x81v\x82\xF0\x83C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9
+    <ul>
       <li>teraterm\keycode\keycode-version.rc // VERSIONINFO</li>
       <li>teraterm\teraterm\tt-version.rc // VERSIONINFO</li>
       <li>teraterm\ttpcmn\ttpcmn-version.rc // VERSIONINFO</li>
@@ -484,111 +534,192 @@
       <li>doc\ja\html\macro\index.html</li>
     </ul>
   </li>
-  <li>\x88ˑ\xB6\x83\x89\x83C\x83u\x83\x89\x83\x8A\x81A\x83c\x81[\x83\x8B\x81A\x83C\x83\x93\x83|\x81[\x83g\x8C\xB3\x82̍ŐV\x94ł\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81B
+  <li>64bit Cygwin \x83o\x83C\x83i\x83\x8A\x82\xF0\x8D\xB7\x82\xB5\x91ւ\xA6\x82\xE9
+    <p>
+      \x91O\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82\xA9\x82\xE7 CygTerm+ \x82ɕύX\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x82́A64bit Cygwin\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xBD cygterm\cygterm+-x86_64\cygterm.exe \x82\xF0\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9\x81B<br />
+      \x83\\x81[\x83X\x8FC\x90\xB3\x82\xF0\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9\x82Ƃ\xAB\x82ɁA\x93\xAF\x8E\x9E\x82Ƀo\x83C\x83i\x83\x8A\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xEA\x82΁A\x83\x8A\x83\x8A\x81[\x83X\x8E\x9E\x82ɂ\xB1\x82̍H\x92\xF6\x82\xF0\x8Ds\x82\xA4\x95K\x97v\x82͂Ȃ\xA2\x81B
+    </p>
+  </li>
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9
     <ul>
-      <li>Visual Studio<br />
-          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
-      <li>Inno Setup<br />
-          http://www.jrsoftware.org/isdl.php</li>
-      <li>Oniguruma<br />
-          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
-      <li>OpenSSL<br />
-          http://www.openssl.org/</li>
-      <li>zlib<br />
-          http://www.zlib.net/</li>
-      <li>PuTTY<br />
-          http://www.chiark.greenend.org.uk/~sgtatham/putty/</li>
-      <li>SFMT<br />
-          http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</li>
-      <li>CygTerm<br />
-          https://googledrive.com/host/0B1s-dM6d6yC4fmhEZ3c0VTNFWEFtV3daUlRGQmFHVnBmVHRybUNnUVliNWktNDRlZ2NnZTQ/index-e.html</li>
+      <li>teraterm.iss \x82\xCC AppVer \x82\xF0\x81u\x8E\x9F\x82̃o\x81[\x83W\x83\x87\x83\x93-RC\x81v\x82Ƃ\xB7\x82\xE9
+        <pre>
+- #define AppVer "4.105"
++ #define AppVer "4.106-RC1"
+        </pre>
+      </li>
+      <li>teraterm.iss \x82\xCC snapshot \x82\xF0\x83R\x83\x81\x83\x93\x83g\x83A\x83E\x83g\x82\xB7\x82\xE9
+        <pre>
+- #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
++ ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+        </pre>
+      </li>
+      <li>teraterm.iss \x82\xA9\x82\xE7\x8BN\x93\xAE\x82\xB7\x82\xE9\x83o\x83b\x83`\x82\xF0\x81A\x83\x8A\x83\x8A\x81[\x83X\x97p\x82Ɂu\x83\x8A\x83r\x83\x8B\x83h\x97L\x8C\xF8\x81v\x81u\x83A\x81[\x83J\x83C\x83u\x8D쐬\x97L\x8C\xF8\x81v\x82ɂ\xB7\x82\xE9
+        <pre>
+  [InnoIDE_PreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [InnoIDE_PostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+  
+  [PreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [PostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+  
+  [_ISToolPreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [_ISToolPostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+        </pre>
+      </li>
+      <li id="RC_commit">\x82\xB1\x82̏\xF3\x91ԂŃR\x83~\x83b\x83g\x82\xB7\x82\xE9</li>
+      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile Setup" \x82ŃC\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li>
+      <li>\x8D쐬\x82\xB3\x82ꂽ\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xF0 zip \x82ň\xB3\x8Fk\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B
+  <li>\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x91S OS \x82ŃC\x83\x93\x83X\x83g\x81[\x83\x89\x82̎\xC0\x8Ds\x81A\x8BN\x93\xAE\x81A\x90ڑ\xB1\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9</li>
+  <li>OSDN \x82̃\x8A\x83\x8A\x81[\x83X\x95\xA8\x8C\x8F\x82ɒlj\xC1\x82\xB7\x82\xE9
     <ul>
-      <li>\x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82̐ݒ荀\x96ځEUI\x82̂Ȃ\xA2\x93\xC1\x95ʃI\x83v\x83V\x83\x87\x83\x93\x81E\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x81E\x90V\x8BK\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ȂǁA\x91Ή\x9E\x82\xB7\x82\xE9\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82ɘR\x82ꂪ\x82Ȃ\xA2\x82\xA9\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
-      <li>\x95ύX\x97\x9A\x97\xF0\x82̏\x91\x82\xAB\x96Y\x82\xEA\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B<br />
-       \x82\xA8\x82\xA8\x82ނ˕ύX\x82\xB5\x82\xBD\x8F\x87\x82ɒNjL\x82\xB3\x82\xEA\x82\xE9\x95ύX\x97\x9A\x97\xF0\x82̏\x87\x94Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̎w\x90j\x82Ƃ\xB5\x82ẮA\x83^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83V\x83\x87\x83\x93\x8A֌W\x81E\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ă̕ύX\x81E\x83}\x83N\x83\x8D\x82̏\x87\x81B</li>
-      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x8D\xB7\x95\xAA\x82\xAA\x96|\x96󂳂\xEA\x82Ă\xA2\x82邱\x82Ƃ\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+      <li>\x81uTera Term RC\x81v\x83p\x83b\x83P\x81[\x83W\x82ɐV\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x81i\x97\xE1: "4.106 RC"\x81j\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li>
+      <li>\x90V\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x82ɁA\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81E\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xCC zip \x83t\x83@\x83C\x83\x8B\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>\x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8Fグ\x81A\x93\xFA\x95t\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B
+  <li>RC\x82̍쐬\x82\xF0\x83A\x83i\x83E\x83\x93\x83X\x82\xB7\x82\xE9
     <ul>
-      <li>teraterm.iss<br />
-          AppVer \x82\xA9\x82\xE7 RC \x82\xF0\x8D폜</li>
+      <li><a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">ttssh2-users</a> \x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g</li>
+      <li>Twitter (<a href="https://twitter.com/Tera_Term">https://twitter.com/Tera_Term</a>)</li>
+    </ul>
+  </li>
+  <li>\x83t\x83B\x81[\x83h\x83o\x83b\x83N\x82\xF0\x8E󂯓\xFC\x82\xEA\x82\xE9
+    <p>\x8FC\x90\xB3\x82\xAA\x93\xFC\x82\xC1\x82\xBD\x82\xE7\x8Dēx\x81u\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81v\x81u\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x91S OS \x82ŋN\x93\xAE\x81E\x90ڑ\xB1\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81v</p>
+  </li>
+</ol>
+
+<h3>\x83\x8A\x83\x8A\x81[\x83X\x8D\xEC\x8B\xC6</h3>
+
+<ol>
+  <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9 (\x8Fڍׂ͓\xAF\x8F\xE3)</li>
+  <li>\x83\x8A\x83\x8A\x81[\x83X\x93\xFA\x82\xF0\x95ύX\x82\xB7\x82\xE9
+    <ul>
       <li>html/about/hisotry.html</li>
     </ul>
-    CygTerm+ \x82͗\xE1\x8AO\x82ŁA\x83\x8A\x83\x8A\x81[\x83X\x82Ƃ͊֌W\x82Ȃ\xAD\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x8Fオ\x82\xE9\x81B<br />
-    \x83p\x83b\x83`\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82\xE9\x82Ƒ\xA6\x83\x8A\x83\x8A\x81[\x83X\x88\xB5\x82\xA2\x82ɂȂ\xE8\x81A\x83\x8A\x83\x8A\x81[\x83X\x93\xFA\x82͂\xBB\x82̓\xFA\x95t\x82ƂȂ\xE9\x81B<br />
-    \x82\xB1\x82\xEA\x82́A\x83o\x81[\x83W\x83\x87\x83\x93\x82̖\x96\x94\xF6\x82\xAA patchlevel \x82ł\xA0\x82\xE8\x81A\x83R\x83\x93\x83p\x83C\x83\x89\x82̓\xFC\x8E肪\x97e\x88ՂȂ\xBD\x82߁B
   </li>
-  <li>\x91O\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82\xA9\x82\xE7CygTerm+\x82ɕύX\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x82́A64bit Cygwin\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xC4 cygterm\cygterm+-x86_64\cygterm.exe \x82̍\xB7\x82\xB5\x91ւ\xA6\x82\xF0\x8Ds\x82\xA4\x81B</li>
-  <li>\x93\xAE\x8D\xEC\x8Am\x94F\x82\xF0\x82\xB7\x82\xE9
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9
     <ul>
-      <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
-          ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A[Project]-[Compile Setup]\x82ō쐬\x82\xB3\x82\xEA\x82\xE9\x81B</li>
-      <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xA8\x82\xE6\x82ю\xC0\x8Ds\x82\xF0\x83e\x83X\x83g\x82\xB7\x82\xE9\x81B</li>
+      <li>teraterm.iss \x82\xCC AppVer \x82\xF0\x95ύX\x82\xB7\x82\xE9
+        <pre>
+- #define AppVer "4.106-RC1"
++ #define AppVer "4.106"
+        </pre>
+      </li>
+      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile Setup" \x82ō쐬\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>SVN \x82̃^\x83O\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
-      \x83^\x83O\x96\xBC\x82́uteraterm-\x83o\x81[\x83W\x83\x87\x83\x93\x81v\x81B\x82\xBD\x82Ƃ\xA6\x82΁Av4.106\x82Ȃ\xE7\x82\xCE"teraterm-4_106"\x81B<br />
-      <pre>
-svn copy -m "Release 4.106" svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106
-      </pre>
+  <li>\x82\xB1\x82̏\xF3\x91ԂŃR\x83~\x83b\x83g\x82\xB7\x82\xE9</li>
+  <li>SVN \x82̃^\x83O\x82\xF0\x8D쐬\x82\xB7\x82\xE9<br />
+    \x83^\x83O\x96\xBC\x82́uteraterm-\x83o\x81[\x83W\x83\x87\x83\x93\x81v\x81B\x81i\x97\xE1: v4.106\x82Ȃ\xE7\x82\xCE"teraterm-4_106"\x81j
+    <pre>
+svn copy -m "Release 4.106" \
+    svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable \
+    svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106
+    </pre>
   </li>
-  <li>\x83\x8A\x83\x8A\x81[\x83X\x97p\x82̃^\x83O\x82Ń`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB5\x92\xBC\x82\xB7\x81B</li>
-  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B
+  <li>\x83\x8A\x83\x8A\x81[\x83X\x97p\x82̃^\x83O\x82Ń`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB5\x92\xBC\x82\xB7<br />
+    <p>SVN \x82̃\x8A\x83r\x83W\x83\x87\x83\x93\x88ȊO\x82̂\xB7\x82ׂĂ\xAA\x81A\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82Ɠ\xAF\x82\xB6\x8F\xF3\x91ԂɂȂ\xE9</p>
+  </li>
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9
     <ul>
-      <li>teraterm\installer\teraterm.iss \x82\xF0\x95ҏW\x82\xB7\x82\xE9
-<pre>
-#define AppVer "4.???"
-;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
-
-[InnoIDE_PreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[InnoIDE_PostCompile]
-Name: makearchive.bat; Parameters: release
-
-[PreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[PostCompile]
-Name: makearchive.bat; Parameters: release
-
-[_ISToolPreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[_ISToolPostCompile]
-Name: makearchive.bat; Parameters: release
-</pre>
-      </li>
-      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A[Project]-[Compile Setup]\x82ō쐬\x82\xB3\x82\xEA\x82\xE9</li>
+      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile Setup" \x82ō쐬\x82\xB7\x82\xE9</li>
+      <li>\x8D쐬\x82\xB3\x82ꂽ\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xF0 zip \x82ň\xB3\x8Fk\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>OSDN \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x81B
+  <li>OSDN \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9
     <ul>
-      <li>[\x83_\x83E\x83\x93\x83\x8D\x81[\x83h]-[\x8AǗ\x9D]-[\x90V\x8BK\x8D쐬]<br />
-          \x95ύX\x97\x9A\x97\xF0\x82\xF0\x93\xFC\x97͂\xB5\x82ă\x8A\x83\x8A\x81[\x83X\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B</li>
-      <li>[\x83j\x83\x85\x81[\x83X\x88ꗗ]-[\x90V\x8BK\x93o\x98^]<br />
-          \x83j\x83\x85\x81[\x83X\x8BL\x8E\x96\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B</li>
+      <li>\x81uTera Term\x81v\x83p\x83b\x83P\x81[\x83W\x82ɐV\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x81i\x97\xE1: "4.106"\x81j\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li>
+      <li>\x90V\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x82ɁA\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81E\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xCC zip \x83t\x83@\x83C\x83\x8B\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li>
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82̕ύX\x97\x9A\x97\xF0\x82\xA9\x82\xE7\x81A\x83\x8A\x83\x8A\x81[\x83X\x82́u\x95ύX\x97\x9A\x97\xF0\x81v\x82ɁiWiki\x83t\x83H\x81[\x83}\x83b\x83g\x82Łj\x93]\x8BL\x82\xB7\x82\xE9\x81i\x93\xFA\x96{\x8C\xEA\x81E\x89p\x8C\xEA\x82Ƃ\xE0\x81j</li>
+      <li>\x83j\x83\x85\x81[\x83X\x8BL\x8E\x96\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>\x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g\x82ɃA\x83i\x83E\x83\x93\x83X\x82\xB7\x82\xE9\x81B</li>
-  <li>\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83y\x81[\x83W\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x81B</li>
-  <li>\x83X\x83i\x83b\x83v\x83V\x83\x87\x83b\x83g\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B</li>
-  <li>Twitter \x82ɍ\x90\x92m\x82\xB7\x82\xE9\x81B<br />
-      https://twitter.com/Tera_Term<br />
-      \x83\x8A\x83\x8A\x81[\x83X\x8D\x90\x92m\x82\xF0\x83c\x83C\x81[\x83g\x82\xB5\x82ČŒ肷\x82\xE9\x81B</li>
+  <li>\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83y\x81[\x83W (<a href="https://ttssh2.osdn.jp">https://ttssh2.osdn.jp</a>) \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9
+    <p>\x8DX\x90V\x82̂\xB5\x82\xA9\x82\xBD\x82\xCD <a href="https://osdn.net/projects/ttssh2/wiki/%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%83%9A%E3%83%BC%E3%82%B8%E3%81%AE%E6%9B%B4%E6%96%B0%E6%89%8B%E9%A0%86">\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83y\x81[\x83W\x82̍X\x90V\x8E菇</a> \x82\xF0\x8EQ\x8F\xC6</p>
   </li>
-  <li>Chocolatey \x82̓o\x98^\x82\xF0\x8DX\x90V</li>
+  <li>\x83\x8A\x83\x8A\x81[\x83X\x82\xF0\x83A\x83i\x83E\x83\x93\x83X\x82\xB7\x82\xE9
+    <ul>
+      <li><a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">ttssh2-users</a> \x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g</li>
+      <li>Twitter (<a href="https://twitter.com/Tera_Term">https://twitter.com/Tera_Term</a>)
+        <ul>
+          <li>\x83\x8A\x83\x8A\x81[\x83X\x83A\x83i\x83E\x83\x93\x83X\x82̃c\x83C\x81[\x83g\x82\xF0\x8CŒ\xE8\x83c\x83C\x81[\x83g\x82ɂ\xB7\x82\xE9</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li id="revert_teraterm_iss">\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82\xCC teraterm.iss \x82\xF0\x96߂\xB5\x81A\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9
+    <pre>
+- ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
++ #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+
+  [InnoIDE_PreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [InnoIDE_PostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+  
+  [PreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [PostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+  
+  [_ISToolPreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [_ISToolPostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+    </pre>
+  </li>
+  <li>Chocolatey \x82̓o\x98^\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9</li>
 </ol>
 
+<h3>\x83R\x81[\x83h\x83t\x83\x8A\x81[\x83Y\x82ɂ‚\xA2\x82\xC4</h3>
+
+<p>
+\x83R\x81[\x83h\x83t\x83\x8A\x81[\x83X\x92\x86\x82́A\x8C\xB4\x91\xA5\x93I\x82ɂ͒v\x96\xBD\x93I\x82ȃo\x83O\x82̏C\x90\xB3\x82̂݉”\\x82ƂȂ\xE8\x82܂\xB7\x81B<br />
+\x83R\x81[\x83h\x83t\x83\x8A\x81[\x83Y\x82́ARC\x8D쐬\x81i<a href="#RC_commit">\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83` \x82\xC5 teraterm.iss \x82\xC9 RC \x82\xF0\x95t\x82\xAF\x82\xE9\x83R\x83~\x83b\x83g</a>\x81j</a>\x82\xA9\x82烊\x83\x8A\x81[\x83X\x81i<a href="#revert_teraterm_iss">\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82\xCC teraterm.iss \x82\xF0\x96߂\xB7\x83R\x83~\x83b\x83g</a>\x81j\x82܂łƂ\xB5\x82܂\xB7\x81B
+</p>
+
 </body>
 </html>

From scmnotify ＠ osdn.net  Wed Jan 19 22:01:39 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 19 Jan 2022 22:01:39 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk2OTldIHdpa2k644Oq44Oq44O844K544Gu?=
 =?utf-8?b?5pa55rOVIOOCkuODleOCo+ODvOODieODkOODg+OCrw==?=
Message-ID: <1642597299.932662.2907.nullmailer@users.osdn.me>

Revision: 9699
          https://osdn.net/projects/ttssh2/scm/svn/commits/9699
Author:   nmaya
Date:     2022-01-19 22:01:39 +0900 (Wed, 19 Jan 2022)
Log Message:
-----------
wiki:リリースの方法 をフィードバック

Modified Paths:
--------------
    trunk/doc/en/html/reference/develop.html
    trunk/doc/ja/html/reference/develop.html

-------------- next part --------------
Modified: trunk/doc/en/html/reference/develop.html
===================================================================
--- trunk/doc/en/html/reference/develop.html	2022-01-19 13:01:28 UTC (rev 9698)
+++ trunk/doc/en/html/reference/develop.html	2022-01-19 13:01:39 UTC (rev 9699)
@@ -454,23 +454,84 @@
 To release Tera Term installation package is shown in the following step:
 </p>
 
+<h3>From start release until create RC</h3>
+
 <ol>
-  <li>Increment the version while RC release process.<br />
-      The binary is released for test in this timing. Prevent that old and new binary have same version number.
+  <li>Confirm ticket and branches.
     <ul>
+      <li>Confirm in project team.
+        <ul>
+          <li>Organize / decide whether to include bug fix / feature in this release or defer.</li>
+        </ul>
+      </li>
+      <li>Merge branches
+        <ul>
+          <li>Verify trunk / 4-stable and working branches.</li>
+        </ul>
+      </li>
+      <li>Close tickets.
+        <ul>
+<!--
+          <li>\x82\xB7\x82łɏC\x90\xB3\x8Dς݁A\x8F\x88\x97\x9D\x8Dς݂̂\xE0\x82̂̓N\x83\x8D\x81[\x83Y\x82\xB7\x82\xE9<br />
+              \x83\x8A\x83\x8A\x81[\x83X\x8E\x9E\x82ɂ́A\x91Ώۂ̃}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82̃`\x83P\x83b\x83g\x82͂\xB7\x82ׂăN\x83\x8D\x81[\x83Y\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91ԂɂȂ\xE9</li>
+          <li>\x8E\x9F\x82̃\x8A\x83\x8A\x81[\x83X\x82։񂷂\xE0\x82̂̓}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82\xF0\x95ύX\x82\xB7\x82\xE9<br />
+              \x8E\x9F\x82̃\x8A\x83\x8A\x81[\x83X\x97p\x83}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li>
+-->
+        </ul>
+      </li>
+<!--
+      <li>\x82\xB1\x82̎\x9E\x93_\x82ŐV\x82\xBD\x82ɏo\x82Ă\xAD\x82\xE9\x83`\x83P\x83b\x83g\x82̑Ή\x9E\x82\xF0\x8C\x9F\x93\xA2\x82\xB7\x82\xE9</li>
+-->
+    </ul>
+  </li>
+  <li>Confirm tools, libraries, import sources.
+    <ul>
+      <li>Visual Studio (<a href="https://visualstudio.microsoft.com">https://visualstudio.microsoft.com</a>)</li>
+      <li>Inno Setup (<a href="https://jrsoftware.org/isdl.php">https://jrsoftware.org/isdl.php</a>)</li>
+      <li>Oniguruma (<a href="https://github.com/kkos/oniguruma">https://github.com/kkos/oniguruma</a>)</li>
+      <li>OpenSSL (<a href="https://www.openssl.org">https://www.openssl.org</a>)</li>
+      <li>zlib (<a href="https://www.zlib.net">http://www.zlib.net</a>)</li>
+      <li>PuTTY (<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>)</li>
+      <li>SFMT (<a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html">http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html</a>)</li>
+      <li>cJSON (<a href="https://github.com/DaveGamble/cJSON">https://github.com/DaveGamble/cJSON</a>)</li>
+      <li>The reference C implementation of Argon2 (<a href="https://github.com/P-H-C/phc-winner-argon2">https://github.com/P-H-C/phc-winner-argon2</a>)</li>
+    </ul>
+<!--
+    <p>\x83\x8A\x83\x8A\x81[\x83X\x82Ɏg\x82\xA4\x83o\x81[\x83W\x83\x87\x83\x93\x82͂\xB1\x82̎\x9E\x93_\x82ł\xA8\x82\xA8\x82ނˌ\x88\x92肷\x82\xE9\x81B</p>
+-->
+  </li>
+<!--
+  <!--li>\x8D\xA1\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82ɓ\xFC\x82ꂽ\x82\xA2\x82\xE0\x82̂\xAA\x97\x8E\x82\xBF\x92\x85\x82\xAD</li>
+-->
+</ol>
+
+<h3>From create RC until release</h3>
+
+<ol>
+  <li>Confirm documents.
+    <ul>
+<!--
+      <li>\x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82̐ݒ荀\x96ځEUI\x82̂Ȃ\xA2\x93\xC1\x95ʃI\x83v\x83V\x83\x87\x83\x93\x81E\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x81E\x90V\x8BK\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ȂǁA\x91Ή\x9E\x82\xB7\x82\xE9\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82ɘR\x82ꂪ\x82Ȃ\xA2\x82\xA9\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82\xF0\x8Am\x94F\x82\xB5\x81A\x8F\x91\x82\xAB\x96Y\x82ꂪ\x82\xA0\x82\xEA\x82ΒNjL\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82̏\x87\x94Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̎w\x90j\x82Ƃ\xB5\x82ẮA\x83^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83V\x83\x87\x83\x93\x8A֌W\x81E\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ă̕ύX\x81E\x83}\x83N\x83\x8D\x82̏\x87\x81B</li>
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x8D\xB7\x95\xAA\x82\xAA\x96|\x96󂳂\xEA\x82Ă\xA2\x82邱\x82Ƃ\xF0\x8Am\x94F\x82\xB5\x81A\x96|\x96\xF3\x96Y\x82ꂪ\x82\xA0\x82\xEA\x82Ζ|\x96󂷂\xE9\x81B</li>
+-->
+    </ul>
+  </li>
+  <li>Increment the version while RC release process.
+    <p>The binary is released for test in this timing. Prevent that old and new binary have same version number.</p>
+    <ul>
       <li>teraterm\common\tt-version.h</li>
       <li>ttssh2\ttxssh\ttxssh-version.h</li>
-      <li>ttpmenu\ttpmenu.rc // only modifying</li>
+      <li>Onttpmenu\ttpmenu.rc // only modifying</li>
       <li>TTProxy\TTProxy.rc // only modifying</li>
       <li>TTXKanjiMenu\ttxkanjimenu.rc // only modifying</li>
-      <li>installer\teraterm.iss
-        <ul>
-          <li>version up AppVer and add "RC"</li>
-          <li>comment out snapshot</li>
-          <li>change called batch files</li>
-        </ul>
-      </li>
     </ul>
+    <p>
+      By way of exception, CygTerm+ always upgrades not regarding Tera Term release process when the patch is committed.<br />
+      The release date is the day committed by a developer. <!--\x82\xBB\x82̂\xBD\x82߁A\x8FC\x90\xB3\x81E\x83o\x81[\x83W\x83\x87\x83\x93\x82̃C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x81E\x95ύX\x97\x9A\x97\xF0\x82𓯎\x9E\x82ɃR\x83~\x83b\x83g\x82\xB7\x82\xE9\x81B--><br />
+      Because user can get gcc compiler for free.
+    </p>
   </li>
   <li>Increment the year of last publication of copyright notice if it is first release in this year.
     <ul>
@@ -497,106 +558,197 @@
       <li>doc\ja\html\macro\index.html</li>
     </ul>
   </li>
-  <li>Check latest libraries and tools.
+  <li>Replace 64bit Cygwin binary
+    <p>
+<!--
+      \x91O\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82\xA9\x82\xE7 CygTerm+ \x82ɕύX\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x82́A64bit Cygwin\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xBD cygterm\cygterm+-x86_64\cygterm.exe \x82\xF0\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9\x81B<br />
+      \x83\\x81[\x83X\x8FC\x90\xB3\x82\xF0\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9\x82Ƃ\xAB\x82ɁA\x93\xAF\x8E\x9E\x82Ƀo\x83C\x83i\x83\x8A\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xEA\x82΁A\x83\x8A\x83\x8A\x81[\x83X\x8E\x9E\x82ɂ\xB1\x82̍H\x92\xF6\x82\xF0\x8Ds\x82\xA4\x95K\x97v\x82͂Ȃ\xA2\x81B
+-->
+    </p>
+  </li>
+  <li>Create installer.
     <ul>
-      <li>Visual Studio<br />
-          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
-      <li>Inno Setup<br />
-          http://www.jrsoftware.org/isdl.php</li>
-      <li>Oniguruma<br />
-          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
-      <li>OpenSSL<br />
-          http://www.openssl.org/</li>
-      <li>zlib<br />
-          http://www.zlib.net/</li>
-      <li>PuTTY<br />
-          http://www.chiark.greenend.org.uk/~sgtatham/putty/</li>
-      <li>SFMT<br />
-          http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</li>
-      <li>CygTerm<br />
-          https://googledrive.com/host/0B1s-dM6d6yC4fmhEZ3c0VTNFWEFtV3daUlRGQmFHVnBmVHRybUNnUVliNWktNDRlZ2NnZTQ/index-e.html</li>
+      <li>Version up AppVer and add "RC" in teraterm.iss.
+        <pre>
+- #define AppVer "4.105"
++ #define AppVer "4.106-RC1"
+        </pre>
+      </li>
+      <li>Comment out snapshot in teraterm.iss.
+        <pre>
+- #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
++ ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+        </pre>
+      </li>
+      <li>Change calling batch file to enable rebuild and create archive.
+        <pre>
+  [InnoIDE_PreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [InnoIDE_PostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+  
+  [PreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [PostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+  
+  [_ISToolPreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [_ISToolPostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+        </pre>
+      </li>
+      <li id="RC_commit">Commit this state.</li>
+      <li>Open teraterm\installer\teraterm.iss with ISTool, and create installer by "Project"-"Compile Setup."</li>
+      <li>Compress portable version with zip.</li>
     </ul>
   </li>
-  <li>Check the document files.</li>
-  <li>Increase the software version and modify date.
+  <li>Test run installer, run and connect in all supported OS.</li>
+  <li>Add to OSDN Release
     <ul>
-      <li>teraterm.iss<br />
-          remove "RC" from AppVer</li>
-      <li>html/about/hisotry.html</li>
+      <li>Add new release (e.g. "4.106 RC") to "Tera Term RC" Package.</li>
+      <li>Add installer and portable zip file to new release.</li>
     </ul>
-    Note: Don't update the version number until the release, because the installer does not overwrite file when versions are same.<br />
-    Note: By way of exception, CygTerm+ always upgrades not regarding Tera Term release process when the patch is committed. The release date is the day committed by a developer. The suffix of CygTerm+ version is patchlevel, and then a user can get gcc compiler for free.
   </li>
-  <li>When CygTerm+ is changed from previous version, please build the software with 64bit Cygwin and replace cygterm\cygterm+-x86_64\cygterm.exe.</li>
-  <li>Evaluate executable program file.
+  <li>Announce RC release.
     <ul>
-      <li>Make installer package<br />
-          Open "teraterm\installer\teraterm.iss" with ISTool and call [Project]-[Compile Setup] with InnoSetup.</li>
-      <li>Test Tera Term installation and evaluate it.</li>
+      <li><a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">ttssh2-users</a> mailing list</li>
+      <li>Twitter (<a href="https://twitter.com/Tera_Term">https://twitter.com/Tera_Term</a>)</li>
     </ul>
   </li>
-  <li>Create SVN tag.<br />
-      The naming rule is `teraterm-version'(ex. teraterm-4_82).<br />
-<pre>
-svn copy -m "Release 4.82" svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_82
-</pre>
+  <li>Get feedbacks.
+    <p>If changed source code, redo "Confirm documents" and "Test run and connect in all supported OS."</p>
   </li>
-  <li>Re-checkout from svn tag.</li>
-  <li>Make installer package
-    <ul>
-      <li>Edit "teraterm\installer\teraterm.iss"
-<pre>
-#define AppVer "4.???"
-;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+</ol>
 
-[InnoIDE_PreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
+<h3>Release</h3>
 
-[InnoIDE_PostCompile]
-Name: makearchive.bat; Parameters: release
 
-[PreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[PostCompile]
-Name: makearchive.bat; Parameters: release
-
-[_ISToolPreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[_ISToolPostCompile]
-Name: makearchive.bat; Parameters: release
-</pre>
+<ol>
+  <li>Confirm documents. (same as above)</li>
+  <li>Modify release date.
+    <ul>
+      <li>html/about/hisotry.html</li>
+    </ul>
+  </li>
+  <li>Create installer.
+    <ul>
+      <li>Change AppVer in teraterm.iss.
+        <pre>
+- #define AppVer "4.106-RC1"
++ #define AppVer "4.106"
+        </pre>
       </li>
-      <li>Open "teraterm\installer\teraterm.iss" with ISTool and call [Project]-[Compile Setup] with InnoSetup.</li>
+      <li>Open teraterm\installer\teraterm.iss with ISTool, and create installer by "Project"-"Compile Setup."</li>
     </ul>
   </li>
+  <li>Commit this state.</li>
+  <li>Create SVN tag.<br />
+    The naming rule is `teraterm-version' (e.g. teraterm-4_106).
+    <pre>
+svn copy -m "Release 4.106" \
+    svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable \
+    svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106
+    </pre>
+  </li>
+  <li>Re-checkout from svn tag.<br />
+    <p>All source code is same as development branch. Only SVN revision is different.</p>
+  </li>
+  <li>Create installer.
+    <ul>
+      <li>Open teraterm\installer\teraterm.iss with ISTool, and create installer by "Project"-"Compile Setup."</li>
+      <li>Compress portable version with zip.</li>
+    </ul>
+  </li>
   <li>Update OSDN project site.
     <ul>
-      <li>Add new release.</li>
+      <li>add new release (e.g. "4.106") to "Tera Term" Package.</li>
+      <li>Add installer and portable zip file to new release.</li>
+<!--
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82̕ύX\x97\x9A\x97\xF0\x82\xA9\x82\xE7\x81A\x83\x8A\x83\x8A\x81[\x83X\x82́u\x95ύX\x97\x9A\x97\xF0\x81v\x82ɁiWiki\x83t\x83H\x81[\x83}\x83b\x83g\x82Łj\x93]\x8BL\x82\xB7\x82\xE9\x81i\x93\xFA\x96{\x8C\xEA\x81E\x89p\x8C\xEA\x82Ƃ\xE0\x81j</li>
+-->
       <li>Submit news.</li>
     </ul>
   </li>
-  <li>Announce release to mailing list(in Japan).</li>
-  <li>Update OSDN project home page.</li>
-  <li>Delete snapshots.</li>
-  <li>Announce release to forum(in Canada).<br />
-      Announcements http://logmett.com/support-forums/5<br />
-      Create new topic in `Announcements' entry.<br />
-      Change the type of previous Announcement from Announcement to Normal.<br />
-      Delete third previous Announcement.</li>
-  <li>Announce release to Twitter.<br />
-      https://twitter.com/Tera_Term<br />
-      Post release announcement and pin.</li>
+  <li>Update OSDN project home page (<a href="https://ttssh2.osdn.jp">https://ttssh2.osdn.jp</a>).
+    <p><a href="https://osdn.net/projects/ttssh2/wiki/%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%83%9A%E3%83%BC%E3%82%B8%E3%81%AE%E6%9B%B4%E6%96%B0%E6%89%8B%E9%A0%86">How to update project home page (in Japanese).</a></p>
   </li>
-  <li>Update Chocolatey</li>
+  <li>Announce release.
+    <ul>
+      <li><a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">ttssh2-users</a> mailing list</li>
+      <li>Twitter (<a href="https://twitter.com/Tera_Term">https://twitter.com/Tera_Term</a>)
+        <ul>
+          <li>Pin announce tweet.</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li id="revert_teraterm_iss">Revert teraterm.iss in development branch.
+    <pre>
+- ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
++ #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+
+  [InnoIDE_PreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [InnoIDE_PostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+  
+  [PreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [PostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+  
+  [_ISToolPreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [_ISToolPostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+    </pre>
+  </li>
+  <li>Update Chocolatey.</li>
 </ol>
 
+<h3>About code freeze.</h3>
+
+<p>
+After code freeze, only critical bug fix is able to committed.<br />
+Code freeze start with <a href="#RC_commit">RC commit in development branch</a>, and end with <a href="#revert_teraterm_iss">revert teraterm.iss commit in development branch</a>.
+</p>
+
 </body>
 </html>

Modified: trunk/doc/ja/html/reference/develop.html
===================================================================
--- trunk/doc/ja/html/reference/develop.html	2022-01-19 13:01:28 UTC (rev 9698)
+++ trunk/doc/ja/html/reference/develop.html	2022-01-19 13:01:39 UTC (rev 9699)
@@ -27,7 +27,7 @@
   <li><a href="#build-cygterm">CygTerm\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
   <li><a href="#build-ttxsamples">TTXSamples\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
   <li><a href="#build-htmlhelp">\x83w\x83\x8B\x83v\x83t\x83@\x83C\x83\x8B\x82̃r\x83\x8B\x83h\x95\xFB\x96@</a></li>
-  <li><a href="#release">\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@</a></li>
+  <li><a href="#release">\x83\x8A\x83\x8A\x81[\x83X\x82̎菇</a></li>
 </ol>
 
 <hr>
@@ -461,32 +461,83 @@
 </ol>
 
 
-<h2 id="release">\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@</h2>
+<h2 id="release">\x83\x8A\x83\x8A\x81[\x83X\x82̎菇</h2>
 
 <p>
-\x83\x8A\x83\x8A\x81[\x83X\x82̕\xFB\x96@\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+TeraTerm Project \x82ł̃\x8A\x83\x8A\x81[\x83X\x8E菇\x82ɂ‚\xA2\x82Ĉȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
 </p>
 
+<h3>\x83\x8A\x83\x8A\x81[\x83X\x8D\xEC\x8BƂ̊J\x8En\x82\xA9\x82\xE7RC\x8D쐬\x82܂\xC5</h3>
+
 <ol>
-  <li>RC \x8D쐬\x8E\x9E\x82Ƀo\x81[\x83W\x83\x87\x83\x93\x82\xF0\x88\xEA\x82ƒC\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9\x81B<br />
-      \x88\xEA\x94ʂɃe\x83X\x83g\x82\xF0\x8CĂт\xA9\x82\xAF\x81A\x8B\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82Ƃ̓\xAF\x8E\x9E\x8E\xC0\x8Ds\x82\xAA\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82邽\x82߁A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ƃ\xB7\x82\xE9(cf. TT_FILEMAPNAME \x92\xE8\x8B`)\x81B
+  <li>\x83`\x83P\x83b\x83g\x81A\x83u\x83\x89\x83\x93\x83`\x82Ȃǂ\xF0\x8Am\x94F\x82\xB7\x82\xE9
     <ul>
-      <li>teraterm\common\tt-version.h</li>
-      <li>ttssh2\ttxssh\ttxssh-version.h</li>
-      <li>ttpmenu\ttpmenu.rc // only modifying</li>
-      <li>TTProxy\TTProxy.rc // only modifying</li>
-      <li>TTXKanjiMenu\ttxkanjimenu.rc // only modifying</li>
-      <li>installer\teraterm.iss
+      <li>\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83`\x81[\x83\x80\x93\xE0\x82Ŋm\x94F\x82\xB7\x82\xE9
         <ul>
-          <li>AppVer \x82\xF0\x8Fグ\x81A"RC" \x82\xF0\x92lj\xC1</li>
-          <li>snapshot \x82\xF0 \x83R\x83\x81\x83\x93\x83g\x83A\x83E\x83g</li>
-          <li>\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82̌Ăяo\x82\xB5\x82\xF0\x8FC\x90\xB3</li>
+          <li>\x8D\xA1\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82ɓ\xFC\x82\xEA\x82\xE9\x82\xE0\x82́E\x8E\x9F\x89\xF1\x88ȍ~\x82ɉ\x84\x8A\xFA\x82\xB7\x82\xE9\x82\xE0\x82̂𐮗\x9D\x81E\x8C\x88\x92肷\x82\xE9</li>
         </ul>
       </li>
+      <li>\x83u\x83\x89\x83\x93\x83`\x82\xF0\x83}\x81[\x83W\x82\xB7\x82\xE9
+        <ul>
+          <li>trunk \x82\xC6 4-stable \x8AԁA\x8D\xEC\x8Bƒ\x86\x82̃u\x83\x89\x83\x93\x83`\x82Ȃ\xC7</li>
+        </ul>
+      </li>
+      <li>\x83`\x83P\x83b\x83g\x82\xF0\x83N\x83\x8D\x81[\x83Y\x82\xB7\x82\xE9
+        <ul>
+          <li>\x82\xB7\x82łɏC\x90\xB3\x8Dς݁A\x8F\x88\x97\x9D\x8Dς݂̂\xE0\x82̂̓N\x83\x8D\x81[\x83Y\x82\xB7\x82\xE9<br />
+              \x83\x8A\x83\x8A\x81[\x83X\x8E\x9E\x82ɂ́A\x91Ώۂ̃}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82̃`\x83P\x83b\x83g\x82͂\xB7\x82ׂăN\x83\x8D\x81[\x83Y\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91ԂɂȂ\xE9</li>
+          <li>\x8E\x9F\x82̃\x8A\x83\x8A\x81[\x83X\x82։񂷂\xE0\x82̂̓}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82\xF0\x95ύX\x82\xB7\x82\xE9<br />
+              \x8E\x9F\x82̃\x8A\x83\x8A\x81[\x83X\x97p\x83}\x83C\x83\x8B\x83X\x83g\x81[\x83\x93\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li>
+        </ul>
+      </li>
+      <li>\x82\xB1\x82̎\x9E\x93_\x82ŐV\x82\xBD\x82ɏo\x82Ă\xAD\x82\xE9\x83`\x83P\x83b\x83g\x82̑Ή\x9E\x82\xF0\x8C\x9F\x93\xA2\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>\x82\xB1\x82̔N\x82ɂ\xA8\x82\xAF\x82\xE9\x8Dŏ\x89\x82̃\x8A\x83\x8A\x81[\x83X\x82̏ꍇ\x82́A\x92\x98\x8D쌠\x95\\x8E\xA6\x82́u\x8DŌ\xE3\x82̔\xAD\x8Ds\x82̔N\x81v\x82\xF0\x83C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9\x81B
+  <li>\x83c\x81[\x83\x8B\x81A\x83\x89\x83C\x83u\x83\x89\x83\x8A\x81A\x83C\x83\x93\x83|\x81[\x83g\x8C\xB3\x82̍ŐV\x94ł\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9
     <ul>
+      <li>Visual Studio (<a href="https://visualstudio.microsoft.com">https://visualstudio.microsoft.com</a>)</li>
+      <li>Inno Setup (<a href="https://jrsoftware.org/isdl.php">https://jrsoftware.org/isdl.php</a>)</li>
+      <li>Oniguruma (<a href="https://github.com/kkos/oniguruma">https://github.com/kkos/oniguruma</a>)</li>
+      <li>OpenSSL (<a href="https://www.openssl.org">https://www.openssl.org</a>)</li>
+      <li>zlib (<a href="https://www.zlib.net">http://www.zlib.net</a>)</li>
+      <li>PuTTY (<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>)</li>
+      <li>SFMT (<a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html">http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html</a>)</li>
+      <li>cJSON (<a href="https://github.com/DaveGamble/cJSON">https://github.com/DaveGamble/cJSON</a>)</li>
+      <li>The reference C implementation of Argon2 (<a href="https://github.com/P-H-C/phc-winner-argon2">https://github.com/P-H-C/phc-winner-argon2</a>)</li>
+    </ul>
+    <p>\x83\x8A\x83\x8A\x81[\x83X\x82Ɏg\x82\xA4\x83o\x81[\x83W\x83\x87\x83\x93\x82͂\xB1\x82̎\x9E\x93_\x82ł\xA8\x82\xA8\x82ނˌ\x88\x92肷\x82\xE9\x81B</p>
+  </li>
+  <li>\x8D\xA1\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82ɓ\xFC\x82ꂽ\x82\xA2\x82\xE0\x82̂\xAA\x97\x8E\x82\xBF\x92\x85\x82\xAD</li>
+</ol>
+
+<h3>RC\x8D쐬\x82\xA9\x82烊\x83\x8A\x81[\x83X\x82܂\xC5</h3>
+
+<ol>
+  <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9
+    <ul>
+      <li>\x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82̐ݒ荀\x96ځEUI\x82̂Ȃ\xA2\x93\xC1\x95ʃI\x83v\x83V\x83\x87\x83\x93\x81E\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x81E\x90V\x8BK\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ȂǁA\x91Ή\x9E\x82\xB7\x82\xE9\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82ɘR\x82ꂪ\x82Ȃ\xA2\x82\xA9\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82\xF0\x8Am\x94F\x82\xB5\x81A\x8F\x91\x82\xAB\x96Y\x82ꂪ\x82\xA0\x82\xEA\x82ΒNjL\x82\xB7\x82\xE9\x81B</li>
+      <li>\x95ύX\x97\x9A\x97\xF0\x82̏\x87\x94Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̎w\x90j\x82Ƃ\xB5\x82ẮA\x83^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83V\x83\x87\x83\x93\x8A֌W\x81E\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ă̕ύX\x81E\x83}\x83N\x83\x8D\x82̏\x87\x81B</li>
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x8D\xB7\x95\xAA\x82\xAA\x96|\x96󂳂\xEA\x82Ă\xA2\x82邱\x82Ƃ\xF0\x8Am\x94F\x82\xB5\x81A\x96|\x96\xF3\x96Y\x82ꂪ\x82\xA0\x82\xEA\x82Ζ|\x96󂷂\xE9\x81B</li>
+    </ul>
+  </li>
+  <li>\x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x88\xEA\x82ƒC\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9
+    <p>\x88\xEA\x94ʂɃe\x83X\x83g\x82\xF0\x8CĂт\xA9\x82\xAF\x81A\x8B\x8C\x83o\x81[\x83W\x83\x87\x83\x93\x82Ƃ̓\xAF\x8E\x9E\x8E\xC0\x8Ds\x82\xAA\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82邽\x82߁A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ƃ\xB7\x82\xE9\x81i\x97\xE1: TT_FILEMAPNAME \x92\xE8\x8B` \x82Ȃǁj\x81B</p>
+    <ul>
+      <li>teraterm\common\tt-version.h</li>
+      <li>ttssh2\ttxssh\ttxssh-version.h</li>
+      <li>Onttpmenu\ttpmenu.rc // \x95ύX\x8E\x9E\x82̂\xDD</li>
+      <li>TTProxy\TTProxy.rc // \x95ύX\x8E\x9E\x82̂\xDD</li>
+      <li>TTXKanjiMenu\ttxkanjimenu.rc // \x95ύX\x8E\x9E\x82̂\xDD</li>
+    </ul>
+    <p>
+      CygTerm+ \x82͗\xE1\x8AO\x82ŁA\x83\x8A\x83\x8A\x81[\x83X\x82Ƃ͊֌W\x82Ȃ\xAD\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x8Fオ\x82\xE9\x81B<br />
+      \x8FC\x90\xB3\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82\xE9\x82Ƒ\xA6\x83\x8A\x83\x8A\x81[\x83X\x88\xB5\x82\xA2\x82ɂȂ\xE8\x81A\x83\x8A\x83\x8A\x81[\x83X\x93\xFA\x82͂\xBB\x82̓\xFA\x95t\x82ƂȂ\xE9\x81B\x82\xBB\x82̂\xBD\x82߁A\x8FC\x90\xB3\x81E\x83o\x81[\x83W\x83\x87\x83\x93\x82̃C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x81E\x95ύX\x97\x9A\x97\xF0\x82𓯎\x9E\x82ɃR\x83~\x83b\x83g\x82\xB7\x82\xE9\x81B<br />
+      \x82\xB1\x82\xEA\x82̓R\x83\x93\x83p\x83C\x83\x89\x82̓\xFC\x8E肪\x97e\x88ՂȂ\xBD\x82߁B
+    </p>
+  </li>
+  <li>\x82\xB1\x82̔N\x82ɂ\xA8\x82\xAF\x82\xE9\x8Dŏ\x89\x82̃\x8A\x83\x8A\x81[\x83X\x82̏ꍇ\x82́A\x92\x98\x8D쌠\x95\\x8E\xA6\x82́u\x8DŌ\xE3\x82̔\xAD\x8Ds\x82̔N\x81v\x82\xF0\x83C\x83\x93\x83N\x83\x8A\x83\x81\x83\x93\x83g\x82\xB7\x82\xE9
+    <ul>
       <li>teraterm\keycode\keycode-version.rc // VERSIONINFO</li>
       <li>teraterm\teraterm\tt-version.rc // VERSIONINFO</li>
       <li>teraterm\ttpcmn\ttpcmn-version.rc // VERSIONINFO</li>
@@ -510,116 +561,192 @@
       <li>doc\ja\html\macro\index.html</li>
     </ul>
   </li>
-  <li>\x88ˑ\xB6\x83\x89\x83C\x83u\x83\x89\x83\x8A\x81A\x83c\x81[\x83\x8B\x81A\x83C\x83\x93\x83|\x81[\x83g\x8C\xB3\x82̍ŐV\x94ł\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81B
+  <li>64bit Cygwin \x83o\x83C\x83i\x83\x8A\x82\xF0\x8D\xB7\x82\xB5\x91ւ\xA6\x82\xE9
+    <p>
+      \x91O\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82\xA9\x82\xE7 CygTerm+ \x82ɕύX\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x82́A64bit Cygwin\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xBD cygterm\cygterm+-x86_64\cygterm.exe \x82\xF0\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9\x81B<br />
+      \x83\\x81[\x83X\x8FC\x90\xB3\x82\xF0\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9\x82Ƃ\xAB\x82ɁA\x93\xAF\x8E\x9E\x82Ƀo\x83C\x83i\x83\x8A\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xEA\x82΁A\x83\x8A\x83\x8A\x81[\x83X\x8E\x9E\x82ɂ\xB1\x82̍H\x92\xF6\x82\xF0\x8Ds\x82\xA4\x95K\x97v\x82͂Ȃ\xA2\x81B
+    </p>
+  </li>
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9
     <ul>
-      <li>Visual Studio<br />
-          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
-      <li>Inno Setup<br />
-          http://www.jrsoftware.org/isdl.php</li>
-      <li>Oniguruma<br />
-          http://www.microsoft.com/japan/msdn/vstudio/downloads/default.aspx</li>
-      <li>OpenSSL<br />
-          http://www.openssl.org/</li>
-      <li>zlib<br />
-          http://www.zlib.net/</li>
-      <li>PuTTY<br />
-          http://www.chiark.greenend.org.uk/~sgtatham/putty/</li>
-      <li>SFMT<br />
-          http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html</li>
-      <li>CygTerm<br />
-          https://googledrive.com/host/0B1s-dM6d6yC4fmhEZ3c0VTNFWEFtV3daUlRGQmFHVnBmVHRybUNnUVliNWktNDRlZ2NnZTQ/index-e.html</li>
+      <li>teraterm.iss \x82\xCC AppVer \x82\xF0\x81u\x8E\x9F\x82̃o\x81[\x83W\x83\x87\x83\x93-RC\x81v\x82Ƃ\xB7\x82\xE9
+        <pre>
+- #define AppVer "4.105"
++ #define AppVer "4.106-RC1"
+        </pre>
+      </li>
+      <li>teraterm.iss \x82\xCC snapshot \x82\xF0\x83R\x83\x81\x83\x93\x83g\x83A\x83E\x83g\x82\xB7\x82\xE9
+        <pre>
+- #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
++ ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+        </pre>
+      </li>
+      <li>teraterm.iss \x82\xA9\x82\xE7\x8BN\x93\xAE\x82\xB7\x82\xE9\x83o\x83b\x83`\x82\xF0\x81A\x83\x8A\x83\x8A\x81[\x83X\x97p\x82Ɂu\x83\x8A\x83r\x83\x8B\x83h\x97L\x8C\xF8\x81v\x81u\x83A\x81[\x83J\x83C\x83u\x8D쐬\x97L\x8C\xF8\x81v\x82ɂ\xB7\x82\xE9
+        <pre>
+  [InnoIDE_PreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [InnoIDE_PostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+  
+  [PreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [PostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+  
+  [_ISToolPreCompile]
+  Name: makechm.bat
+- Name: build.bat
+- ;Name: build.bat; Parameters: rebuild
++ ;Name: build.bat
++ Name: build.bat; Parameters: rebuild
+  
+  [_ISToolPostCompile]
+- ;Name: makearchive.bat; Parameters: release
++ Name: makearchive.bat; Parameters: release
+        </pre>
+      </li>
+      <li id="RC_commit">\x82\xB1\x82̏\xF3\x91ԂŃR\x83~\x83b\x83g\x82\xB7\x82\xE9</li>
+      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile Setup" \x82ŃC\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li>
+      <li>\x8D쐬\x82\xB3\x82ꂽ\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xF0 zip \x82ň\xB3\x8Fk\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B
+  <li>\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x91S OS \x82ŃC\x83\x93\x83X\x83g\x81[\x83\x89\x82̎\xC0\x8Ds\x81A\x8BN\x93\xAE\x81A\x90ڑ\xB1\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9</li>
+  <li>OSDN \x82̃\x8A\x83\x8A\x81[\x83X\x95\xA8\x8C\x8F\x82ɒlj\xC1\x82\xB7\x82\xE9
     <ul>
-      <li>\x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82̐ݒ荀\x96ځEUI\x82̂Ȃ\xA2\x93\xC1\x95ʃI\x83v\x83V\x83\x87\x83\x93\x81E\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83p\x83\x89\x83\x81\x81[\x83^\x81E\x90V\x8BK\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82ȂǁA\x91Ή\x9E\x82\xB7\x82\xE9\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82ɘR\x82ꂪ\x82Ȃ\xA2\x82\xA9\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
-      <li>\x95ύX\x97\x9A\x97\xF0\x82̏\x91\x82\xAB\x96Y\x82\xEA\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B<br />
-       \x82\xA8\x82\xA8\x82ނ˕ύX\x82\xB5\x82\xBD\x8F\x87\x82ɒNjL\x82\xB3\x82\xEA\x82\xE9\x95ύX\x97\x9A\x97\xF0\x82̏\x87\x94Ԃ\xF0\x95ύX\x82\xB7\x82\xE9\x81B\x82\xBE\x82\xA2\x82\xBD\x82\xA2\x82̎w\x90j\x82Ƃ\xB5\x82ẮA\x83^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83V\x83\x87\x83\x93\x8A֌W\x81E\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82Ƃ\xB5\x82Ă̕ύX\x81E\x83}\x83N\x83\x8D\x82̏\x87\x81B</li>
-      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x8D\xB7\x95\xAA\x82\xAA\x96|\x96󂳂\xEA\x82Ă\xA2\x82邱\x82Ƃ\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81B</li>
+      <li>\x81uTera Term RC\x81v\x83p\x83b\x83P\x81[\x83W\x82ɐV\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x81i\x97\xE1: "4.106 RC"\x81j\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li>
+      <li>\x90V\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x82ɁA\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81E\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xCC zip \x83t\x83@\x83C\x83\x8B\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>\x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8Fグ\x81A\x93\xFA\x95t\x82\xF0\x95ύX\x82\xB7\x82\xE9\x81B
+  <li>RC\x82̍쐬\x82\xF0\x83A\x83i\x83E\x83\x93\x83X\x82\xB7\x82\xE9
     <ul>
-      <li>teraterm.iss<br />
-          AppVer \x82\xA9\x82\xE7 RC \x82\xF0\x8D폜</li>
+      <li><a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">ttssh2-users</a> \x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g</li>
+      <li>Twitter (<a href="https://twitter.com/Tera_Term">https://twitter.com/Tera_Term</a>)</li>
+    </ul>
+  </li>
+  <li>\x83t\x83B\x81[\x83h\x83o\x83b\x83N\x82\xF0\x8E󂯓\xFC\x82\xEA\x82\xE9
+    <p>\x8FC\x90\xB3\x82\xAA\x93\xFC\x82\xC1\x82\xBD\x82\xE7\x8Dēx\x81u\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9\x81v\x81u\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x91S OS \x82ŋN\x93\xAE\x81E\x90ڑ\xB1\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81v</p>
+  </li>
+</ol>
+
+<h3>\x83\x8A\x83\x8A\x81[\x83X\x8D\xEC\x8B\xC6</h3>
+
+<ol>
+  <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9 (\x8Fڍׂ͓\xAF\x8F\xE3)</li>
+  <li>\x83\x8A\x83\x8A\x81[\x83X\x93\xFA\x82\xF0\x95ύX\x82\xB7\x82\xE9
+    <ul>
       <li>html/about/hisotry.html</li>
     </ul>
-    CygTerm+ \x82͗\xE1\x8AO\x82ŁA\x83\x8A\x83\x8A\x81[\x83X\x82Ƃ͊֌W\x82Ȃ\xAD\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x8Fオ\x82\xE9\x81B<br />
-    \x83p\x83b\x83`\x82\xAA\x83R\x83~\x83b\x83g\x82\xB3\x82\xEA\x82\xE9\x82Ƒ\xA6\x83\x8A\x83\x8A\x81[\x83X\x88\xB5\x82\xA2\x82ɂȂ\xE8\x81A\x83\x8A\x83\x8A\x81[\x83X\x93\xFA\x82͂\xBB\x82̓\xFA\x95t\x82ƂȂ\xE9\x81B<br />
-    \x82\xB1\x82\xEA\x82́A\x83o\x81[\x83W\x83\x87\x83\x93\x82̖\x96\x94\xF6\x82\xAA patchlevel \x82ł\xA0\x82\xE8\x81A\x83R\x83\x93\x83p\x83C\x83\x89\x82̓\xFC\x8E肪\x97e\x88ՂȂ\xBD\x82߁B
   </li>
-  <li>\x91O\x89\xF1\x82̃\x8A\x83\x8A\x81[\x83X\x82\xA9\x82\xE7CygTerm+\x82ɕύX\x82\xAA\x82\xA0\x82\xE9\x8Fꍇ\x82́A64bit Cygwin\x82Ńr\x83\x8B\x83h\x82\xB5\x82\xC4 cygterm\cygterm+-x86_64\cygterm.exe \x82̍\xB7\x82\xB5\x91ւ\xA6\x82\xF0\x8Ds\x82\xA4\x81B</li>
-  <li>\x93\xAE\x8D\xEC\x8Am\x94F\x82\xF0\x82\xB7\x82\xE9
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9
     <ul>
-      <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
-          ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A[Project]-[Compile Setup]\x82ō쐬\x82\xB3\x82\xEA\x82\xE9\x81B</li>
-      <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xA8\x82\xE6\x82ю\xC0\x8Ds\x82\xF0\x83e\x83X\x83g\x82\xB7\x82\xE9\x81B</li>
+      <li>teraterm.iss \x82\xCC AppVer \x82\xF0\x95ύX\x82\xB7\x82\xE9
+        <pre>
+- #define AppVer "4.106-RC1"
++ #define AppVer "4.106"
+        </pre>
+      </li>
+      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile Setup" \x82ō쐬\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>SVN \x82̃^\x83O\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B<br />
-      \x83^\x83O\x96\xBC\x82́uteraterm-\x83o\x81[\x83W\x83\x87\x83\x93\x81v\x81B\x82\xBD\x82Ƃ\xA6\x82΁Av4.82\x82Ȃ\xE7\x82\xCE"teraterm-4_82"\x81B<br />
-      <pre>
-svn copy -m "Release 4.82" svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_82
-      </pre>
+  <li>\x82\xB1\x82̏\xF3\x91ԂŃR\x83~\x83b\x83g\x82\xB7\x82\xE9</li>
+  <li>SVN \x82̃^\x83O\x82\xF0\x8D쐬\x82\xB7\x82\xE9<br />
+    \x83^\x83O\x96\xBC\x82́uteraterm-\x83o\x81[\x83W\x83\x87\x83\x93\x81v\x81B\x81i\x97\xE1: v4.106\x82Ȃ\xE7\x82\xCE"teraterm-4_106"\x81j
+    <pre>
+svn copy -m "Release 4.106" \
+    svn+ssh://svn.osdn.net/svnroot/ttssh2/branches/4-stable \
+    svn+ssh://svn.osdn.net/svnroot/ttssh2/tags/teraterm-4_106
+    </pre>
   </li>
-  <li>\x83\x8A\x83\x8A\x81[\x83X\x97p\x82̃^\x83O\x82Ń`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB5\x92\xBC\x82\xB7\x81B</li>
-  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B
+  <li>\x83\x8A\x83\x8A\x81[\x83X\x97p\x82̃^\x83O\x82Ń`\x83F\x83b\x83N\x83A\x83E\x83g\x82\xB5\x92\xBC\x82\xB7<br />
+    <p>SVN \x82̃\x8A\x83r\x83W\x83\x87\x83\x93\x88ȊO\x82̂\xB7\x82ׂĂ\xAA\x81A\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82Ɠ\xAF\x82\xB6\x8F\xF3\x91ԂɂȂ\xE9</p>
+  </li>
+  <li>\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x82\xF0\x8D쐬\x82\xB7\x82\xE9
     <ul>
-      <li>teraterm\installer\teraterm.iss \x82\xF0\x95ҏW\x82\xB7\x82\xE9
-<pre>
-#define AppVer "4.???"
-;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
-
-[InnoIDE_PreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[InnoIDE_PostCompile]
-Name: makearchive.bat; Parameters: release
-
-[PreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[PostCompile]
-Name: makearchive.bat; Parameters: release
-
-[_ISToolPreCompile]
-Name: makechm.bat
-;Name: build.bat
-Name: build.bat; Parameters: rebuild
-
-[_ISToolPostCompile]
-Name: makearchive.bat; Parameters: release
-</pre>
-      </li>
-      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A[Project]-[Compile Setup]\x82ō쐬\x82\xB3\x82\xEA\x82\xE9</li>
+      <li>ISTool \x82\xC5 teraterm\installer\teraterm.iss \x82\xF0\x8AJ\x82\xAB\x81A"Project"-"Compile Setup" \x82ō쐬\x82\xB7\x82\xE9</li>
+      <li>\x8D쐬\x82\xB3\x82ꂽ\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xF0 zip \x82ň\xB3\x8Fk\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>OSDN \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x81B
+  <li>OSDN \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9
     <ul>
-      <li>[\x83_\x83E\x83\x93\x83\x8D\x81[\x83h]-[\x8AǗ\x9D]-[\x90V\x8BK\x8D쐬]<br />
-          \x95ύX\x97\x9A\x97\xF0\x82\xF0\x93\xFC\x97͂\xB5\x82ă\x8A\x83\x8A\x81[\x83X\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B</li>
-      <li>[\x83j\x83\x85\x81[\x83X\x88ꗗ]-[\x90V\x8BK\x93o\x98^]<br />
-          \x83j\x83\x85\x81[\x83X\x8BL\x8E\x96\x82\xF0\x8D쐬\x82\xB7\x82\xE9\x81B</li>
+      <li>\x81uTera Term\x81v\x83p\x83b\x83P\x81[\x83W\x82ɐV\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x81i\x97\xE1: "4.106"\x81j\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li>
+      <li>\x90V\x82\xB5\x82\xA2\x83\x8A\x83\x8A\x81[\x83X\x82ɁA\x83C\x83\x93\x83X\x83g\x81[\x83\x89\x81E\x83|\x81[\x83^\x83u\x83\x8B\x94ł\xCC zip \x83t\x83@\x83C\x83\x8B\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9</li>
+      <li>\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x82̕ύX\x97\x9A\x97\xF0\x82\xA9\x82\xE7\x81A\x83\x8A\x83\x8A\x81[\x83X\x82́u\x95ύX\x97\x9A\x97\xF0\x81v\x82ɁiWiki\x83t\x83H\x81[\x83}\x83b\x83g\x82Łj\x93]\x8BL\x82\xB7\x82\xE9\x81i\x93\xFA\x96{\x8C\xEA\x81E\x89p\x8C\xEA\x82Ƃ\xE0\x81j</li>
+      <li>\x83j\x83\x85\x81[\x83X\x8BL\x8E\x96\x82\xF0\x8D쐬\x82\xB7\x82\xE9</li>
     </ul>
   </li>
-  <li>\x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g\x82ɃA\x83i\x83E\x83\x93\x83X\x82\xB7\x82\xE9\x81B</li>
-  <li>\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83y\x81[\x83W\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9\x81B</li>
-  <li>\x83X\x83i\x83b\x83v\x83V\x83\x87\x83b\x83g\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B</li>
-  <li>Twitter \x82ɍ\x90\x92m\x82\xB7\x82\xE9\x81B<br />
-      https://twitter.com/Tera_Term<br />
-      \x83\x8A\x83\x8A\x81[\x83X\x8D\x90\x92m\x82\xF0\x83c\x83C\x81[\x83g\x82\xB5\x82ČŒ肷\x82\xE9\x81B</li>
+  <li>\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83y\x81[\x83W (<a href="https://ttssh2.osdn.jp">https://ttssh2.osdn.jp</a>) \x82\xF0\x8DX\x90V\x82\xB7\x82\xE9
+    <p>\x8DX\x90V\x82̂\xB5\x82\xA9\x82\xBD\x82\xCD <a href="https://osdn.net/projects/ttssh2/wiki/%E3%83%97%E3%83%AD%E3%82%B8%E3%82%A7%E3%82%AF%E3%83%88%E3%83%9A%E3%83%BC%E3%82%B8%E3%81%AE%E6%9B%B4%E6%96%B0%E6%89%8B%E9%A0%86">\x83v\x83\x8D\x83W\x83F\x83N\x83g\x83y\x81[\x83W\x82̍X\x90V\x8E菇</a> \x82\xF0\x8EQ\x8F\xC6</p>
   </li>
-  <li>\x83t\x83H\x81[\x83\x89\x83\x80\x82ɍ\x90\x92m\x82\xB7\x82\xE9\x81B<br />
-      Announcements http://logmett.com/support-forums/5<br />
-      Announcements \x82ɐV\x8BK\x93\x8A\x8De\x82\xB7\x82\xE9\x81B\x8E\xED\x97ނ\xCD Announcement\x81B<br />
-      \x88\xEA\x82‘O\x82\xCC Announcement \x82̎\xED\x97ނ\xF0 Normal \x82ɕύX\x82\xB7\x82\xE9\x81B<br />
-      Announcement \x82͎O\x8CŽc\x82\xB7\x82\xB1\x82ƂɂȂ\xC1\x82Ă\xA2\x82\xE9\x82̂ŁA\x8EO\x82‘O\x82\xCC Announcement \x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B</li>
-  <li>Chocolatey \x82̓o\x98^\x82\xF0\x8DX\x90V</li>
+  <li>\x83\x8A\x83\x8A\x81[\x83X\x82\xF0\x83A\x83i\x83E\x83\x93\x83X\x82\xB7\x82\xE9
+    <ul>
+      <li><a href="https://lists.osdn.me/mailman/listinfo/ttssh2-users">ttssh2-users</a> \x83\x81\x81[\x83\x8A\x83\x93\x83O\x83\x8A\x83X\x83g</li>
+      <li>Twitter (<a href="https://twitter.com/Tera_Term">https://twitter.com/Tera_Term</a>)
+        <ul>
+          <li>\x83\x8A\x83\x8A\x81[\x83X\x83A\x83i\x83E\x83\x93\x83X\x82̃c\x83C\x81[\x83g\x82\xF0\x8CŒ\xE8\x83c\x83C\x81[\x83g\x82ɂ\xB7\x82\xE9</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+  <li id="revert_teraterm_iss">\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82\xCC teraterm.iss \x82\xF0\x96߂\xB5\x81A\x83R\x83~\x83b\x83g\x82\xB7\x82\xE9
+    <pre>
+- ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
++ #define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', '');
+
+  [InnoIDE_PreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [InnoIDE_PostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+  
+  [PreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [PostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+  
+  [_ISToolPreCompile]
+  Name: makechm.bat
+- ;Name: build.bat
+- Name: build.bat; Parameters: rebuild
++ Name: build.bat
++ ;Name: build.bat; Parameters: rebuild
+  
+  [_ISToolPostCompile]
+- Name: makearchive.bat; Parameters: release
++ ;Name: makearchive.bat; Parameters: release
+    </pre>
+  </li>
+  <li>Chocolatey \x82̓o\x98^\x82\xF0\x8DX\x90V\x82\xB7\x82\xE9</li>
 </ol>
 
+<h3>\x83R\x81[\x83h\x83t\x83\x8A\x81[\x83Y\x82ɂ‚\xA2\x82\xC4</h3>
+
+<p>
+\x83R\x81[\x83h\x83t\x83\x8A\x81[\x83X\x92\x86\x82́A\x8C\xB4\x91\xA5\x93I\x82ɂ͒v\x96\xBD\x93I\x82ȃo\x83O\x82̏C\x90\xB3\x82̂݉”\\x82ƂȂ\xE8\x82܂\xB7\x81B<br />
+\x83R\x81[\x83h\x83t\x83\x8A\x81[\x83Y\x82́ARC\x8D쐬\x81i<a href="#RC_commit">\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83` \x82\xC5 teraterm.iss \x82\xC9 RC \x82\xF0\x95t\x82\xAF\x82\xE9\x83R\x83~\x83b\x83g</a>\x81j</a>\x82\xA9\x82烊\x83\x8A\x81[\x83X\x81i<a href="#revert_teraterm_iss">\x8AJ\x94\xAD\x83u\x83\x89\x83\x93\x83`\x82\xCC teraterm.iss \x82\xF0\x96߂\xB7\x83R\x83~\x83b\x83g</a>\x81j\x82܂łƂ\xB5\x82܂\xB7\x81B
+</p>
+
 </body>
 </html>

From scmnotify ＠ osdn.net  Wed Jan 19 23:40:08 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Wed, 19 Jan 2022 23:40:08 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MDBdIHI5Njg4IOOBruWkieabtOWxpQ==?=
 =?utf-8?b?5q2044KS6L+96KiY?=
Message-ID: <1642603208.818422.29373.nullmailer@users.osdn.me>

Revision: 9700
          https://osdn.net/projects/ttssh2/scm/svn/commits/9700
Author:   zmatsuo
Date:     2022-01-19 23:40:08 +0900 (Wed, 19 Jan 2022)
Log Message:
-----------
r9688 の変更履歴を追記

- telnet(cygterm)接続時、NAWS(Negotiate About Window Size)が送られてきたとき
  ウィンドウサイズを誤って設定する可能性があった
- 4-stable へマージが必要

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9688

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2022-01-19 13:01:39 UTC (rev 9699)
+++ trunk/doc/en/html/about/history.html	2022-01-19 14:40:08 UTC (rev 9700)
@@ -46,6 +46,7 @@
   <li>Bug fixes
     <ul>
       <li>The file handle of TELNET.LOG could not be closed.</li>
+      <!--li>telnet(cygterm)\x90ڑ\xB1\x8E\x9E\x81ANAWS(Negotiate About Window Size)\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x82Ƃ\xAB\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8C\xEB\x82\xC1\x82Đݒ肷\x82\xE9\x89”\\x90\xAB\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82̂ŏC\x90\xB3\x81B\x8F\xAD\x82Ȃ\xAD\x82Ƃ\xE0r3221(2009/03/24)\x82\xA9\x82瑶\x8D݂\xB5\x82\xBD\x95s\x8B\x81B</li-->
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2022-01-19 13:01:39 UTC (rev 9699)
+++ trunk/doc/ja/html/about/history.html	2022-01-19 14:40:08 UTC (rev 9700)
@@ -46,6 +46,7 @@
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
       <li>TELNET.LOG\x82̃t\x83@\x83C\x83\x8B\x83n\x83\x93\x83h\x83\x8B\x82\xAA\x83N\x83\x8D\x81[\x83Y\x82ł\xAB\x82Ă\xA2\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>telnet(cygterm)\x90ڑ\xB1\x8E\x9E\x81ANAWS(Negotiate About Window Size)\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x82Ƃ\xAB\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8C\xEB\x82\xC1\x82Đݒ肷\x82\xE9\x89”\\x90\xAB\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82̂ŏC\x90\xB3\x81B\x8F\xAD\x82Ȃ\xAD\x82Ƃ\xE0r3221(2009/03/24)\x82\xA9\x82瑶\x8D݂\xB5\x82\xBD\x95s\x8B\x81B</li>
     </ul>
   </li>
 

From scmnotify ＠ osdn.net  Fri Jan 21 01:43:55 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Fri, 21 Jan 2022 01:43:55 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MDFdIOWVj+mhjOOBruWIh+OCiuWIhg==?=
 =?utf-8?b?44GR44CB44K144Od44O844OI5YaF5a6544Gr44Gk44GE44Gm44KC6L+96KiY?=
Message-ID: <1642697035.402380.23519.nullmailer@users.osdn.me>

Revision: 9701
          https://osdn.net/projects/ttssh2/scm/svn/commits/9701
Author:   zmatsuo
Date:     2022-01-21 01:43:55 +0900 (Fri, 21 Jan 2022)
Log Message:
-----------
問題の切り分け、サポート内容についても追記

Modified Paths:
--------------
    trunk/doc/ja/html/about/contacts.html

-------------- next part --------------
Modified: trunk/doc/ja/html/about/contacts.html
===================================================================
--- trunk/doc/ja/html/about/contacts.html	2022-01-19 14:40:08 UTC (rev 9700)
+++ trunk/doc/ja/html/about/contacts.html	2022-01-20 16:43:55 UTC (rev 9701)
@@ -18,15 +18,53 @@
   <li><a href="https://ja.osdn.net/projects/ttssh2/">Tera Term (Tera Term project page)</a></li>
     <ul>
       <li><a href="https://ja.osdn.net/projects/ttssh2/ticket/">\x83`\x83P\x83b\x83g(\x83o\x83O/\x97v\x96]/\x93\x8A\x95[)</a><br>
-        \x83o\x83O\x82̓`\x83P\x83b\x83g\x82֓o\x98^\x82\xAD\x82\xBE\x82\xB3\x82\xA2<br>
-        \x8C\xF6\x82ɂ\xB7\x82\xE9\x82Ɩ\xE2\x91肠\x82\xE9\x8Fꍇ\x82\xCD<a href="#ttssh2-contact">\x83\x81\x81[\x83\x8B</a>\x82\xAA\x97\x98\x97p\x82ł\xAB\x82܂\xB7<br>
-        \x93\x8A\x95[\x90\x94\x82̑\xBD\x82\xA2\x83`\x83P\x83b\x83g\x82͑Ή\x9E\x82\xAA\x91\xAC\x82\xAD\x82Ȃ邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1<br>
-        \x83`\x83P\x83b\x83g\x82ɑ΂\xB5\x82ăp\x83b\x83`\x82\xF0\x82\xA2\x82\xBD\x82\xBE\x82\xAD\x82ƑΉ\x9E\x82\xAA\x91\xAC\x82\xAD\x82Ȃ邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1
+        \x83o\x83O\x81A\x97v\x96]\x82̓`\x83P\x83b\x83g\x82֓o\x98^\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
+        \x83o\x83O\x82̏ꍇ\x82\xCD Tera Term \x82ɖ\xE2\x91肪\x82\xA0\x82\xE9\x82Ɣ\xBB\x92f\x82ł\xAB\x82\xE9\x8F\xEE\x95񂪂\xA0\x82\xE9\x82Ɖ\xF0\x8C\x88\x82\xAA\x91\xAC\x82\xAD\x82Ȃ\xE8\x82܂\xB7\x81B<br>
+        \x8B\xEF\x91̓I\x82ɂ͎\x9F\x82̂悤\x82Ȃ\xE0\x82̂ł\xB7\x81B</li>
+        <ul>
+          <li>\x93\xAE\x8D\xEC\x8A‹\xAB\x82̈ꕔ\x82\xF0\x95ύX\x82\xB5\x82ē\xAE\x8D삪\x95ς\xED\x82\xE9\x82Ȃǂ̏\xEE\x95\xF1<br>
+            \x97Ⴆ\x82\xCETera Term\x82Ɠ\xAF\x93\x99\x82̃v\x83\x8D\x83O\x83\x89\x83\x80\x82Ɣ\xE4\x8Ar\x82\xB5\x82ē\xAE\x8D삪\x88قȂ\xE9\x81AOS\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x95ύX\x82\xB7\x82\xE9\x82Ɣ\xAD\x90\xB6\x82\xB7\x82\xE9\x81A\x82Ȃǂ̏\xEE\x95\xF1\x81B<br>
+            \x93\xAE\x8D\xEC\x8A‹\xAB\x82Ƃ\xB5\x82Ă͎\x9F\x82̂悤\x82Ȃ\xE0\x82̂\xAA\x8Dl\x82\xA6\x82\xE7\x82\xEA\x82܂\xB7\x81B</li>
+            <ul>
+              <li>Windows</li>
+              <li>Tera Term\x96{\x91\xCC</li>
+              <li>Serial\x81AUSB-Serial \x8B@\x8A\xED\x81A\x83h\x83\x89\x83C\x83o<br>
+                (A\x83\x81\x81[\x83J\x81[\x90\xBB\x82͐\xB3\x8F\xED\x82\xC5B\x83\x81\x81[\x83J\x81[\x90\xBB\x82͖\xE2\x91肠\x82\xE8\x82Ȃ\xE7\x81AB\x83\x81\x81[\x83J\x81[\x82̃T\x83|\x81[\x83g\x82ւ̖₢\x8D\x87\x82킹\x82\xAA\x91Ó\x96\x82\xA9\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B<br>
+                \x83\x81\x81[\x83J\x81[\x82\xAA\x88قȂ\xC1\x82Ă\xA2\x82Ă\xE0\x8Eg\x97p\x83`\x83b\x83v\x82\xAA\x93\xAF\x82\xB6\x8Fꍇ\x82͓\xAF\x82\xB6\x96\xE2\x91肪\x91\xB6\x8D݂\xB7\x82\xE9\x89”\\x90\xAB\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7)</li>
+              <li>Ethernet\x81A\x83h\x83\x89\x83C\x83o<br>
+                (\x83o\x81[\x83W\x83\x87\x83\x93X\x82͐\xB3\x8F\xED\x82Ńo\x81[\x83W\x83\x87\x83\x93Y\x82ɖ\xE2\x91肠\x82\xE8\x82Ȃ\xE7\x81A\x90\xBB\x95i\x83\x81\x81[\x83J\x81[\x82̃T\x83|\x81[\x83g\x82ւ̖₢\x8D\x87\x82킹\x82\xAA\x91Ó\x96\x82ł\xB5\x82傤)</li>
+              </li>
+              <li>\x92ʐM\x8Co\x98H(\x83P\x81[\x83u\x83\x8B(Ehter/Serial)\x81A\x83n\x83u\x81A\x83\x8B\x81[\x83^\x81[\x81A\x83A\x83N\x83Z\x83X\x83|\x83C\x83\x93\x83g\x81A\x83v\x83\x8D\x83o\x83C\x83_\x82Ȃ\xC7)</li>
+              <li>\x90ڑ\xB1\x90\xE6(\x8B@\x8A\xED\x81A\x83v\x83\x8D\x83O\x83\x89\x83\x80(\x83T\x81[\x83o\x81[\x81A\x92[\x96\x96\x93\xE0)\x81AOS\x82Ȃ\xC7)</li>
+            </ul>
+          <li>\x8DČ\xBB\x90\xAB\x81A\x95p\x93x<br>
+            \x8DČ\xBB\x95\xFB\x96@\x82\xAA\x82킩\x82\xE9\x82ƂƂĂ\xE0\x8F\x95\x82\xA9\x82\xE8\x82܂\xB7\x81B</li>
+          <li>\x94\xAD\x90\xB6\x8E\x9E\x82̃\x8D\x83O\x81A\x89\xE6\x96ʂ̃L\x83\x83\x83v\x83`\x83\x83</li>
+          <li>\x82\xBB\x82̑\xBC\x81A\x83w\x83\x8B\x83v\x81Aweb\x83T\x83C\x83g\x93\xE0\x82̕\xB6\x8F͂̌\xEB\x82\xE8\x82Ȃ\xC7</li>
+        </ul>
+        Tera Term \x88ȊO\x82̓\xE0\x97e\x81A\x83{\x83\x89\x83\x93\x83e\x83B\x83A\x82̔\xCD\xE1e\x82𒴂\xA6\x82\xBD\x83T\x83|\x81[\x83g\x82ɂ͂\xA8\x93\x9A\x82\xA6\x82ł\xAB\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B<br>
+        \x8B\xEF\x91̓I\x82ɂ͎\x9F\x82̂悤\x82Ȃ\xE0\x82̂ł\xB7\x81B</li>
+        <ul>
+          <li>\x83u\x83\x8B\x81[\x83X\x83N\x83\x8A\x81[\x83\x93\x94\xAD\x90\xB6\x82̏C\x90\xB3<br>
+            Tera Term \x82\xCD Windows \x82̕\x81\x92ʂ̃v\x83\x8D\x83O\x83\x89\x83\x80\x82ł\xB7\x81B
+            Windows \x93\xE0\x82Œv\x96\xBD\x93I\x82ȃG\x83\x89\x81[\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82\xBD\x82Ƃ\xAB\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83u\x83\x8B\x81[\x83X\x83N\x83\x8A\x81[\x83\x93\x82\xF0\x81A
+            \x95\x81\x92ʂ̃v\x83\x8D\x83O\x83\x89\x83\x80\x82\xA9\x82甭\x90\xB6\x82\xB3\x82\xB9\x82邱\x82Ƃ͂܂\xB8\x82ł\xAB\x82Ȃ\xA2\x82ł\xB5\x82傤\x81B<br>
+            \x82\xE0\x82\xB5\x81A\x83u\x83\x8B\x81[\x83X\x83N\x83\x8A\x81[\x83\x93\x82𔭐\xB6\x82\xB3\x82\xB9\x82\xC4 Windows \x82\xF0\x8E~\x82߂邱\x82Ƃ\xAA\x82ł\xAB\x82\xE9\x82Ȃ\xE7\x81A
+            \x82\xBB\x82̕\x94\x95\xAA\x82ɐƎ㐫\x82\xAA\x82\xA0\x82邱\x82ƂɂȂ\xE8\x82܂\xB7\x81B<br>
+            \x82قƂ\xF1\x82ǂ̏ꍇ\x81A\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x83f\x83o\x83C\x83X\x82̃f\x83o\x83C\x83X\x83h\x83\x89\x83C\x83o\x82\xAA\x8C\xB4\x88\xF6\x82Ŕ\xAD\x90\xB6\x82\xB5\x82܂\xB7\x81B</li>
+          <li>\x83l\x83b\x83g\x83\x8F\x81[\x83N\x90ݒ\xE8\x81A\x90ڑ\xB1\x96@\x81A\x83z\x83X\x83g\x82̐ݒ\xE8\x81A\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x96@\x82Ȃ\xC7</li>
+          <li>...\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x83}\x83N\x83\x8D\x82̍쐬</li>
+          <li>\x93\xC1\x92\xE8\x82̋@\x8A\xED\x82\xE2Windows\x82Ɋւ\xB7\x82邱\x82\xC6<br>
+            A\x83\x81\x81[\x83J\x81[\x90\xBB\x82̋@\x8A\xED\x82̃o\x81[\x83W\x83\x87\x83\x93X\x82ł͖\xE2\x91肪\x8BN\x82\xAB\x82܂\xB7\x81A\x82Ȃ\xC7</li>
+        </ul>
+        \x8C\xF6\x82ɂ\xB7\x82\xE9\x82Ɩ\xE2\x91肠\x82\xE9\x8Fꍇ\x82\xCD<a href="#ttssh2-contact">\x83\x81\x81[\x83\x8B</a>\x82\xAA\x97\x98\x97p\x82ł\xAB\x82܂\xB7\x81B<br>
+        \x93\x8A\x95[\x90\x94\x82̑\xBD\x82\xA2\x83`\x83P\x83b\x83g\x82͑Ή\x9E\x82\xAA\x91\xAC\x82\xAD\x82Ȃ邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B<br>
+        \x83`\x83P\x83b\x83g\x82ɑ΂\xB5\x82ăp\x83b\x83`\x82\xF0\x82\xA2\x82\xBD\x82\xBE\x82\xAD\x82ƑΉ\x9E\x82\xAA\x91\xAC\x82\xAD\x82Ȃ邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B
       </li>
       <li><a href="https://osdn.net/projects/ttssh2/forums/">\x83t\x83H\x81[\x83\x89\x83\x80</a><br>
-        \x8B^\x96\xE2\x93_\x82Ȃǂ𓊍e\x82\xA2\x82\xBD\x82\xBE\x82\xAD\x82ƁA\x8Fڂ\xB5\x82\xA2\x95\x{30AA4DA}\x82\xA6\x82Ă\xAD\x82\xEA\x82邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1<br>
-        \x82\xB1\x82\xB1\x82ł\xCC Q &amp; A \x82\xAA\x91\xBC\x82̃\x86\x81[\x83U\x81[\x82̏\x95\x82\xAF\x82ƂȂ\xE8\x82܂\xB7<br>
-        \x82܂\xBD\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x81A\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82̉\xFC\x97ǂ̎Q\x8Dl\x82ɂȂ\xE8\x82܂\xB7
+        \x8B^\x96\xE2\x93_\x82Ȃǂ𓊍e\x82\xA2\x82\xBD\x82\xBE\x82\xAD\x82ƁA\x8Fڂ\xB5\x82\xA2\x95\x{30AA4DA}\x82\xA6\x82Ă\xAD\x82\xEA\x82邩\x82\xE0\x82\xB5\x82\xEA\x82܂\xB9\x82\xF1\x81B<br>
+        \x82\xB1\x82\xB1\x82ł\xCC Q &amp; A \x82\xAA\x91\xBC\x82̃\x86\x81[\x83U\x81[\x82̏\x95\x82\xAF\x82ƂȂ\xE8\x82܂\xB7\x81B<br>
+        \x82܂\xBD\x83h\x83L\x83\x85\x83\x81\x83\x93\x83g\x81A\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82̉\xFC\x97ǂ̎Q\x8Dl\x82ɂȂ\xE8\x82܂\xB7\x81B
       </li>
       <li><a href="https://ja.osdn.net/projects/ttssh2/releases/">\x83_\x83E\x83\x93\x83\x8D\x81[\x83h</a></li>
       <li><a href="https://ja.osdn.net/projects/ttssh2/scm/svn/">\x83\\x81[\x83X/\x83\x8A\x83|\x83W\x83g\x83\x8A</a></li>
@@ -55,7 +93,8 @@
     <address>ttssh2-contact at lists.osdn.me</address>
     \x83v\x83\x8D\x83W\x83F\x83N\x83g\x83\x81\x83\x93\x83o\x81[\x82ւ̃\x81\x81[\x83\x8B<br>
     \x8C\xF6\x82ɂ͂\xB5\x82\xBD\x82\xAD\x82Ȃ\xA2\x8E\x96\x95\xBF(\x95s\x8B\x82Ȃ\xC7)\x82̘A\x97\x8D\x97p<br>
-    \x91\x97\x82\xE7\x82ꂽ\x83\x81\x81[\x83\x8B\x82̓v\x83\x8D\x83W\x83F\x83N\x83g\x83\x81\x83\x93\x83o\x81[\x8AԂŋ\xA4\x97L\x82\xB3\x82\xEA\x82܂\xB7
+    \x91\x97\x82\xE7\x82ꂽ\x83\x81\x81[\x83\x8B\x82̓v\x83\x8D\x83W\x83F\x83N\x83g\x83\x81\x83\x93\x83o\x81[\x8AԂŋ\xA4\x97L\x82\xB3\x82\xEA\x82܂\xB7\x81B<br>
+    \x95Ԏ\x96\x82\xAA\x82\xA9\x82Ȃ\xE8\x92x\x82ꂽ\x82\xE8\x81A\x8Fo\x82\xB9\x82Ȃ\xA2\x8Fꍇ\x82\xE0\x82\xA0\x82\xE8\x82܂\xB7\x82̂ł\xB2\x97\xB9\x8F\xB3\x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
   </li>
 </ul>
 

From scmnotify ＠ osdn.net  Sun Jan 23 01:09:18 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 23 Jan 2022 01:09:18 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MDJdIOOCv+OCpOODiOODq+OBjOOBqg==?=
 =?utf-8?b?44GEaHRtbOODleOCoeOCpOODq+OBruOBqOOBjeOAgeODleOCoeOCpOODqw==?=
 =?utf-8?b?5ZCN44KS44Kk44Oz44OH44OD44Kv44K544Go44GX44Gm5Ye65Yqb?=
Message-ID: <1642867758.321699.15781.nullmailer@users.osdn.me>

Revision: 9702
          https://osdn.net/projects/ttssh2/scm/svn/commits/9702
Author:   zmatsuo
Date:     2022-01-23 01:09:18 +0900 (Sun, 23 Jan 2022)
Log Message:
-----------
タイトルがないhtmlファイルのとき、ファイル名をインデックスとして出力

- ヘルプファイルの index.hhk 生成時
- html の TITLE タグをインデックス名として使用している
- タイトルが設定されていない html ファイルの時、インデックスが出力されていなかった
- ファイル名をインデックス名として出力するようにした
- markdown を html に変換したとき、タイトルがない html ファイルができる

ticket #43658

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43658

Modified Paths:
--------------
    trunk/doc/htmlhelp_index_make.pl

-------------- next part --------------
Modified: trunk/doc/htmlhelp_index_make.pl
===================================================================
--- trunk/doc/htmlhelp_index_make.pl	2022-01-20 16:43:55 UTC (rev 9701)
+++ trunk/doc/htmlhelp_index_make.pl	2022-01-22 16:09:18 UTC (rev 9702)
@@ -99,6 +99,7 @@
 
 	open(FP, "<:crlf:encoding(sjis)", "$filename") || return;
 	$no = 1;
+	my $find_title = 0;
 	while ($line = <FP>) {
 #		$line = chomp($line);
 #		print "$line\n";
@@ -108,11 +109,18 @@
 			$val = $1;
 			$val =~ s/"/&#34;/g;  # 二重引用符をエスケープする
 			write_add_index($filename, $val);
+			$find_title = 1;
 			last;
 		}
 
 		$no++;
 	}
+	if ($find_title == 0) {
+		# タイトルがないhtmlのときファイル名をタイトルとする
+		$filename =~ /\/([^\/]+)\.html$/;
+		my $title = $1;
+		write_add_index($filename, $title);
+	}
 	close(FP);
 }
 

From scmnotify ＠ osdn.net  Sun Jan 23 01:09:28 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 23 Jan 2022 01:09:28 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MDNdIOODquODs+OCr+OBjOWIh+OCjA==?=
 =?utf-8?b?44Gm44GE44KL44OJ44Kt44Ol44Oh44Oz44OI44GM44GC44Gj44Gf44Gu44Gn?=
 =?utf-8?b?5L+u5q2j?=
Message-ID: <1642867768.439007.18865.nullmailer@users.osdn.me>

Revision: 9703
          https://osdn.net/projects/ttssh2/scm/svn/commits/9703
Author:   zmatsuo
Date:     2022-01-23 01:09:28 +0900 (Sun, 23 Jan 2022)
Log Message:
-----------
リンクが切れているドキュメントがあったので修正

- index.html を修正
- 日本語のヘルプにしかないファイルを英語に追加
  - en/html/setup/folder.md
  - ただし内容は日本語
- html/setup/folder.md を html へ変換するようにした

ticket #43658

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43658

Modified Paths:
--------------
    trunk/doc/convtext.bat
    trunk/doc/en/html/index.html
    trunk/doc/ja/html/index.html
    trunk/doc/makechm.cmake

Added Paths:
-----------
    trunk/doc/en/html/setup/folder.md

-------------- next part --------------
Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2022-01-22 16:09:18 UTC (rev 9702)
+++ trunk/doc/convtext.bat	2022-01-22 16:09:28 UTC (rev 9703)
@@ -28,3 +28,6 @@
 %TOSJIS% -i %REF_E%/keyboard_cfg.md     -o %REF_E%/keyboard_cfg.html
 %TOSJIS% -i %REF_J%/menu_id.md          -o %REF_J%/menu_id.html
 %TOSJIS% -i %REF_E%/menu_id.md          -o %REF_E%/menu_id.html
+
+%TOSJIS% -i ja/html/setup/folder.md     -o ja/html/setup/folder.html
+%TOSJIS% -i en/html/setup/folder.md     -o en/html/setup/folder.html

Modified: trunk/doc/en/html/index.html
===================================================================
--- trunk/doc/en/html/index.html	2022-01-22 16:09:18 UTC (rev 9702)
+++ trunk/doc/en/html/index.html	2022-01-22 16:09:28 UTC (rev 9703)
@@ -123,6 +123,7 @@
 
 <div class="topic">Setup files</div>
 <UL>
+ <LI><A HREF="setup/folder.html">Folder to put setup files</A></LI>
  <LI><A HREF="setup/teraterm.html">Tera Term setup file</A></LI>
  <LI><A HREF="setup/keyboard.html">Keyboard setup file (overview)</A></LI>
  <UL>
@@ -137,6 +138,7 @@
 <div class="topic">Reference data</div>
 <UL style="list-style-type:none">
  <LI><A HREF="reference/keycode.txt">Key code</A></LI>
+ <LI><A HREF="reference/menu_id.html">menu id</A></LI>
  <LI><A HREF="reference/RE.txt">RE</A></LI>
  <LI><A HREF="reference/cJSON-LICENSE.txt">License of cJSON</A></LI>
  <LI><A HREF="reference/Oniguruma-LICENSE.txt">License of Oniguruma</A></LI>

Added: trunk/doc/en/html/setup/folder.md
===================================================================
--- trunk/doc/en/html/setup/folder.md	                        (rev 0)
+++ trunk/doc/en/html/setup/folder.md	2022-01-22 16:09:28 UTC (rev 9703)
@@ -0,0 +1,59 @@
+# Tera Term が使用するフォルダ
+
+## デフォルトで使用するフォルダ
+
+- 設定ファイル
+  - `%APPDATA%\teraterm5`
+- 動作ログ、ダンプ
+  - `%LOCALAPPDATA%\teraterm5`
+- 実行ファイル(32bitOS+32bitEXEの場合)
+  - `%PROGRAMFILES%\teraterm5`
+
+### Windows Vista以降 の場合のフォルダ例
+
+- 設定ファイル
+  - `C:\Users\[usernane]\AppData\Roaming\teraterm5`
+- 動作ログ、ダンプ
+  - `C:\Users\[usernane]\AppData\Local\teraterm5`
+- 実行ファイル(32bitOS+32bitEXE)
+  - `C:\Program Files\teraterm5`
+
+### Windows 2000, XP の場合のフォルダ例
+
+- 設定ファイル
+  - `C:\Documents and Settings\[usernane]\AppData\Roaming\teraterm5`
+- 動作ログ、ダンプ(未定義)
+  - `C:\Documents and Settings\[usernane]\Application Data\teraterm5`
+- 実行ファイル
+  - `C:\Program Files\teraterm5`
+
+### Windows 2000より以前の場合のフォルダ例
+
+- 設定ファイル
+  - `C:\My Documents\teraterm5`
+- 動作ログ、ダンプ(未定義)
+  - `C:\My Documents\teraterm5`
+- 実行ファイル
+  - `C:\Program Files\teraterm5`
+
+参考
+
+- [https://torutk.hatenablog.jp/entry/20110604/p1](https://torutk.hatenablog.jp/entry/20110604/p1)
+
+## ファイルを指定した場合
+
+コマンドラインでファイルをフルパスで指定した場合は、それを優先して使用する
+
+- TERATERM.INI
+- KEYBOARD.CNF
+- broadcast.log
+
+
+## 設定ファイルがない場合
+
+次のように動作する
+
+- 設定ファイルを置くフォルダを作成する
+- ttermpro.exeのフォルダにある設定ファイルを
+- 設定ファイルを置くフォルダにコピーする
+

Modified: trunk/doc/ja/html/index.html
===================================================================
--- trunk/doc/ja/html/index.html	2022-01-22 16:09:18 UTC (rev 9702)
+++ trunk/doc/ja/html/index.html	2022-01-22 16:09:28 UTC (rev 9703)
@@ -123,7 +123,7 @@
 
 <div class="topic">\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B</div>
 <UL>
- <LI><A HREF="setup/folder.md">\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xAA\x92u\x82\xA9\x82\xEA\x82\xE9\x83t\x83H\x83\x8B\x83_</A></LI>
+ <LI><A HREF="setup/folder.html">\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xAA\x92u\x82\xA9\x82\xEA\x82\xE9\x83t\x83H\x83\x8B\x83_</A></LI>
  <LI><A HREF="setup/teraterm.html">Tera Term \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B</A></LI>
  <LI><A HREF="setup/keyboard.html">\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B \x8AT\x97v</A></LI>
  <UL>

Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake	2022-01-22 16:09:18 UTC (rev 9702)
+++ trunk/doc/makechm.cmake	2022-01-22 16:09:28 UTC (rev 9703)
@@ -91,6 +91,9 @@
   ConvertHTML("-i ${REF_E}/menu_id.md                    -o ${REF_E}/menu_id.html")
   ConvertHTML("-i ${REF_J}/menu_id.md                    -o ${REF_J}/menu_id.html")
 
+  ConvertHTML("-i en/html/setup/folder.md                -o en/html/setup/folder.html")
+  ConvertHTML("-i ja/html/setup/folder.md                -o ja/html/setup/folder.html")
+
   execute_process(
     COMMAND ${PERL} htmlhelp_index_make.pl en html -o en/Index.hhk
     COMMAND ${PERL} htmlhelp_index_make.pl ja html -o ja/Index.hhk

From scmnotify ＠ osdn.net  Sun Jan 23 02:05:00 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 23 Jan 2022 02:05:00 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MDRdIOiLseiqnueJiOOBuOe9ruOBjQ==?=
 =?utf-8?b?5o+b44GI?=
Message-ID: <1642871100.363157.13583.nullmailer@users.osdn.me>

Revision: 9704
          https://osdn.net/projects/ttssh2/scm/svn/commits/9704
Author:   zmatsuo
Date:     2022-01-23 02:05:00 +0900 (Sun, 23 Jan 2022)
Log Message:
-----------
英語版へ置き換え

- keyboard.txt から該当箇所を MarkDown へ変換してファイルを差し替え

Modified Paths:
--------------
    trunk/doc/en/html/reference/keyboard_cfg.md
    trunk/doc/en/html/reference/menu_id.md

-------------- next part --------------
Modified: trunk/doc/en/html/reference/keyboard_cfg.md
===================================================================
--- trunk/doc/en/html/reference/keyboard_cfg.md	2022-01-22 16:09:28 UTC (rev 9703)
+++ trunk/doc/en/html/reference/keyboard_cfg.md	2022-01-22 17:05:00 UTC (rev 9704)
@@ -1,11 +1,11 @@
-# キーボード設定ファイルについて
+# ABOUT THE KEYBOARD SETUP FILE
 
-## キーボード設定ファイルの形式
+## FORMAT OF THE KEYBOARD SETUP FILE
 
-キーボード設定ファイルの中で用いられる PC key code は PC の各キーまたはキーの
-組み合わせに対応した数値で、使用するキーボードによって異なります。
+Each key or key combination has a unique key code, which is called
+"PC key code".
 
-キーボード設定ファイルには次の6つのセクションが存在します。
+The keyboard setup file has six sections.
 
 - [VT editor keypad]
 - [VT numeric keypad]
@@ -14,39 +14,43 @@
 - [Shortcut keys]
 - [User keys]
 
-### [VT editor keypad] セクション
+### [VT editor keypad] section
 
-VT 端末のエディターキーを PC キーに割り当てます。
+In this section, VT editor keys are assigned to PC keys.
 
-	形式:
+	Format:
 		<VT editor key name>=<PC key code>
 
+	where:
+
 	<VT editor key name>
 		Up, Down, Right, Left, Find, Insert, Remove, Select,
 		Prev, Next
 
-	<PC key code>
-		PC key code (10進数)
+	  <PC key code>
+		PC key code (decimal number)
 
-	例:
+	Example:
 		Up=328
 
-### [VT numeric keypad] セクション
+### [VT numeric keypad] section
 
-VT端末の数値キーを PC キーに割り当てます。
+In this section, VT numeric keys are assigned to PC keys.
 
-	形式:
+	Format:
 		<VT numeric key name>=<PC key code>
 
-	<VT numeric key name>
+	where:
+
+	  <VT numeric key name>
 		Num0, Num1, Num2, Num3, Num4, Num5, Num6, Num7, Num8,
 		Num9, NumMinus, NumComma, NumPeriod, NumEnter, PF1,
 		PF2, PF3, PF4
 
-	<PC key code>
-		PC key code (10進数)
+	  <PC key code>
+		PC key code (decimal number)
 
-	例:
+	Example:
 		Num0=82
 
 #### 注意
@@ -58,153 +62,155 @@
 PC key code を発生するキーボード(例えば PC9801 キーボード)の場合は
 注意が必要です。
 
-### [VT function keys] セクション
+### [VT function keys] section
 
-VT 端末のファンクションキーを PC キーに割り当てます。
+In this section, VT function keys are assigned to PC keys.
 
-	形式:
+	Format:
 		<VT function key name>=<PC key code>
 
-	<VT function key name>
-		(VT 端末のファンクションキー)
+	where:
+
+	  <VT function key name>
+		(Function keys of VT terminal)
 		Hold, Print, Break, F6, F7, F8, F9, F10, F11, F12,
 		F13, F14, Help, Do, F17, F18, F19, F20
-		(VT 端末の"ユーザー定義キー")
+		("User defined keys" of VT terminal)
 		UDK6, UDK7, UDK8, UDK9, UDK10, UDK11, UDK12, UDK13,
 		UDK14, UDK15, UDK16, UDK17, UDK18, UDK19, UDK20
 
-	<PC key code>
-		PC key code (10進数)
+	  <PC key code>
+		PC key code (decimal number)
 
-	例:
+	Example:
 		F6=64
 
-### [X function keys] セクション
+### [X function keys] section
 
-Xterm の F1-F5 キー、およびバックタブキーを PC キーに割り当てます。
+In this section, Xterm F1-F5 keys and BackTab key are assigned to PC keys.
 
-	形式:
+	Format:
 		<Xterm function key name>=<PC key code>
 
-	<Xterm function key name>
+	where:
+
+	  <Xterm function key name>
 		XF1, XF2, XF3, XF4, XF5, XBackTab
 
-	<PC key code>
-		PC key code (10進数)
+	  <PC key code>
+		PC key code (decimal number)
 
-	例:
+	Example:
 		XF1=59
 
-### [Shortcut keys] セクション
+### [Shortcut keys] section
 
-Tera Term の機能をPC キーに割り当てます。
+In this section, Tera Term functions are assigned to PC keys.
 
-	形式:
+	Format:
 		<Shortcut key name>=<PC key code>
 
-	<Shortcut key name>	機能
-	---------------------------------------------------------
-	EditCopy		[Edit] Copy コマンド
-	EditPaste		[Edit] Paste コマンド
-	EditPasteCR		[Edit] Paste<CR> コマンド
-	EditCLS 		[Edit] Clear screen コマンド
-	EditCLB 		[Edit] Clear buffer コマンド
-	ControlOpenTEK		[Control] Open TEK コマンド
-	ControlCloseTEK 	[Control] Close TEK コマンド
-	LineUp			一行スクロールアップ
-	LineDown		一行スクロールダウン
-	PageUp			一ページスクロールアップ
-	PageDown		一ページスクロールダウン
-	BuffTop 		バッファー先頭へスクロール
-	BuffBottom		バッファー最後へスクロール
-	NextWin 		次の Tera Term ウィンドウへ移動
-	PrevWin 		前の Tera Term ウィンドウへ移動
-	NextShownWin 		次の最小化されていない Tera Term ウィンドウへ移動
-	PrevShownWin 		前の最小化されていない Tera Term ウィンドウへ移動
-	LocalEcho		Local echo を on/off する
+	where:
+	  <Shortcut key name>	Function
+	  --------------------------------------------
+	  EditCopy		[Edit] Copy command
+	  EditPaste		[Edit] Paste command
+	  EditPasteCR		[Edit] Paste<CR> command
+	  EditCLS		[Edit] Clear screen command
+	  EditCLB		[Edit] Clear buffer command
+	  ControlOpenTEK	[Control] Open TEK command
+	  ControlCloseTEK	[Control] Close TEK command
+	  LineUp		Scrolls up screen by 1 line
+	  LineDown		Scrolls down by 1 line
+	  PageUp		Scrolls up by 1 page
+	  PageDown		Scrolls down by 1 page
+	  BuffTop		Scrolls screen to buffer top
+	  BuffBottom		Scrolls screen to buffer bottom
+	  NextWin		Moves to the next Tera Term window
+	  PrevWin		Moves to the previous Tera Term window
+	  NextShownWin		Moves to the next Tera Term window (except minimized)
+	  PrevShownWin		Moves to the previous Tera Term window (except minimized)
+	  LocalEcho		Toggles the local echo status
 
-	<PC key code>
-		PC key code (10進数)
+	  <PC key code>
+		PC key code (decimal number)
 
-	例:
+	Example:
 		LineUp=1352
 
-### [User keys] セクション
+### [User keys] section
 
-ユーザーキーと、そのキーを押したときに実行される機能
-(文字列の送出、マクロファイルの実行、メニューコマンドの実行)を
-定義します。
+This section defines user keys for functions, sending a character
+string, executing a macro file or executing a menu command.
 
-	形式:
-		<User key name>=<PC key code>,<Control flag>,<文字列>
-		<User key name>=off
+	Format:
+		<User key name>=<PC key code>,<Control flag>,
+				<Character string>
 
-	<User key name>
+	where:
+
+	  <User key name>
 		User1, User2, User3,...., User99
-		最大99個まで設定可能
+		Maximum number of user keys is 99. 
+		For example, if you want to define ten user keys,
+		you must use the first ten names, from "User1" to "User10".
 
-	<PC key code>
-		PC key code (10進数)
+	  <PC key code>
+		PC key code (decimal number)
 
-	<Control flag>
-		キーを押したときに <文字列> をどのように取り扱うかを指定
-		するフラグ。
-			0	<文字列>をそのまま(8bit/文字として)送出する。
-			1	<文字列>に含まれる文字や改行コードを
-				Tera Term の設定にあわせて変換し、変換
-				された文字列を送出する。
-			2	<文字列>のファイル名のマクロファイルを
-				実行する。
-			3	メニュー ID <文字列> で指定される
-				Tera Term のメニューコマンドを実行する。
+	  <Control flag>
+		Control flag which specifies how <character string>
+		is treated when the PC key is pressed.
+			0	<Character string> is sent as it is.
+			1	New-line codes in <Character string>
+				are converted by Tera Term and
+				the converted string is sent.
+			2	A macro file which has the name of
+				<Character string> is executed.
+			3	A Tera Term menu command specified
+				by the menu ID <Character string> is
+				executed.
 
-	<文字列>:
-		<Control flag> が 0 または 1 の場合、キーを押したときに
-		送出される文字列。表示不可能な文字(制御文字等)はその
-		文字コードを $ と2文字の16進数で表現する。
-		(例: CR 文字は '$0D')。"$" そのものは "$24" で表現する。
-		Tera Term 内部では設定ファイルはUTF-16(16bit/文字)で処理している。
-		<Control flag> が 0 の場合、8bit/文字として処理する。
-		U+0000..U+00FFは$00..$FFとしてそのまま送信する。
-		それ以外は$FFとして送信する。
-			U+0000..U+007F=基本ラテン文字
-			U+0080..U+00FF=ラテン1補助
-		<Control flag> が 1 の場合、
-		Unicode文字列として処理する。
+	  <Character string>
+		If <Control flag> is 0 or 1, <Character string>
+		represents the character string to be sent.
+		A non-printable character (control character) in
+		the string can be expressed as a "$" and ASCII code
+		in two-character hex number. For example, CR character
+		is expressed as "$0D". "$" itself is expressed as "$24".
+		See "Appendix A  ASCII CODE TABLE".
 
-		<Control flag> が 2 の場合、
-		実行されるマクロファイルのファイル名。
+		If <Control flag> is 2, <Character string> specifies
+		the macro file name to be executed.
 
-		<Control flag> が 3 の場合、
-		実行されるメニューコマンドのメニュー ID (数字)。
-		メニュー IDについては「メニュー ID 表」参照。
+		If <Control flag> is 3, <Character string> is the menu
+		ID which specifies the menu command to be executed.
+		The menu ID should be expressed as a decimal number.
+		See "Appendix B  LIST OF MENU IDs".
 
-	例:
+	Example:
 		User1=1083,0,telnet myhost
 		User2=1084,0,$0D$0A
-		User3=1085,1,こんにちは。
+		User3=1085,1,$0D
 		User4=1086,2,test.ttl
 		User5=1087,3,50110
 
-## 注意
+## NOTE
 
-1つの PC key code はキーボード設定ファイルの中で一回だけ使用することが
-できます。もし、1つの PC key code を複数のキー定義で使用した場合、
-Tera Term がキーボード設定ファイルを読み込んだときに、
-"Key code XXX is used more than once" という警告メッセージが表示されます。
-この場合ある一つのキー定義だけが有効になり、その他は無視されます。
+You can use a PC key code only once in the setup file.
+If you use a PC key code for multiple key assignments,
+the warning message "Key code XXX is used more than once" is
+displayed when the file is loaded by Tera Term. In this case,
+one of the assignments becomes effective and others are ignored.
 
-あるキー設定項目にどの PC キーも割り当てたくない場合は、以下のように
-PC key code の代わりに "off" を指定してください。
+If you don't want to assign a key item to any PC key,
+use the word "off" like the following:
 
-    EditCopy=off
+EditCopy=off
 
-## 可能なキーの組み合わせ
+## KEY COMBINATIONS
 
-キーボード設定ファイルで設定可能な PC のキーは, KEYCODE.EXE で PC key code が
-表示されるキーです。単一のキーだけでなく、Ctrl, Shift, Alt を用いたキーの組み
-合わせでも PC key code を表示させることができます。可能な組み合わせを
-以下に示します。
+The following key combinations are acceptable to Tera Term and KEYCODE.EXE:
 
 	Shift+key
 	Ctrl+key
@@ -213,66 +219,68 @@
 	Ctrl+Alt+key
 	Shift+Ctrl+Alt+key
 
-Tera Term や Windows のショートカットキーに割り当てられているキーの組み合わせ
-(例えば Alt+key など)はキーボード設定ファイルで指定できません。
+Since some combinations (such as Alt+key) are used as shortcut keys of
+Tera Term and Windows, they don't have PC key codes and can't be specified
+in the keyboard setup file.
 
-ただし、Altキーをメタ・キーとして使う設定にしている場合(設定->キーボードにある
-Metaキーにチェックをいれている状態)はAlt+keyも指定する事ができます。
-キーコードは KEYCODE.EXE で調べられますが、単体のAltキーとの組合せには
-対応していません。Altキーとの組合せでのキーコードを調べるには、単独での
-キーコードを調べて、その値に2048を足してください。
+[NOTE]
+You can specify `Alt+key' combination when Alt key uses meta key. Check
+`Meta key' under Keyboard of Setup menu. The key code can be obtained by
+KEYCODE.EXE, unfortunately the key code of `Alt+key' combination can not
+be obtained. Also, you obtain the key code and add 2048 on the value.
 
-たとえば、Alt+Vのキーコードは V が 47 なので、2095 となります。
+For example, the `V' key code is 47, also `Alt+V' key code is 2095.
 
-    ; Shift + Insert
-    EditPaste=850
+; Shift + Insert
+EditPaste=850
 
-これを例えば EditPaste=2095 に変更すれば、Metaキーをパススルーにしていても
-Alt+Vで張り付けができるようになります。
+If you change above entry to `EditPaste=2095', you can paste by using
+`Alt+V' on condition that Meta key is pass through.
 
-Shift+Insertを残したままAlt+Vでの張り付けを行いたい場合は、KEYBOARD.CNF の
-[User keys]セクションに以下の設定を追加します。
+You add in the following entry to [User keys] section in KEYBOARD.CNF if
+you wan to paster by using `Alt+V' remaining `Shift+Insert' function.
 
-    User1=2095,3,50230
+User1=2095,3,50230
 
 ## Q & A
 
-- Q. Tera Term を起動するたびに "Key code XXX is used more than once" という
-   メッセージがでる。
-- A. 「注意」を参照。
+- Q. Every time I run Tera Term, the warning message
+   "Key code XXX is used more than once" is displayed.
+- A. See "3.2 NOTE".
 
-- Q. PC の F1 キーを VT100 の PF1 キーとして使いたい。以下のように設定したが
-   うまくいかない。
+- Q. I want to use the PC "F1" key as the VT100 PF1 key. I edit the 
+   keyboard setup file like the following but it does not work:
 
 	[VT function keys]
-	F1=PF1		(これはまちがい)
+	F1=PF1		(This is wrong.)
 
-- A. 左辺は **PC** のキーの名前ではなく **VT端末** のキーの名前を指定しなけ
-   ればなりません。また、右辺にはキーの名前ではなく、キーコードを指定して
-   ください。
-   また、キー設定を変えるときは、キーコードの重複使用をしないようにして
-   ください。
+- A. The left hand side can not be the name of a **PC key** but
+   the name of a **VT terminal key**. The right hand side can not be
+   the name of a key but a PC key code.
+   See "3.1 FORMAT OF THE KEYBOARD SETUP FILE".
+   You should also be careful not to specify a PC key code more than
+   once in the setup file (see "3.2 NOTE").
 
-   以下のように設定してください。
+   Edit the keyboard setup file like the following:
 
 	[VT function keys]
-	PF1=59			(59 は F1 キーのキーコード)
+	PF1=59			(59 is the keycode for the F1 key.)
 	[X function keys]
-	;XF1=59			(キーコード 59 の重複使用をさける)
-	XF1=off			("off" で置き換える)
+	;XF1=59			(Avoid specifying 59 twice.)
+	XF1=off			(Replace 59 by "off".)
 
-- Q. F1 キーを押したときにエスケープシーケンス ESC [ A を送出するように
-   するための設定方法は?
-- A. ユーザーキーを使えば、好きな文字列を送出することができます。
-   くわしくは、「3.1 キーボード設定ファイルの形式」を読んでください。
-   また、キー設定を変えるときは、キーコードの重複使用をしないようにして
-   ください(「3.2 注意」を参照)。
+- Q. How to edit the keyboard setup file to assign the F1 key
+   for sending the escape sequence "ESC [ A"?
+- A. You can send any character string by using a user key.
+   See "3.1 FORMAT OF THE KEYBOARD SETUP FILE".
+   You should also be careful not to specify a PC keycode more than
+   once in the setup file (see "3.2 NOTE").
 
-   以下のように設定してください。
+   Edit the keyboard setup file like the following:
 
 	[X function keys]
-	;XF1=59			(F1 キーのキーコード 59 の重複使用をさける)
-	XF1=off			("off" で置き換える)
+	;XF1=59			(59 is the keycode for the F1 key.)
+					(Avoid specifying 59 twice.)
+	XF1=off			(Replace 59 by "off".)
 	[User keys]
-	User1=59,0,$1B[A		(ESC の ASCII コードは $1B)
-
+	User1=59,0,$1B[A		(The ASCII code for ESC is $1B.)

Modified: trunk/doc/en/html/reference/menu_id.md
===================================================================
--- trunk/doc/en/html/reference/menu_id.md	2022-01-22 16:09:28 UTC (rev 9703)
+++ trunk/doc/en/html/reference/menu_id.md	2022-01-22 17:05:00 UTC (rev 9704)
@@ -1,8 +1,8 @@
-# メニュー ID 表
+# LIST OF MENU IDs
 
 ## VT window
 
-    メニューコマンド                    ID
+    Menu command                        ID
     -----------------------------------------
     [File] New connection               50110
     [File] Duplicate session            50111
@@ -73,8 +73,7 @@
     [Help] Index                        50910
     [Help] About Tera Term              50990
 
-
-    TTSSH メニューコマンド              ID
+    TTSSH Menu command                  ID
     -----------------------------------------
     [Setup] SSH                         52310
     [Setup] SSH Authentication          52320
@@ -82,12 +81,12 @@
     [Setup] SSH KeyGenerator            52340
     [Help] About TTSSH                  52910
 
-    TTProxy メニューコマンド            ID
+    TTProxy Menu command                ID
     -----------------------------------------
     [Setup] Proxy                       53310
     [Help] About TTProxy                53910
 
-    TTXKanjiMenu メニューコマンド       ID
+    TTXKanjiMenu Menu command           ID
     -----------------------------------------
     [KanjiCode] Recv: Shift_JIS         54010
     [KanjiCode] Recv: EUC-JP            54011
@@ -100,45 +99,45 @@
     [KanjiCode] Send: UTF-8             54113
     [KanjiCode] Use one setting         54200
 
-    TTXAlwaysOnTop メニューコマンド     ID
+    TTXAlwaysOnTop Menu command         ID
     -----------------------------------------
     [Control] Always on top             55000
-    -- SetWindowPos(HWND_TOP)           55001 (メニュー割り当て無し)
-    -- SetWindowPos(HWND_BOTTOM)        55002 (メニュー割り当て無し)
-    -- SetWindowPos(HWND_TOPMOST)       55003 (メニュー割り当て無し)
-    -- SetWindowPos(HWND_NOTOPMOST)     55004 (メニュー割り当て無し)
-    
-    TTXResizeMenu メニューコマンド      ID
+    -- SetWindowPos(HWND_TOP)           55001 (not in menu)
+    -- SetWindowPos(HWND_BOTTOM)        55002 (not in menu)
+    -- SetWindowPos(HWND_TOPMOST)       55003 (not in menu)
+    -- SetWindowPos(HWND_NOTOPMOST)     55004 (not in menu)
+
+    TTXResizeMenu Menu command          ID
     -----------------------------------------
     [Resize] Menu(1) - Menu(20)         55101 - 55120
-    -- Increase window width            55151 (メニュー割り当てなし)
-    -- Decrease window width            55152 (メニュー割り当てなし)
-    -- Increase window height           55153 (メニュー割り当てなし)
-    -- Decrease window height           55154 (メニュー割り当てなし)
+    -- Increase window width            55151 (not in menu)
+    -- Decrease window width            55152 (not in menu)
+    -- Increase window height           55153 (not in menu)
+    -- Decrease window height           55154 (not in menu)
 
-    TTXViewMode メニューコマンド        ID
+    TTXViewMode Menu command            ID
     -----------------------------------------
     [Setup] ViewMode password           55200
     [Control] View mode                 55210
 
-    TTXttyrec メニューコマンド          ID
+    TTXttyrec Menu command              ID
     -----------------------------------------
     [File] TTY Record                   55301
 
-    TTXttyplay メニューコマンド         ID
+    TTXttyplay Menu command             ID
     -----------------------------------------
     [File] TTY Replay                   55302
 
-    TTXRecurringCommand メニューコマンド ID
+    TTXRecurringCommand Menu command    ID
     -----------------------------------------
     [Setup] Recurring Command           55500
     [Control] Recurring Command         55501
-    -- Enable Recurring Command         55502 (メニュー割り当て無し)
-    -- Disable Recurring Command        55503 (メニュー割り当て無し)
+    -- Enable Recurring Command         55502 (not in menu)
+    -- Disable Recurring Command        55503 (not in menu)
 
 ## TEK window
 
-    メニューコマンド                    ID
+    Menu command                        ID
     -----------------------------------------
     [File] Print                        51110
     [File] Exit                         51190

From scmnotify ＠ osdn.net  Sat Jan 29 01:34:34 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 29 Jan 2022 01:34:34 +0900
Subject: [ttssh2-commit] [9705] modify cygterm
Message-ID: <1643387674.468526.8764.nullmailer@users.osdn.me>

Revision: 9705
          https://osdn.net/projects/ttssh2/scm/svn/commits/9705
Author:   zmatsuo
Date:     2022-01-29 01:34:34 +0900 (Sat, 29 Jan 2022)
Log Message:
-----------
modify cygterm

Added Paths:
-----------
    branches/cygterm/


From scmnotify ＠ osdn.net  Sat Jan 29 01:36:06 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 29 Jan 2022 01:36:06 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MDZdIGN5Z3Rlcm0g44KS5pW055CG?=
Message-ID: <1643387766.207794.10497.nullmailer@users.osdn.me>

Revision: 9706
          https://osdn.net/projects/ttssh2/scm/svn/commits/9706
Author:   zmatsuo
Date:     2022-01-29 01:36:06 +0900 (Sat, 29 Jan 2022)
Log Message:
-----------
cygterm を整理

- teraterm/common/ の関数を利用するようにした
- 設定に関する部分を cygterm_cfg.cc,h に分離した
  - cygterm.cfgの読み書きを集める
- teraterm/common/ を調整
  - cygwinでビルドできるよう修正
  - ttlib_static_dirs.cpp を追加
    - ttlib_static_cpp.cpp から一部を移動
  - ttlib.h
    - Microsoft SAL が MSC 以外に入っていたので削除

Modified Paths:
--------------
    branches/cygterm/.editorconfig
    branches/cygterm/cygwin/cygterm/CMakeLists.txt
    branches/cygterm/cygwin/cygterm/Makefile
    branches/cygterm/cygwin/cygterm/cygterm.cc
    branches/cygterm/teraterm/common/CMakeLists.txt
    branches/cygterm/teraterm/common/asprintf.cpp
    branches/cygterm/teraterm/common/codeconv.cpp
    branches/cygterm/teraterm/common/common_static.v16.vcxproj
    branches/cygterm/teraterm/common/compat_win.cpp
    branches/cygterm/teraterm/common/dllutil.cpp
    branches/cygterm/teraterm/common/ttknownfolders.c
    branches/cygterm/teraterm/common/ttlib.h
    branches/cygterm/teraterm/common/ttlib_static_cpp.cpp
    branches/cygterm/teraterm/common/win32helper.cpp

Added Paths:
-----------
    branches/cygterm/cygwin/cygterm/cygterm_cfg.cc
    branches/cygterm/cygwin/cygterm/cygterm_cfg.h
    branches/cygterm/teraterm/common/ttlib_static_dirs.cpp

-------------- next part --------------
Modified: branches/cygterm/.editorconfig
===================================================================
--- branches/cygterm/.editorconfig	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/.editorconfig	2022-01-28 16:36:06 UTC (rev 9706)
@@ -4,7 +4,7 @@
 indent_style = tab
 indent_size = 4
 
-[*.{cpp,c,h}]
+[*.{cpp,c,h,cc}]
 indent_style = tab
 indent_size = 4
 end_of_line = crlf

Modified: branches/cygterm/cygwin/cygterm/CMakeLists.txt
===================================================================
--- branches/cygterm/cygwin/cygterm/CMakeLists.txt	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/cygwin/cygterm/CMakeLists.txt	2022-01-28 16:36:06 UTC (rev 9706)
@@ -21,8 +21,28 @@
   ${PACKAGE_NAME}
   cygterm.cc
   cygterm.rc
+  cygterm_cfg.cc
+  cygterm_cfg.h
   )
 
+target_sources(
+  ${PACKAGE_NAME}
+  PRIVATE
+  ../../teraterm/common/ttlib.h
+#  ../../teraterm/common/ttlib_static_cpp.cpp
+  ../../teraterm/common/ttlib_static_dirs.cpp
+  ../../teraterm/common/asprintf.cpp
+  ../../teraterm/common/asprintf.h
+  ../../teraterm/common/win32helper.cpp
+  ../../teraterm/common/win32helper.h
+  ../../teraterm/common/compat_win.cpp
+  ../../teraterm/common/ttknownfolders.c
+  ../../teraterm/common/dllutil.cpp
+  ../../teraterm/common/dllutil.h
+  ../../teraterm/common/codeconv.cpp
+  ../../teraterm/common/codeconv.h
+  )
+
 if (MSYS2TERM)
   target_compile_definitions(
     ${PACKAGE_NAME}
@@ -42,8 +62,15 @@
   PRIVATE
   -D_GNU_SOURCE
   -fno-exceptions
+  -Wall -Wextra
   )
 
+target_include_directories(
+  ${PACKAGE_NAME}
+  PRIVATE
+  ../../teraterm/common
+  )
+
 target_link_options(
   ${PACKAGE_NAME}
   PRIVATE
@@ -50,6 +77,13 @@
   -mwindows
   )
 
+target_link_libraries(
+  ${PACKAGE_NAME}
+  PRIVATE
+  shell32
+  ole32
+  )
+
 install(
   TARGETS ${PACKAGE_NAME}
   DESTINATION .

Modified: branches/cygterm/cygwin/cygterm/Makefile
===================================================================
--- branches/cygterm/cygwin/cygterm/Makefile	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/cygwin/cygterm/Makefile	2022-01-28 16:36:06 UTC (rev 9706)
@@ -3,12 +3,21 @@
 BINDIR = $(HOME)/bin
 
 CC = gcc
-CFLAGS = -D_GNU_SOURCE -O2 -fno-exceptions
+CFLAGS = -D_GNU_SOURCE -O2 -fno-exceptions -I ../../teraterm/common
 #CFLAGS = -g -fno-exceptions
 LDFLAGS = -mwindows
 
 EXE = cygterm.exe
-SRC = $(EXE:.exe=.cc)
+SRC = \
+	$(EXE:.exe=.cc) \
+	cygterm_cfg.cc \
+	../../teraterm/common/ttlib_static_dirs.cpp \
+	../../teraterm/common/asprintf.cpp \
+	../../teraterm/common/win32helper.cpp \
+	../../teraterm/common/compat_win.cpp \
+	../../teraterm/common/ttknownfolders.c \
+	../../teraterm/common/dllutil.cpp \
+	../../teraterm/common/codeconv.cpp
 CFG = $(EXE:.exe=.cfg)
 RES = $(EXE:.exe=.res)
 ICO = $(EXE:.exe=.ico)
@@ -20,14 +29,16 @@
 all : $(EXE) $(ARCHIVE)
 
 $(EXE) : $(SRC) $(ICO) $(RC)
-	windres -O coff -o $(RES) $(RC)
   ifeq (0, $(shell nm /usr/lib/crt0.o | grep -c WinMainCRTStartup))
 	$(CC) $(CFLAGS) $(LDFLAGS) -DNO_WIN_MAIN -o $(EXE) $(SRC) $(RES)
   else
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXE) $(SRC) $(RES)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXE) $(SRC) $(RES) -lole32
   endif
 	strip $(EXE)
 
+$(RES): $(RC)
+	windres -O coff -o $(RES) $(RC)
+
 $(RC):
 	echo 'icon ICON $(ICO)' > $(RC)
 

Modified: branches/cygterm/cygwin/cygterm/cygterm.cc
===================================================================
--- branches/cygterm/cygwin/cygterm/cygterm.cc	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/cygwin/cygterm/cygterm.cc	2022-01-28 16:36:06 UTC (rev 9706)
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // CygTerm+ - yet another Cygwin console
 // Copyright (C) 2000-2006 NSym.
-// (C) 2006-2016 TeraTerm Project
+// (C) 2006- TeraTerm Project
 //---------------------------------------------------------------------------
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License (GPL) as published by
@@ -22,18 +22,20 @@
 // CygTerm+ - yet another Cygwin console
 //
 //   Using Cygwin with a terminal emulator.
-//   
+//
 //   Writtern by TeraTerm Project.
 //            https://ttssh2.osdn.jp/
-//   
+//
 //   Original written by NSym.
-//                         *** Web Pages ***
-//  (English) http://www.dd.iij4u.or.jp/~nsym/cygwin/cygterm/index-e.html
-// (Japanese) http://www.dd.iij4u.or.jp/~nsym/cygwin/cygterm/index.html
 //
 
+#if !defined(__CYGWIN__)
+#error check compiler
+#endif
+
+// MessageBox\x82̃^\x83C\x83g\x83\x8B\x82Ŏg\x97p TODO exe\x83t\x83@\x83C\x83\x8B\x96\xBC\x82ɕύX
 static char Program[] = "CygTerm+";
-static char Version[] = "version 1.07_30_beta (2021/11/14)";
+//static char Version[] = "version 1.07_30_beta (2021/11/14)";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,6 +59,11 @@
 #include <sys/select.h>
 #include <wchar.h>
 
+#include "ttlib.h"
+#include "codeconv.h"
+
+#include "cygterm_cfg.h"
+
 // pageant support (ssh-agent proxy)
 //----------------------------------
 #define AGENT_COPYDATA_ID 0x804e50ba
@@ -70,92 +77,55 @@
 
 // TCP port for TELNET
 //--------------------
-int port_start = 20000;  // default lowest port number
-int port_range = 40;     // default number of ports
+#define PORT_START_DEFAULT 20000  // default lowest port number
+#define PORT_RANGE_DEFAULT 40     // default number of ports
 
-// command lines of a terminal-emulator and a shell
-//-------------------------------------------------
-char cmd_term[256] = "";
-char cmd_termopt[256] = "";
-char cmd_shell[128] = "";
-char pw_shell[128] = "";
-char change_dir[256] = "";
-
 // TCP port for connection to another terminal application
 //--------------------------------------------------------
 int cl_port = 0;
+u_short listen_port;
 
 // telnet socket timeout
 //----------------------
-int telsock_timeout = 5;    // timeout 5 sec
+#define TELSOCK_TIMEOUT_DEFAULT 5   // timeout 5 sec
 
-// dumb terminal flag
-//-------------------
-bool dumb = false;
-
 // chdir to HOME
 //--------------
-bool home_chdir = false;
+#define HOME_CHDIR_DEFAULT false
 
 // login shell flag
 //-----------------
-bool enable_loginshell = false;
+#define ENABLE_LOGINSHELL_DEFAULT false
 
 // ssh agent proxy
 //----------------
-bool enable_agent_proxy = false;
+#define ENABLE_AGENT_PROXY_DEFAULT false
 
-// terminal type & size
-//---------------------
-char term_type[41] = "";
-struct winsize win_size = {0,0,0,0};
-
 // debug mode
 //-----------
-bool debug_flag = false;
+#define DEBUG_FLAG_DEFAULT false;
+bool debug_flag = DEBUG_FLAG_DEFAULT;
 
-// additional env vars given to a shell
-//-------------------------------------
-struct sh_env_t {
-    struct sh_env_t* next;
-    char env[1];
-} sh_env = {NULL, ""};
+// "cygterm.cfg"
+static char *cfg_base;          // "cygterm.cfg"
+static char *cfg_exe;           // [exe directory]/cygterm.cfg
+static char *conf_appdata_full; // $APPDATA/teraterm5/cygterm.cfg
+static char *sys_conf;          // /etc/cygterm.conf
+static char *usr_conf;          // ~/cygtermrc  $HOME/cygtermrc
 
-sh_env_t* sh_envp = &sh_env;
-
-int add_env(sh_env_t** envp, const char* str, const char* str2)
+extern "C" BOOL IsWindowsXPOrLater(void)
 {
-	int len;
-	sh_env_t* e;
-
-	len = strlen(str);
-	if (str2) {
-		len += strlen(str2) + 1;
-	}
-
-	e = (sh_env_t*)malloc(sizeof(sh_env_t) + len);
-	if (e) {
-		if (str2) {
-			snprintf(e->env, len + 1, "%s=%s", str, str2);
-		}
-		else {
-			strcpy(e->env, str);
-		}
-		e->next = NULL;
-		*envp = ((*envp)->next = e);
-		return 1;
-	}
-	else {
-		return 0;
-	}
+	return TRUE;
 }
 
 //================//
 // message output //
 //----------------//
+// msg \x82\xCD ANSI\x95\xB6\x8E\x9A\x83R\x81[\x83h (UTF8\x82͉\xBB\x82\xAF\x82\xE9)
 void msg_print(const char* msg)
 {
-    MessageBox(NULL, msg, Program, MB_OK | MB_ICONINFORMATION | MB_TOPMOST);
+    OutputDebugStringA(msg);
+    MessageBoxA(NULL, msg, Program, MB_OK | MB_ICONINFORMATION | MB_TOPMOST);
 }
 
 //=========================//
@@ -191,99 +161,23 @@
 //======================//
 // debug message output //
 //======================//
-void debug_msg_print(const char* msg)
+void debug_msg_print(const char* msg, ...)
 {
-    if (debug_flag) {
-        msg_print(msg);
-    }
-}
+	if (debug_flag) {
+		char *tmp1;
+		va_list arg;
+		va_start(arg, msg);
+		vasprintf(&tmp1, msg, arg);
+		va_end(arg);
 
-//==================================//
-// parse line in configuration file //
-//----------------------------------//
-void parse_cfg_line(char *buf)
-{
-    // "KEY = VALUE" format in each line.
-    // skip leading/trailing blanks. KEY is not case-sensitive.
-    char* p1;
-    for (p1 = buf; isspace(*p1); ++p1);
-    if (!isalpha(*p1)) {
-        return; // comment line with non-alphabet 1st char
-    }
-    char* name = p1;
-    for (++p1; isalnum(*p1) || *p1 == '_'; ++p1);
-    char* p2;
-    for (p2 = p1; isspace(*p2); ++p2);
-    if (*p2 != '=') {
-        return; // igonore line without '='
-    }
-    for (++p2; isspace(*p2); ++p2);
-    char* val = p2;
-    for (p2 += strlen(p2); isspace(*(p2-1)); --p2);
-    *p1 = *p2 = 0;
-
-    if (!strcasecmp(name, "TERM")) {
-        // terminal emulator command line (host:%s, port#:%d)
-        strncpy(cmd_term, val, sizeof(cmd_term)-1);
-        cmd_term[sizeof(cmd_term)-1] = 0;
-    }
-    else if (!strcasecmp(name, "SHELL")) {
-        // shell command line
-        if (strcasecmp(val, "AUTO") != 0) {
-            strncpy(cmd_shell, val, sizeof(cmd_shell)-1);
-        }
-	else {
-	    strncpy(cmd_shell, pw_shell, sizeof(cmd_shell)-1);
+		char *tmp2;
+		unsigned long pid = GetCurrentProcessId();
+		asprintf(&tmp2, "dbg %lu: %s\n", pid, tmp1);
+		OutputDebugStringA(tmp2);
+		// printf("%s", tmp2);
+		free(tmp2);
+		free(tmp1);
 	}
-	cmd_shell[sizeof(cmd_shell)-1] = 0;
-    }
-    else if (!strcasecmp(name, "PORT_START")) {
-        // minimum port# for TELNET
-        port_start = atoi(val);
-    }
-    else if (!strcasecmp(name, "PORT_RANGE")) {
-        // number of ports for TELNET
-        port_range = atoi(val);
-    }
-    else if (!strcasecmp(name, "TERM_TYPE")) {
-        // terminal type name (maybe overridden by TELNET negotiation.)
-        strncpy(term_type, val, sizeof(term_type)-1);
-        term_type[sizeof(term_type)-1] = 0;
-    }
-    else if (!strncasecmp(name, "ENV_", 4)) {
-        // additional env vars given to a shell
-	add_env(&sh_envp, val, NULL);
-    }
-    else if (!strcasecmp(name, "HOME_CHDIR")) {
-        // change directory to home
-        if (strchr("YyTt", *val) != NULL || atoi(val) > 0) {
-            home_chdir = true;
-        }
-    }
-    else if (!strcasecmp(name, "LOGIN_SHELL")) {
-        // execute a shell as a login shell
-        if (strchr("YyTt", *val) != NULL || atoi(val) > 0) {
-            enable_loginshell = true;
-        }
-    }
-    else if (!strcasecmp(name, "SOCKET_TIMEOUT")) {
-        // telnet socket timeout
-        telsock_timeout = atoi(val);
-    }
-    else if (!strcasecmp(name, "SSH_AGENT_PROXY")) {
-        // ssh-agent proxy
-        if (strchr("YyTt", *val) != NULL || atoi(val) > 0) {
-            enable_agent_proxy = true;
-        }
-    }
-    else if (!strcasecmp(name, "DEBUG")) {
-        // debug mode
-        if (strchr("YyTt", *val) != NULL || atoi(val) > 0) {
-            debug_flag = true;
-        }
-    }
-
-    return;
 }
 
 // '\\' -> '/'
@@ -310,164 +204,105 @@
     }
 }
 
-// wchar -> utf8
-char *convert_utf8_from_wchar(const wchar_t *strW)
-{
-    size_t mb_len = ::WideCharToMultiByte(CP_UTF8, 0, strW, -1, NULL, 0, NULL, NULL);
-    char *u8 = (char *)malloc(sizeof(wchar_t) * mb_len);
-    ::WideCharToMultiByte(CP_UTF8, 0, strW, -1, u8, mb_len, NULL, NULL);
-    return u8;
-}
-
 // $APPDATA
 char *get_appdata_dir()
 {
-#if 0
-	// link error :-(
-    wchar_t *home_pathW;
-    SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &home_pathW);
-    convert_bsW(home_pathW);
-    char *home_pathU8 = convert_utf8_from_wchar(home_pathW);
-    CoTaskMemFree(home_pathW);
-    return home_pathU8;
-#endif
-#if 1
-    char *appdata = strdup(getenv("APPDATA"));
-    convert_bs(appdata);
-    return appdata;
-#endif
+	wchar_t *homeW = GetHomeDirW(NULL);
+	convert_bsW(homeW);
+	char *homeU8 = ToU8W(homeW);
+	free(homeW);
+	return homeU8;
 }
 
-void get_cfg_filenames(char **cfg_exe_full, char **cfg_appdata_full, char **cfg)
+static void get_cfg_filenames(const char *argv0)
 {
-    wchar_t win_conf[MAX_PATH];
+	// cfg base filename "cygterm.cfg"
+	char *p = strrchr(argv0, '/') + 1;
+	cfg_base = (char *)malloc(strlen(p) + 5);
+	strcpy(cfg_base, p);
+	strcat(cfg_base, ".cfg");
 
-    // get cfg path from exe path
-    if (GetModuleFileNameW(NULL, win_conf, MAX_PATH) <= 0) {
-        *cfg_exe_full = NULL;
-        *cfg = NULL;
-        return;
-    }
+	// exe path
+	cfg_exe = (char *)malloc(strlen(argv0) + strlen(cfg_base));
+	strcpy(cfg_exe, argv0);
+	p = strrchr(cfg_exe, '/') + 1;
+	strcpy(p, cfg_base);
 
-    convert_bsW(win_conf);
+	// home	 $HOME/cygtermrc
+	const char *home = getenv("HOME");
+	usr_conf = (char *)malloc(strlen(home) + strlen(cfg_base) + 2);
+	strcpy(usr_conf, home);
+	strcat(usr_conf, "/.");
+	strcat(usr_conf, cfg_base);
+	p = strrchr(usr_conf, '.');		// ".cfg" -> "rc"
+	strcpy(p, "rc");
 
-    wchar_t* bcW = wcsrchr(win_conf, '/');
-    if (bcW != NULL) {
-        wchar_t* dot = wcsrchr(bcW, '.');
-        if (dot == NULL) {
-            wcscat(bcW, L".cfg");
-        } else {
-            wcscpy(dot, L".cfg");
-        }
-    }
-    char *u8 = convert_utf8_from_wchar(win_conf);
-    *cfg_exe_full = u8;
+	// system
+	sys_conf = (char *)malloc(sizeof("/etc/") + strlen(cfg_base) + 2);
+	strcpy(sys_conf, "/etc/");
+	strcat(sys_conf, cfg_base);
+	p = strrchr(sys_conf, '.');
+	strcpy(p, ".conf");		// ".cfg" -> ".conf"
 
-    char *bs = strrchr(u8, '/');
-    *cfg = strdup(bs+1);
+	// $APPDATA/teraterm5/cygterm.cfg
+	char *appdata = get_appdata_dir();
+	size_t len = strlen(appdata) + 1 + strlen(cfg_base) + 1;
+	conf_appdata_full = (char *)malloc(sizeof(char) * len);
+	strcpy(conf_appdata_full, appdata);
+	strcat(conf_appdata_full, "/");
+	strcat(conf_appdata_full, cfg_base);
+	free(appdata);
+}
 
-    char *appdata = get_appdata_dir();
-    const char *teraterm = "/teraterm5/";
-    size_t len = strlen(appdata) + strlen(teraterm) + strlen(*cfg) + 1;
-    *cfg_appdata_full = (char *)malloc(sizeof(wchar_t) * len);
-    strcpy(*cfg_appdata_full, appdata);
-    strcat(*cfg_appdata_full, teraterm);
-    strcat(*cfg_appdata_full, *cfg);
-    free(appdata);
+/**
+ *  read /etc/passwd
+ *  get user name from getlogin().  if it fails, use $USERNAME instead.
+ *  and get /etc/passwd information by getpwnam(3) with user name,
+ */
+static void get_username_and_shell(cfg_data_t *cfg)
+{
+	const char* username = getlogin();
+	if (username == NULL)
+		username = getenv("USERNAME");
+	if (username != NULL) {
+		struct passwd* pw_ent = getpwnam(username);
+		if (pw_ent != NULL) {
+			free(cfg->shell);
+			cfg->shell = strdup(pw_ent->pw_shell);
+			free(cfg->username);
+			cfg->username = strdup(pw_ent->pw_name);
+		}
+		else {
+			free(cfg->username);
+			cfg->username = strdup(username);
+		}
+	}
 }
 
 //====================//
 // load configuration //
 //--------------------//
-void load_cfg()
+static void load_cfg(cfg_data_t *cfg)
 {
-    // configuration file (.cfg) path
-    char *conf_exe_full;
-    char *conf_appdata_full;
-    char *conf_base;
-    get_cfg_filenames(&conf_exe_full, &conf_appdata_full, &conf_base);
+	char *conf_path[] = {
+		cfg_exe,	  // [exe directory]/cygterm.cfg
+		sys_conf,			// /etc/cygterm.conf
+		conf_appdata_full,	// $APPDATA/teraterm5/cygterm.cfg
+		usr_conf			// ~/cygtermrc
+	};
+	for (int i = 0; i < (int)(sizeof(conf_path)/sizeof(conf_path[0])); i++) {
+		const char *fname = conf_path[i];
+		debug_msg_print("load %s", fname);
+		// ignore empty configuration file path
+		if (fname == NULL || strcmp(fname, "") == 0) {
+			debug_msg_print("  pass");
+			continue;
+		}
 
-    char sys_conf[] = "/etc/cygterm.conf";
-
-    // user configuration file (~/.*rc) path
-    char usr_conf[MAX_PATH] = "";
-
-    // auto generated configuration file path
-    char tmp_conf[MAX_PATH] = "/tmp/cygtermrc.XXXXXX";
-
-    // get user name from getlogin().  if it fails, use $USERNAME instead.
-    // and get /etc/passwd information by getpwnam(3) with user name,
-    // and generate temporary configuration file by mktemp(3).
-    const char* username = getlogin();
-    if (username == NULL)
-        username = getenv("USERNAME");
-    if (username != NULL) {
-        struct passwd* pw_ent = getpwnam(username);
-        if (pw_ent != NULL) {
-            strncpy(pw_shell, pw_ent->pw_shell, sizeof(pw_shell)-1);
-            pw_shell[sizeof(pw_shell)-1] = 0;
-
-            strcpy(usr_conf, pw_ent->pw_dir);
-            strcat(usr_conf, "/.");
-            strcat(usr_conf, conf_base);
-            char* dot = strrchr(usr_conf, '.');
-            if (dot == NULL) {
-                strcat(usr_conf, "rc");
-            } else {
-                strcpy(dot, "rc");
-            }
-        }
-        int fd = mkstemp(tmp_conf);
-        FILE* fp = fdopen(fd, "w");
-        if (fp != NULL) {
-            if (pw_ent != NULL) {
-                fprintf(fp, "ENV_1=USER=%s\n",  pw_ent->pw_name);
-                fprintf(fp, "ENV_2=SHELL=%s\n", pw_ent->pw_shell);
-                fprintf(fp, "SHELL=%s\n", pw_ent->pw_shell);
-            } else {
-                fprintf(fp, "ENV_1=USER=%s\n",       username);
-            }
-            fclose(fp);
-        }
-    }
-
-    if (strcmp(usr_conf, "") == 0) {
-        strcpy(usr_conf, "");
-        strcpy(tmp_conf, "");
-    }
-
-    char const *conf_path[] = {
-        tmp_conf,
-        conf_exe_full,      // [exe directory]/cygterm.cfg
-        sys_conf,           // /etc/cygterm.conf
-        conf_appdata_full,  // $APPDATA/teraterm5/cygterm.cfg
-        usr_conf            // ~/cygtermrc
-    };
-    for (int i = 0; i < sizeof(conf_path)/sizeof(conf_path[0]); i++) {
-        // ignore empty configuration file path
-        if (strcmp(conf_path[i], "") == 0) {
-            continue;
-        }
-        // read each setting parameter
-        FILE* fp;
-        if ((fp = fopen(conf_path[i], "r")) == NULL) {
-            continue;
-        }
-        char buf[BUFSIZ];
-        while (fgets(buf, sizeof(buf), fp) != NULL) {
-            parse_cfg_line(buf);
-        }
-        fclose(fp);
-    }
-
-    // remove temporary configuration file, if it was generated.
-    if (strcmp(tmp_conf, "") != 0) {
-        unlink(tmp_conf);
-    }
-
-    free(conf_base);
-    free(conf_exe_full);
-    free(conf_appdata_full);
+		bool r = cfg->load(cfg, fname);
+		debug_msg_print("  %s", r ? "ok" : "ng");
+		cfg->dump(cfg, debug_msg_print);
+	}
 }
 
 void quote_cut(char *dst, size_t len, char *src) {
@@ -483,87 +318,80 @@
 //=======================//
 // commandline arguments //
 //-----------------------//
-void get_args(int argc, char** argv)
+void get_args(char** argv, cfg_data_t *cfg)
 {
-    char tmp[sizeof(cmd_termopt)];
-
     for (++argv; *argv != NULL; ++argv) {
         if (!strcmp(*argv, "-t")) {             // -t <terminal emulator>
             if (*++argv == NULL)
                 break;
-            strncpy(cmd_term, *argv, sizeof(cmd_term)-1);
-            cmd_term[sizeof(cmd_term)-1] = '\0';
+            free(cfg->term);
+            cfg->term = strdup(*argv);
         }
         else if (!strcmp(*argv, "-p")) {        // -p <port#>
             if (*(argv+1) != NULL) {
-                ++argv, cl_port = atoi(*argv);
+                ++argv;
+                cfg->cl_port = atoi(*argv);
             }
         }
         else if (!strcmp(*argv, "-dumb")) {     // -dumb
-            dumb = true;
-            strcpy(term_type, "dumb");
+            cfg->dumb = 1;
+            free(cfg->term_type);
+            cfg->term_type = strdup("dumb");
         }
         else if (!strcmp(*argv, "-s")) {        // -s <shell>
             if (*++argv == NULL)
                 break;
-	    if (strcasecmp(*argv, "AUTO") != 0) {
-		strncpy(cmd_shell, *argv, sizeof(cmd_shell)-1);
-	    }
-	    else {
-		strncpy(cmd_shell, pw_shell, sizeof(cmd_shell)-1);
-	    }
-            cmd_shell[sizeof(cmd_shell)-1] = '\0';
+            if (strcasecmp(*argv, "AUTO") != 0) {
+                free(cfg->shell);
+                cfg->shell = strdup(*argv);
+            }
         }
         else if (!strcmp(*argv, "-cd")) {       // -cd
-            home_chdir = true;
+            cfg->home_chdir = true;
         }
         else if (!strcmp(*argv, "-nocd")) {     // -nocd
-            home_chdir = false;
+            cfg->home_chdir = false;
         }
         else if (!strcmp(*argv, "+cd")) {       // +cd
-            home_chdir = false;
+            cfg->home_chdir = false;
         }
         else if (!strcmp(*argv, "-ls")) {       // -ls
-            enable_loginshell = true;
+            cfg->enable_loginshell = true;
         }
         else if (!strcmp(*argv, "-nols")) {     // -nols
-            enable_loginshell = false;
+            cfg->enable_loginshell = false;
         }
         else if (!strcmp(*argv, "+ls")) {       // +ls
-            enable_loginshell = false;
+            cfg->enable_loginshell = false;
         }
         else if (!strcmp(*argv, "-A")) {       // -A
-            enable_agent_proxy = true;
+            cfg->enable_agent_proxy = true;
         }
         else if (!strcmp(*argv, "-a")) {       // -a
-            enable_agent_proxy = false;
+            cfg->enable_agent_proxy = false;
         }
         else if (!strcmp(*argv, "-v")) {        // -v <additional env var>
             if (*(argv+1) != NULL) {
+                sh_env_t *sh_env = cfg->sh_env;
                 ++argv;
-		add_env(&sh_envp, *argv, NULL);
+                sh_env->add1(sh_env, *argv);
             }
         }
         else if (!strcmp(*argv, "-d")) {        // -d <exec directory>
             if (*++argv == NULL)
                 break;
+            char change_dir[256] = "";
             quote_cut(change_dir, sizeof(change_dir), *argv);
+            cfg->change_dir = strdup(change_dir);
         }
         else if (!strcmp(*argv, "-o")) {        // -o <additional option for terminal>
             if (*++argv == NULL)
                 break;
-            if (cmd_termopt[0] == '\0') {
-                strncpy(cmd_termopt, *argv, sizeof(cmd_termopt)-1);
-                cmd_termopt[sizeof(cmd_termopt)-1] = '\0';
-            }
-            else {
-                snprintf(tmp, sizeof(tmp), "%s %s", cmd_termopt, *argv);
-                strncpy(cmd_termopt, tmp, sizeof(cmd_termopt)-1);
-                cmd_termopt[sizeof(cmd_termopt)-1] = '\0';
-            }
+            free(cfg->termopt);
+            cfg->termopt = strdup(*argv);
         }
         else if (!strcmp(*argv, "-debug")) {    // -debug
-            debug_flag = true;
+            cfg->debug_flag = true;
         }
     }
 }
@@ -650,6 +478,7 @@
 }
 
 void sighandler(int sig) {
+	(void)sig;
 	unlink(sockname);
 	rmdir(sockdir);
 	exit(0);
@@ -707,9 +536,7 @@
 {
 	int sock, asock, ret;
 	long len;
-	unsigned long reqlen;
 	struct sockaddr_un addr;
-	unsigned char tmpbuff[AGENT_MAX_MSGLEN];
 	struct connList connections, *new_conn, *prev, *cur;
 	fd_set readfds, writefds, rfds, wfds;
 	struct sigaction act;
@@ -863,17 +690,16 @@
 	exit(0);
 }
 
-int exec_agent_proxy()
+static int exec_agent_proxy(sh_env_t *sh_env)
 {
 	int pid;
-	int malloc_size;
 
 	if (mkdtemp(sockdir) == NULL) {
 		return -1;
 	}
-	snprintf(sockname, sizeof(sockname), "%s/agent.%ld", sockdir, getpid());
+	snprintf(sockname, sizeof(sockname), "%s/agent.%ld", sockdir, (long)getpid());
 
-	if (!add_env(&sh_envp, "SSH_AUTH_SOCK", sockname)) {
+	if (sh_env->add(sh_env, "SSH_AUTH_SOCK", sockname)) {
 		return -1;
 	}
 
@@ -890,8 +716,19 @@
 //=============================//
 // terminal emulator execution //
 //-----------------------------//
-DWORD WINAPI term_thread(LPVOID)
+DWORD WINAPI term_thread(LPVOID param)
 {
+    cfg_data_t *cfg = (cfg_data_t *)param;
+
+    in_addr addr;
+    addr.s_addr = htonl(INADDR_LOOPBACK);
+    char term[256];
+    snprintf(term, sizeof(term), cfg->term, inet_ntoa(addr), (int)ntohs(listen_port));
+    if (cfg->termopt != NULL) {
+        strcat(term, " ");
+        strcat(term, cfg->termopt);
+    }
+
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
     FillMemory(&si, sizeof(si), 0);
@@ -899,10 +736,12 @@
     si.dwFlags = STARTF_USESHOWWINDOW;
     si.wShowWindow = SW_SHOW;
     DWORD flag = 0;
+
+    debug_msg_print("CreateProcess '%s'", term);
     if (!CreateProcess(
-         NULL, cmd_term, NULL, NULL, FALSE, flag, NULL, NULL, &si, &pi))
+            NULL, term, NULL, NULL, FALSE, flag, NULL, NULL, &si, &pi))
     {
-        api_error(cmd_term);
+        api_error(term);
         return 0;
     }
     WaitForSingleObject(pi.hProcess, INFINITE);
@@ -911,19 +750,19 @@
     return 0;
 }
 
-//============================-==========//
+//=======================================//
 // thread creation for terminal emulator //
 //---------------------------------------//
-HANDLE exec_term()
+HANDLE exec_term(cfg_data_t *cfg)
 {
     DWORD id;
-    return CreateThread(NULL, 0, term_thread, NULL, 0, &id);
+    return CreateThread(NULL, 0, term_thread, cfg, 0, &id);
 }
 
 //=======================================//
 // listener socket for TELNET connection //
 //---------------------------------------//
-int listen_telnet(u_short* port)
+int listen_telnet(u_short* port, cfg_data_t *cfg)
 {
     int lsock;
     if ((lsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
@@ -933,13 +772,13 @@
     addr.sin_family = AF_INET;
     addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
     int i;
-    for (i = 0; i < port_range; ++i) { // find an unused port#
-        addr.sin_port = htons(port_start + i);
+    for (i = 0; i < cfg->port_range; ++i) { // find an unused port#
+        addr.sin_port = htons(cfg->port_start + i);
         if (bind(lsock, (struct sockaddr *)&addr, sizeof(addr)) == 0) {
             break;
         }
     }
-    if (i == port_range) {
+    if (i == cfg->port_range) {
         shutdown(lsock, 2);
         close(lsock);
         return -1;
@@ -956,13 +795,13 @@
 //=============================//
 // accept of TELNET connection //
 //-----------------------------//
-int accept_telnet(int lsock)
+int accept_telnet(int lsock, cfg_data_t *cfg)
 {
     fd_set rbits;
     FD_ZERO(&rbits);
     FD_SET(lsock, &rbits);
     struct timeval tm;
-    tm.tv_sec = telsock_timeout;
+    tm.tv_sec = cfg->telsock_timeout;
     tm.tv_usec = 0;
     if (select(FD_SETSIZE, &rbits, 0, 0, &tm) <= 0) {
         c_error("accept_telnet: select failed");
@@ -1057,9 +896,8 @@
 //=================//
 // shell execution //
 //-----------------//
-int exec_shell(int* sh_pid)
+static int exec_shell(int* sh_pid, cfg_data_t *cfg)
 {
-    char env_term[64];
     // open pty master
     int master;
     if ((master = open(DEVPTY, O_RDWR)) < 0) {
@@ -1098,26 +936,31 @@
             }
         }
         // set env vars
-        if (*term_type != 0) {
+        if (cfg->term_type != 0) {
             // set terminal type to $TERM
-            sprintf(env_term, "TERM=%s", term_type);
-            putenv(env_term);
+            setenv("TERM", cfg->term_type, 1);
         }
         // set other additional env vars
-        sh_env_t* e;
-        for (e = sh_env.next; e != NULL; e = e->next) {
-            putenv(e->env);
+        int i = 0;
+        sh_env_t *sh_env = cfg->sh_env;
+        while(1) {
+            char *value;
+            const char *env = sh_env->get(sh_env, i++, &value);
+            if (env == NULL) {
+                break;
+            }
+            setenv(env, value, 1);
         }
-	// change directory
-        if (change_dir[0] != 0) {
-	    if (chdir(change_dir) < 0) {
-		char tmp[256];
-		snprintf(tmp, 256, "exec_shell: Can't chdir to \"%s\".", change_dir);
-		tmp[255] = 0;
-		c_error(tmp);
-	    }
+        // change directory
+        if (cfg->change_dir != NULL) {
+            if (chdir(cfg->change_dir) < 0) {
+                char tmp[256];
+                snprintf(tmp, 256, "exec_shell: Can't chdir to \"%s\".", cfg->change_dir);
+                tmp[255] = 0;
+                c_error(tmp);
+            }
         }
-        else if (home_chdir) {
+        else if (cfg->home_chdir) {
             // chdir to home directory
             const char *home_dir = getenv("HOME");
             // ignore chdir(2) system-call error.
@@ -1125,21 +968,23 @@
         }
         // execute a shell
         char *argv[32];
+        char *cmd_shell = cfg->shell;
         get_argv(argv, 32, cmd_shell);
-        if (enable_loginshell) {
-                char shell_path[128];
-                char *pos;
-                strcpy(shell_path, argv[0]);
-                if ((pos = strrchr(argv[0], '/')) != NULL) {
-                        *pos = '-';
-                        argv[0] = pos;
-                }
-                debug_msg_print(shell_path);
-                execv(shell_path, argv);
+        cfg->shell = strdup(cmd_shell);
+        if (cfg->enable_loginshell) {
+            char shell_path[128];
+            char *pos;
+            strcpy(shell_path, argv[0]);
+            if ((pos = strrchr(argv[0], '/')) != NULL) {
+                *pos = '-';
+                argv[0] = pos;
+            }
+            debug_msg_print("execv '%s' (login shell)", shell_path);
+            execv(shell_path, argv);
         }
         else {
-                debug_msg_print(argv[0]);
-                execv(argv[0], argv);
+            debug_msg_print("execv '%s'", argv[0]);
+            execv(argv[0], argv);
         }
         // no error, exec() doesn't return
         c_error(argv[0]);
@@ -1231,6 +1076,15 @@
 bool c_will_term = false;
 bool c_will_naws = false;
 
+// terminal type & size
+//---------------------
+char *term_type;
+struct winsize win_size = {0,0,0,0};
+
+// dumb terminal flag
+//-------------------
+bool dumb = false;
+
 u_char telnet_cmd(IOBuf* te)
 {
     u_char cmd, c;
@@ -1416,60 +1270,87 @@
 //---------------------------------------------------------//
 int main(int argc, char** argv)
 {
+    (void)argc;
     int listen_sock = -1;
-    u_short listen_port;
     int te_sock = -1;
     int sh_pty = -1;
     HANDLE hTerm = NULL;
     int sh_pid, agent_pid = 0;
 
+
+    // configuration file (.cfg) path
+    get_cfg_filenames(argv[0]);
+    debug_msg_print("cfg_base %s", cfg_base);
+    debug_msg_print("cfg_exe %s", cfg_exe);
+    debug_msg_print("conf_appdata_full %s", conf_appdata_full);
+    debug_msg_print("sys_conf %s", sys_conf);
+    debug_msg_print("usr_conf %s", usr_conf);
+
+
+    // set default values
+    cfg_data_t *cfg = create_cfg();
+    cfg->port_start = PORT_START_DEFAULT;
+    cfg->port_range = PORT_RANGE_DEFAULT;
+    cfg->telsock_timeout = TELSOCK_TIMEOUT_DEFAULT;
+    cfg->home_chdir = HOME_CHDIR_DEFAULT;
+    cfg->enable_loginshell = ENABLE_LOGINSHELL_DEFAULT;
+    cfg->enable_agent_proxy = ENABLE_AGENT_PROXY_DEFAULT;
+    cfg->debug_flag = DEBUG_FLAG_DEFAULT;
+
     // load configuration
-    load_cfg();
+    get_username_and_shell(cfg);	// from /etc/passwd
+    cfg->dump(cfg, debug_msg_print);
+    load_cfg(cfg);
+    sh_env_t *sh_env = cfg->sh_env;
+    sh_env->add(sh_env, "SHELL", cfg->shell);
+    sh_env->add(sh_env, "USER", cfg->username);
+    debug_msg_print("loginshell %d", cfg->enable_loginshell);
+    cfg->dump(cfg, debug_msg_print);
 
     // read commandline arguments
-    get_args(argc, argv);
+    get_args(argv, cfg);
+    cfg->dump(cfg, debug_msg_print);
 
-    if (cmd_shell[0] == 0) {
+    // restore values
+    debug_flag = cfg->debug_flag;
+
+    if (cfg->shell == NULL) {
         msg_print("missing shell");
         return 0;
     }
-    if (cmd_term[0] == 0 && cl_port <= 0) {
+    if (cfg->term == NULL && cl_port <= 0) {
         msg_print("missing terminal");
         return 0;
     }
 
-    if (change_dir[0] != 0) {
-	home_chdir = false;
-	if (enable_loginshell) {
-	    add_env(&sh_envp, "CHERE_INVOKING=y", NULL);
-	}
+    if (cfg->change_dir != NULL) {
+        cfg->home_chdir = false;
+        if (cfg->enable_loginshell) {
+            sh_env->add(sh_env, "CHERE_INVOKING", "y");
+        }
     }
 
     // terminal side connection
-    if (cl_port > 0) {
+    if (cfg->cl_port > 0) {
         // connect to the specified TCP port
+        cl_port = cfg->cl_port;
         if ((te_sock = connect_client()) < 0) {
             goto cleanup;
         }
     } else {
         // prepare a TELNET listener socket
-        if ((listen_sock = listen_telnet(&listen_port)) < 0) {
+        if ((listen_sock = listen_telnet(&listen_port, cfg)) < 0) {
             goto cleanup;
         }
-        in_addr addr;
-        addr.s_addr = htonl(INADDR_LOOPBACK);
-        char tmp[256];
         debug_msg_print("execute terminal");
-        snprintf(tmp, sizeof(tmp), cmd_term, inet_ntoa(addr), (int)ntohs(listen_port));
-        snprintf(cmd_term, sizeof(cmd_term), "%s %s", tmp, cmd_termopt);
 
         // execute a terminal emulator
-        if ((hTerm = exec_term()) == NULL) {
+        if ((hTerm = exec_term(cfg)) == NULL) {
             api_error("exec_term failed");
             goto cleanup;
         }
         // accept connection from the terminal emulator
-        if ((te_sock = accept_telnet(listen_sock)) < 0) {
+        if ((te_sock = accept_telnet(listen_sock, cfg)) < 0) {
             goto cleanup;
         }
         shutdown(listen_sock, 2);
@@ -1477,18 +1358,20 @@
         listen_sock = -1;
     }
     // TELNET negotiation
+    term_type = cfg->term_type;
+    dumb = cfg->dumb;
     if (!dumb) {
         telnet_nego(te_sock);
     }
 
     // execute ssh-agent proxy
-    if (enable_agent_proxy) {
-        agent_pid = exec_agent_proxy();
+    if (cfg->enable_agent_proxy) {
+        agent_pid = exec_agent_proxy(sh_env);
     }
 
     // execute a shell
     debug_msg_print("execute shell");
-    if ((sh_pty = exec_shell(&sh_pid)) < 0) {
+    if ((sh_pty = exec_shell(&sh_pid, cfg)) < 0) {
         debug_msg_print("exec_shell failed");
         goto cleanup;
     }

Added: branches/cygterm/cygwin/cygterm/cygterm_cfg.cc
===================================================================
--- branches/cygterm/cygwin/cygterm/cygterm_cfg.cc	                        (rev 0)
+++ branches/cygterm/cygwin/cygterm/cygterm_cfg.cc	2022-01-28 16:36:06 UTC (rev 9706)
@@ -0,0 +1,406 @@
+/*
+ * (C) 2022- TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "cygterm_cfg.h"
+
+// #define DUMP_ENABLE	1
+
+// additional env vars given to a shell
+//-------------------------------------
+
+typedef struct sh_env_data_t {
+	struct sh_env_data_t* next;
+	char *name;
+	char *value;
+} sh_env_data_t;
+
+typedef struct sh_env_private_tag {
+	sh_env_data_t *envp;
+} sh_env_private_t;
+
+static bool env_add(sh_env_t *envp, const char* name, const char* value)
+{
+	sh_env_private_t *pr_data = (sh_env_private_t *)envp->private_data;
+	sh_env_data_t* e;
+
+	if (name[0] == 0) {
+		return true;
+	}
+	e = (sh_env_data_t*)malloc(sizeof(*e));
+	if (e == NULL) {
+		return false;
+	}
+
+	e->name = strdup(name);
+	e->value = strdup(value);
+	e->next = NULL;
+
+	if (pr_data->envp == NULL) {
+		pr_data->envp = e;
+		return true;
+	}
+	sh_env_data_t* env_data = pr_data->envp;
+	sh_env_data_t* prev_env = NULL;
+	while(1) {
+		if (strcmp(env_data->name, name) == 0) {
+			// \x93\xAF\x82\xB6\x96\xBC\x91O -> \x93\xFC\x82\xEA\x91ւ\xA6
+			if (prev_env == NULL) {
+				pr_data->envp = e;
+			} else {
+				prev_env->next = e;
+				e->next = prev_env->next;
+			}
+			free(env_data->name);
+			free(env_data->value);
+			free(env_data);
+			break;
+		}
+		if (env_data->next == NULL) {
+			// \x8DŌ\xE3\x82܂ŗ\x88\x82\xBD
+			env_data->next = e;
+			break;
+		}
+		prev_env = env_data;
+		env_data = env_data->next;
+	}
+
+	return true;
+}
+
+static bool env_add1(sh_env_t *envp, const char* name_value)
+{
+	if (name_value[0] == 0) {
+		return true;
+	}
+	char *name = strdup(name_value);
+	char *p = strchr(name, '=');
+	char *value;
+	if (p == NULL) {
+		value = NULL;
+	}
+	else {
+		*p = 0;
+		value = strdup(p+1);
+	}
+	bool r = env_add(envp, name, value);
+	free(value);
+	free(name);
+	return r;
+}
+
+static char *env_get(sh_env_t *envp, int index, char **value)
+{
+	sh_env_private_t *pr_data = (sh_env_private_t *)envp->private_data;
+	sh_env_data_t* e = pr_data->envp;
+	if (e == NULL) {
+		return NULL;
+	}
+	while(1) {
+		if (index == 0) {
+			*value = e->value;
+			return e->name;;
+		}
+		if (e->next == NULL) {
+			*value = NULL;
+			return NULL;
+		}
+		index--;
+		e = e->next;
+	}
+}
+
+static void env_destry_all(sh_env_t *envp)
+{
+	sh_env_private_t *pr_data = (sh_env_private_t *)envp->private_data;
+	sh_env_data_t* e = pr_data->envp;
+	if (e == NULL) {
+		return;
+	}
+	pr_data->envp = NULL;
+	while(1) {
+		sh_env_data_t* e_next = e->next;
+		e->next = NULL;
+		free(e);
+		e = e_next;
+		if (e == NULL) {
+			break;
+		}
+	}
+}
+
+static void env_destry(sh_env_t *envp)
+{
+	sh_env_private_t *pr_data = (sh_env_private_t *)envp->private_data;
+	env_destry_all(envp);
+	free(pr_data);
+	envp->private_data = NULL;
+	free(envp);
+}
+
+sh_env_t *create_sh_env(void)
+{
+	sh_env_t *sh_env = (sh_env_t *)calloc(sizeof(*sh_env), 1);
+	if (sh_env == NULL) {
+		return NULL;
+	}
+	sh_env_private_t *pr_data = (sh_env_private_t *)calloc(sizeof(*pr_data), 1);
+	if (pr_data == NULL) {
+		free(sh_env);
+		return NULL;
+	}
+	sh_env->private_data = pr_data;
+	sh_env->destroy = env_destry;
+	sh_env->add = env_add;
+	sh_env->add1 = env_add1;
+	sh_env->get = env_get;
+
+	return sh_env;
+}
+
+static bool is_bool_string(const char *s)
+{
+	if (strchr("YyTt", *s) != NULL)
+		return true;
+	if (atoi(s) > 0)
+		return true;
+
+	return false;
+}
+
+//==================================//
+// parse line in configuration file //
+//----------------------------------//
+static void parse_cfg_line(char *buf, cfg_data_t *cfg)
+{
+	// "KEY = VALUE" format in each line.
+	// skip leading/trailing blanks. KEY is not case-sensitive.
+	char* p1;
+	for (p1 = buf; isspace(*p1); ++p1);
+	if (!isalpha(*p1)) {
+		return; // comment line with non-alphabet 1st char
+	}
+	char* name = p1;
+	for (++p1; isalnum(*p1) || *p1 == '_'; ++p1);
+	char* p2;
+	for (p2 = p1; isspace(*p2); ++p2);
+	if (*p2 != '=') {
+		return; // igonore line without '='
+	}
+	for (++p2; isspace(*p2); ++p2);
+	char* val = p2;
+	for (p2 += strlen(p2); isspace(*(p2-1)); --p2);
+	*p1 = *p2 = 0;
+
+	if (!strcasecmp(name, "TERM")) {
+		// terminal emulator command line (host:%s, port#:%d)
+		free(cfg->term);
+		cfg->term = strdup(val);
+	}
+	else if (!strcasecmp(name, "SHELL")) {
+		// shell command line
+		if (strcasecmp(val, "AUTO") != 0) {
+			free(cfg->shell);
+			cfg->shell = strdup(val);
+		}
+	}
+	else if (!strcasecmp(name, "PORT_START")) {
+		// minimum port# for TELNET
+		cfg->port_start = atoi(val);
+	}
+	else if (!strcasecmp(name, "PORT_RANGE")) {
+		// number of ports for TELNET
+		cfg->port_range = atoi(val);
+	}
+	else if (!strcasecmp(name, "TERM_TYPE")) {
+		// terminal type name (maybe overridden by TELNET negotiation.)
+		free(cfg->term_type);
+		cfg->term_type = strdup(val);
+	}
+	else if (!strncasecmp(name, "ENV_", 4)) {
+		// additional env vars given to a shell
+		sh_env_t *sh_env = cfg->sh_env;
+		sh_env->add1(sh_env, val);
+	}
+	else if (!strcasecmp(name, "HOME_CHDIR")) {
+		// change directory to home
+		if (is_bool_string(val)) {
+			cfg->home_chdir = true;
+		}
+	}
+	else if (!strcasecmp(name, "LOGIN_SHELL")) {
+		// execute a shell as a login shell
+		if (is_bool_string(val)) {
+			cfg->enable_loginshell = true;
+		}
+	}
+	else if (!strcasecmp(name, "SOCKET_TIMEOUT")) {
+		// telnet socket timeout
+		cfg->telsock_timeout = atoi(val);
+	}
+	else if (!strcasecmp(name, "SSH_AGENT_PROXY")) {
+		// ssh-agent proxy
+		if (is_bool_string(val)) {
+			cfg->enable_agent_proxy = true;
+		}
+	}
+	else if (!strcasecmp(name, "DEBUG")) {
+		// debug mode
+		if (is_bool_string(val)) {
+			cfg->debug_flag = true;
+		}
+	}
+}
+
+typedef struct {
+	sh_env_data_t *env;
+} cfg_private_data_t;
+
+static void destroy(cfg_data_t *cfg_data)
+{
+//	env_destry_all(cfg_data);
+	sh_env_t *sh_env = cfg_data->sh_env;
+	sh_env->destroy(sh_env);
+	cfg_private_data_t *pr_data = (cfg_private_data_t *)cfg_data->private_data;
+	free(pr_data);
+	free(cfg_data);
+}
+
+// read each setting parameter
+// configuration file (.cfg) path
+static bool load_cfg(cfg_data_t *cfg_data, const char *conf)
+{
+	FILE* fp = fopen(conf, "r");
+	if (fp == NULL) {
+		return false;
+	}
+
+	char buf[BUFSIZ];
+	while (fgets(buf, sizeof(buf), fp) != NULL) {
+		parse_cfg_line(buf, cfg_data);
+	}
+	fclose(fp);
+
+	return true;
+}
+
+#if !defined(offsetof)
+#define offsetof(s,m) ((size_t)&(((s*)0)->m))
+#endif
+
+#if DUMP_ENABLE
+static void dump(cfg_data_t *cfg_data, void (*print)(const char* msg, ...))
+{
+	const static struct {
+		const char *name;
+		size_t offset;
+		char type;
+	} list[] = {
+		{ "username", offsetof(cfg_data_t, username), 's' },
+		{ "term", offsetof(cfg_data_t, term), 's' },
+		{ "termopt", offsetof(cfg_data_t, termopt), 's' },
+		{ "shell", offsetof(cfg_data_t, shell), 's' },
+		{ "term_type", offsetof(cfg_data_t, term_type), 's' },
+		{ "change_dir", offsetof(cfg_data_t, change_dir), 's' },
+		{ "port_start", offsetof(cfg_data_t, port_start), 'i' },
+		{ "port_range", offsetof(cfg_data_t, port_range), 'i' },
+		{ "cl_port", offsetof(cfg_data_t, cl_port), 'i' },
+		{ "home_chdir", offsetof(cfg_data_t, home_chdir), 'b' },
+		{ "enable_loginshell", offsetof(cfg_data_t, enable_loginshell), 'b' },
+		{ "telsock_timeout", offsetof(cfg_data_t, telsock_timeout), 'i' },
+		{ "enable_agent_proxy", offsetof(cfg_data_t, enable_agent_proxy), 'b' },
+		{ "dumb", offsetof(cfg_data_t, dumb), 'b' },
+		{ "debug_flag", offsetof(cfg_data_t, debug_flag), 'b' },
+	};
+	for (int i = 0; i < (int)(sizeof(list)/sizeof(list[0])); i++) {
+		uint8_t *p = (uint8_t *)cfg_data + list[i].offset;
+		switch (list[i].type) {
+		case 's': {
+			char *str = *(char **)p;
+			print("%s=%s", list[i].name, str == NULL ? "NULL" : str);
+			break;
+		}
+		case 'i': {
+			int i2 = *(int *)p;
+			print("%s=%d(0x%x)", list[i].name, i2, i2);
+			break;
+		}
+		case 'b': {
+			bool b = *(bool *)p;
+			print("%s=%i(%s)", list[i].name, b, b ? "true" : "false");
+			break;
+		}
+		default:
+			print("?");
+			break;
+		}
+	}
+
+	sh_env_t *sh_env = cfg_data->sh_env;
+	for(int i = 0;;i++) {
+		char *value;
+		const char *env = sh_env->get(sh_env, i, &value);
+		if (env == NULL) {
+			break;
+		}
+		print("env %d %s=%s", i, env, value);
+	}
+}
+#else
+static void dump(cfg_data_t *cfg_data, void (*print)(const char* msg, ...))
+{
+	(void)cfg_data;
+	(void)print;
+}
+#endif
+
+cfg_data_t *create_cfg(void)
+{
+	cfg_data_t *cfg_data = (cfg_data_t *)calloc(sizeof(*cfg_data), 1);
+	if (cfg_data == NULL) {
+		return NULL;
+	}
+	cfg_private_data_t *pr_data = (cfg_private_data_t *)calloc(sizeof(*pr_data), 1);
+	if (pr_data == NULL) {
+		free(cfg_data);
+		return NULL;
+	}
+
+	// data, func
+	cfg_data->private_data = pr_data;
+	cfg_data->sh_env = create_sh_env();
+	cfg_data->destroy = destroy;
+	cfg_data->load = load_cfg;
+	cfg_data->dump = dump;
+
+	return cfg_data;
+}

Added: branches/cygterm/cygwin/cygterm/cygterm_cfg.h
===================================================================
--- branches/cygterm/cygwin/cygterm/cygterm_cfg.h	                        (rev 0)
+++ branches/cygterm/cygwin/cygterm/cygterm_cfg.h	2022-01-28 16:36:06 UTC (rev 9706)
@@ -0,0 +1,74 @@
+/*
+ * (C) 2022- TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct sh_env_tag {
+	void (*destroy)(struct sh_env_tag *sh_env_tag);
+	bool (*add)(struct sh_env_tag *sh_env_tag, const char *name, const char *value);
+	bool (*add1)(struct sh_env_tag *sh_env_tag, const char *namevalue);
+	char *(*get)(struct sh_env_tag *sh_env_tag, int index, char **value);
+	void *private_data;
+} sh_env_t;
+
+sh_env_t *create_sh_env(void);
+
+typedef struct cfg_data_tag {
+	char *username;
+	char *term;					// ex. "ttermpro.exe %s %d"
+	char *termopt;				// ex. "/KR-UTF8"
+	char *shell;				// ex. "/usr/bin/bash"
+	char *term_type;			// terminal type ex. "vt100"
+	char *change_dir;			// cd \x82\xB5\x82\xBD\x8C\xE3\x81A\x83V\x83F\x83\x8B\x8BN\x93\xAE
+	int port_start;				// default lowest port number
+	int port_range;				// default number of ports
+	int cl_port;
+	bool home_chdir;			// chdir to HOME
+	bool enable_loginshell;		// login shell flag
+	int telsock_timeout;		// telnet socket timeout
+	bool enable_agent_proxy;	// ssh agent proxy
+	bool dumb;
+	bool debug_flag;			// debug mode
+	bool (*save)(struct cfg_data_tag *cfg_data_tag, const char *fname);
+	bool (*load)(struct cfg_data_tag *cfg_data_tag, const char *fname);
+	void (*destroy)(struct cfg_data_tag *cfg_data_tag);
+	void (*dump)(struct cfg_data_tag *cfg_data_tag, void (*print)(const char* msg, ...));
+	sh_env_t *sh_env;
+	void *private_data;
+} cfg_data_t;
+
+cfg_data_t *load_cfg(const char *cfg);
+cfg_data_t *create_cfg(void);
+
+#ifdef __cplusplus
+}
+#endif

Modified: branches/cygterm/teraterm/common/CMakeLists.txt
===================================================================
--- branches/cygterm/teraterm/common/CMakeLists.txt	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/CMakeLists.txt	2022-01-28 16:36:06 UTC (rev 9706)
@@ -38,6 +38,7 @@
   ttlib.h
   ttlib_static.c
   ttlib_static_cpp.cpp
+  ttlib_static_dirs.cpp
   ttlib_charset.h
   ttlib_charset.cpp
   win32helper.cpp

Modified: branches/cygterm/teraterm/common/asprintf.cpp
===================================================================
--- branches/cygterm/teraterm/common/asprintf.cpp	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/asprintf.cpp	2022-01-28 16:36:06 UTC (rev 9706)
@@ -29,7 +29,9 @@
 #include <stdio.h>
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #include <crtdbg.h>
+#endif
 #include <assert.h>
 #include <string.h>
 #include <wchar.h>
@@ -41,6 +43,11 @@
 #define _Printf_format_string_
 #endif
 
+#if defined(__CYGWIN__)
+#define _wcsdup(p)	wcsdup(p)
+#endif
+
+#if !defined(__CYGWIN__)
 /**
  *	\x97̈\xE6\x82\xF0\x8Am\x95ۂ\xB5\x82āA\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x83t\x83H\x81[\x83}\x83b\x83g\x82\xB5\x82āA\x83|\x83C\x83\x93\x83^\x95Ԃ\xB7
  *	\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
@@ -140,6 +147,7 @@
 	va_end(ap);
 	return r;
 }
+#endif //!defined(__CYGWIN__)
 
 /**
  *	\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x98A\x8C\x8B\x82\xB7\x82\xE9

Modified: branches/cygterm/teraterm/common/codeconv.cpp
===================================================================
--- branches/cygterm/teraterm/common/codeconv.cpp	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/codeconv.cpp	2022-01-28 16:36:06 UTC (rev 9706)
@@ -35,10 +35,14 @@
 #define _CRTDBG_MAP_ALLOC
 #endif
 #include <stdlib.h>
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #include <crtdbg.h>
+#endif
 #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) || !defined(_MSC_VER)
 #include <stdint.h>
 #endif
+#include <wchar.h>
+
 #include "codemap.h"
 #include "codeconv.h"
 #include "ttcstd.h"
@@ -46,6 +50,12 @@
 // cp932\x95ϊ\xB7\x8E\x9E\x81AWindows API \x82\xE6\x82\xE8 Tera Term \x82̕ϊ\xB7\x83e\x81[\x83u\x83\x8B\x82\xF0\x97D\x90悷\x82\xE9
 //#define PRIORITY_CP932_TABLE
 
+#if defined(__CYGWIN__)
+#define _wcsdup(p1)	wcsdup(p1)
+#define _strdup(p1)	strdup(p1)
+#define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#endif
+
 /*
  *	\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA2\x8Fꍇ\x82\xCD 0 \x82\xF0\x95Ԃ\xB7
  */

Modified: branches/cygterm/teraterm/common/common_static.v16.vcxproj
===================================================================
--- branches/cygterm/teraterm/common/common_static.v16.vcxproj	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/common_static.v16.vcxproj	2022-01-28 16:36:06 UTC (rev 9706)
@@ -151,6 +151,7 @@
     <ClCompile Include="ttlib_charset.cpp" />
     <ClCompile Include="ttlib_static.c" />
     <ClCompile Include="ttlib_static_cpp.cpp" />
+    <ClCompile Include="ttlib_static_dirs.cpp" />
     <ClCompile Include="win32helper.cpp" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/cygterm/teraterm/common/compat_win.cpp
===================================================================
--- branches/cygterm/teraterm/common/compat_win.cpp	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/compat_win.cpp	2022-01-28 16:36:06 UTC (rev 9706)
@@ -31,6 +31,10 @@
 #include <windows.h>
 #include <windns.h>
 #include <assert.h>
+#include <wchar.h>
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#include <crtdbg.h>
+#endif
 
 #include "compat_win.h"
 #include "compat_windns.h"
@@ -38,6 +42,11 @@
 #include "dllutil.h"
 #include "codeconv.h"
 
+#if defined(__CYGWIN__)
+#define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#define _wcsdup(p) wcsdup(p)
+#endif
+
 // for debug
 //#define UNICODE_API_DISABLE	1
 

Modified: branches/cygterm/teraterm/common/dllutil.cpp
===================================================================
--- branches/cygterm/teraterm/common/dllutil.cpp	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/dllutil.cpp	2022-01-28 16:36:06 UTC (rev 9706)
@@ -26,12 +26,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define __STDC_WANT_LIB_EXT1__
 #include <windows.h>
 #include <assert.h>
 #if !defined(_CRTDBG_MAP_ALLOC)
 #define _CRTDBG_MAP_ALLOC
 #endif
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #include <crtdbg.h>
+#endif
+#include <wchar.h>
 
 #include "compat_win.h"
 #include "ttlib.h"	// for IsWindowsXPOrLater()
@@ -38,6 +42,11 @@
 
 #include "dllutil.h"
 
+#if defined(__CYGWIN__)
+#define _countof(_Array) (sizeof(_Array) / sizeof(_Array[0]))
+#define _wcsdup(p) wcsdup(p)
+#endif
+
 typedef struct {
 	const wchar_t *fname;
 	BOOL NeedFreeLibrary;
@@ -48,6 +57,14 @@
 static HandleList_t *HandleList;
 static int HandleListCount;
 
+#if defined(__CYGWIN__) && !defined(__STDC_LIB_EXT1__)
+static void wcscat_s(wchar_t *dest, rsize_t size, const wchar_t *src)
+{
+	(void)size;
+	wcscat(dest, src);
+}
+#endif
+
 static HMODULE GetHandle(const wchar_t *fname, DLLLoadFlag LoadFlag)
 {
 	HMODULE module;

Modified: branches/cygterm/teraterm/common/ttknownfolders.c
===================================================================
--- branches/cygterm/teraterm/common/ttknownfolders.c	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/ttknownfolders.c	2022-01-28 16:36:06 UTC (rev 9706)
@@ -28,7 +28,8 @@
 
 #include <windows.h>
 
-#if !defined(NTDDI_VERSION) || (NTDDI_VERSION < NTDDI_VISTA)
+//#if !defined(NTDDI_VERSION) || (NTDDI_VERSION < NTDDI_VISTA)
+#if 1
 // FOLDERID_* \x82\xAASDK\x93\xE0\x82ɒ\xE8\x8B`\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2
 // \x82\xB1\x82̃t\x83@\x83C\x83\x8B(*.obj)\x82Ɏ\xC0\x91̂\xF0\x92u\x82\xAD
 #define INITGUID

Modified: branches/cygterm/teraterm/common/ttlib.h
===================================================================
--- branches/cygterm/teraterm/common/ttlib.h	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/ttlib.h	2022-01-28 16:36:06 UTC (rev 9706)
@@ -29,6 +29,8 @@
 
 /* useful routines */
 
+#include <time.h>	// for time_t
+
 #pragma once
 
 #include "i18n.h"
@@ -108,7 +110,7 @@
 DllExport void OutputDebugPrintf(_Printf_format_string_ const char *fmt, ...);
 void OutputDebugPrintfW(_Printf_format_string_ const wchar_t *fmt, ...);
 #elif defined(__GNUC__)
-DllExport void OutputDebugPrintf(_Printf_format_string_ const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+DllExport void OutputDebugPrintf(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 void OutputDebugPrintfW(const wchar_t *fmt, ...); // __attribute__ ((format (wprintf, 1, 2)));
 #else
 DllExport void OutputDebugPrintf(const char *fmt, ...);

Modified: branches/cygterm/teraterm/common/ttlib_static_cpp.cpp
===================================================================
--- branches/cygterm/teraterm/common/ttlib_static_cpp.cpp	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/ttlib_static_cpp.cpp	2022-01-28 16:36:06 UTC (rev 9706)
@@ -36,7 +36,9 @@
 #define _CRTDBG_MAP_ALLOC
 #endif
 #include <stdlib.h>
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #include <crtdbg.h>
+#endif
 #include <assert.h>
 #include <wchar.h>
 #include <shlobj.h>
@@ -735,59 +737,6 @@
 }
 
 /**
- *	\x83t\x83@\x83C\x83\x8B\x96\xBC(\x83p\x83X\x96\xBC)\x82\xF0\x89\xF0\x90͂\xB7\x82\xE9
- *	GetFileNamePos() \x82\xCC wchar_t\x94\xC5
- *
- *	@param[in]	PathName	\x83t\x83@\x83C\x83\x8B\x96\xBC\x81A\x83t\x83\x8B\x83p\x83X
- *	@param[out]	DirLen		\x96\x96\x94\xF6\x82̃X\x83\x89\x83b\x83V\x83\x85\x82\xF0\x8A܂ރf\x83B\x83\x8C\x83N\x83g\x83\x8A\x83p\x83X\x92\xB7
- *							NULL\x82̂Ƃ\xAB\x92l\x82\xF0\x95Ԃ\xB3\x82Ȃ\xA2
- *	@param[out]	FNPos		\x83t\x83@\x83C\x83\x8B\x96\xBC\x82ւ\xCCindex
- *							&PathName[FNPos] \x82\xAA\x83t\x83@\x83C\x83\x8B\x96\xBC
- *							NULL\x82̂Ƃ\xAB\x92l\x82\xF0\x95Ԃ\xB3\x82Ȃ\xA2
- *	@retval		FALSE		PathName\x82\xAA\x95s\x90\xB3
- */
-BOOL GetFileNamePosW(const wchar_t *PathName, size_t *DirLen, size_t *FNPos)
-{
-	const wchar_t *Ptr;
-	const wchar_t *DirPtr;
-	const wchar_t *FNPtr;
-	const wchar_t *PtrOld;
-
-	if (DirLen != NULL) *DirLen = 0;
-	if (FNPos != NULL) *FNPos = 0;
-
-	if (PathName==NULL)
-		return FALSE;
-
-	if ((wcslen(PathName)>=2) && (PathName[1]==L':'))
-		Ptr = &PathName[2];
-	else
-		Ptr = PathName;
-	if (Ptr[0]=='\\' || Ptr[0]=='/')
-		Ptr++;
-
-	DirPtr = Ptr;
-	FNPtr = Ptr;
-	while (Ptr[0]!=0) {
-		wchar_t b = Ptr[0];
-		PtrOld = Ptr;
-		Ptr++;
-		switch (b) {
-			case L':':
-				return FALSE;
-			case L'/':	/* FALLTHROUGH */
-			case L'\\':
-				DirPtr = PtrOld;
-				FNPtr = Ptr;
-				break;
-		}
-	}
-	if (DirLen != NULL) *DirLen = DirPtr-PathName;
-	if (FNPos != NULL) *FNPos = FNPtr-PathName;
-	return TRUE;
-}
-
-/**
  *	ConvHexCharW() \x82\xCC wchar_t \x94\xC5
  */
 BYTE ConvHexCharW(wchar_t b)
@@ -849,100 +798,7 @@
 	return (int)j;
 }
 
-/**
- *	ExtractFileName() \x82\xCC wchar_t \x94\xC5
- *	\x83t\x83\x8B\x83p\x83X\x82\xA9\x82\xE7\x83t\x83@\x83C\x83\x8B\x96\xBC\x95\x94\x95\xAA\x82\xF0\x8E\xE6\x82\xE8\x8Fo\x82\xB7
- *
- *	@return	\x83t\x83@\x83C\x83\x8B\x96\xBC\x95\x94\x95\xAA(\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7free()\x82\xB7\x82\xE9)
- */
-wchar_t *ExtractFileNameW(const wchar_t *PathName)
-{
-	size_t i;
-	if (!GetFileNamePosW(PathName, NULL, &i))
-		return NULL;
-	wchar_t *filename = _wcsdup(&PathName[i]);
-	return filename;
-}
-
-/**
- *	ExtractDirName() \x82\xCC wchar_t \x94\xC5
- *
- *	@return	\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x96\xBC\x95\x94\x95\xAA(\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7free()\x82\xB7\x82\xE9)
- */
-wchar_t *ExtractDirNameW(const wchar_t *PathName)
-{
-	size_t i;
-	wchar_t *DirName = _wcsdup(PathName);
-	if (!GetFileNamePosW(DirName, &i, NULL))
-		return NULL;
-	DirName[i] = 0;
-	return DirName;
-}
-
 /*
- * Get Exe(exe,dll) directory
- *	ttermpro.exe, \x83v\x83\x89\x83O\x83C\x83\x93\x82\xAA\x82\xA0\x82\xE9\x83t\x83H\x83\x8B\x83_
- *	ttypes.ExeDirW \x82Ɠ\xAF\x88\xEA
- *	\x82\xE0\x82Ƃ\xCD GetHomeDirW() \x82\xBE\x82\xC1\x82\xBD
- *
- * @param[in]		hInst		WinMain()\x82\xCC HINSTANCE \x82܂\xBD\x82\xCD NULL
- * @return			ExeDir		\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
- */
-wchar_t *GetExeDirW(HINSTANCE hInst)
-{
-	wchar_t *TempW;
-	wchar_t *dir;
-	DWORD error = hGetModuleFileNameW(hInst, &TempW);
-	if (error != NO_ERROR) {
-		// \x83p\x83X\x82̎擾\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x81B\x92v\x96\xBD\x93I\x81Aabort() \x82\xB7\x82\xE9\x81B
-		abort();
-	}
-	dir = ExtractDirNameW(TempW);
-	free(TempW);
-	return dir;
-}
-
-/*
- * Get home directory
- *		\x8Cl\x97p\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x83t\x83H\x83\x8B\x83_\x8E擾
- *		ttypes.HomeDirW \x82Ɠ\xAF\x88\xEA
- *		TERATERM.INI \x82Ȃǂ\xAA\x82\xA8\x82\xA2\x82Ă\xA0\x82\xE9\x83t\x83H\x83\x8B\x83_
- *		ttermpro.exe \x82\xAA\x82\xA0\x82\xE9\x83t\x83H\x83\x8B\x83_\x82\xCD GetExeDirW() \x82Ŏ擾
- *		%APPDATA%\teraterm5 (%USERPROFILE%\AppData\Roaming\teraterm5)
- *
- * @param[in]		hInst		WinMain()\x82\xCC HINSTANCE \x82܂\xBD\x82\xCD NULL
- * @return			HomeDir		\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
- */
-wchar_t *GetHomeDirW(HINSTANCE hInst)
-{
-	wchar_t *path;
-	_SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &path);
-	wchar_t *ret = NULL;
-	awcscats(&ret, path, L"\\teraterm5", NULL);
-	free(path);
-	return ret;
-}
-
-/*
- * Get log directory
- *		\x83\x8D\x83O\x95ۑ\xB6\x83t\x83H\x83\x8B\x83_\x8E擾
- *		ttypes.LogDirW \x82Ɠ\xAF\x88\xEA
- *		%LOCALAPPDATA%\teraterm5 (%USERPROFILE%\AppData\Local\teraterm5)
- *
- * @param[in]		hInst		WinMain()\x82\xCC HINSTANCE \x82܂\xBD\x82\xCD NULL
- * @return			LogDir		\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
- */
-wchar_t* GetLogDirW(void)
-{
-	wchar_t *path;
-	_SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, NULL, &path);
-	wchar_t *ret = NULL;
-	awcscats(&ret, path, L"\\teraterm5", NULL);
-	free(path);
-	return ret;
-}
-
-/*
  *	UILanguageFile\x82̃t\x83\x8B\x83p\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9
  *
  *	@param[in]		HomeDir					exe,dll\x82̑\xB6\x8D݂\xB7\x82\xE9\x83t\x83H\x83\x8B\x83_ GetExeDir()\x82Ŏ擾\x82ł\xAB\x82\xE9

Added: branches/cygterm/teraterm/common/ttlib_static_dirs.cpp
===================================================================
--- branches/cygterm/teraterm/common/ttlib_static_dirs.cpp	                        (rev 0)
+++ branches/cygterm/teraterm/common/ttlib_static_dirs.cpp	2022-01-28 16:36:06 UTC (rev 9706)
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2020- TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* C99\x95\x97\x82ɋL\x8Fq\x82ł\xAB\x82\xE9\x82悤\x82\xC9cpp\x82Ƃ\xB5\x82\xBD */
+/* Visual Studio 2005 \x82\xAA C89 */
+
+#include <windows.h>
+#include <stdio.h>
+#include <string.h>
+#if !defined(_CRTDBG_MAP_ALLOC)
+#define _CRTDBG_MAP_ALLOC
+#endif
+#include <stdlib.h>
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#include <crtdbg.h>
+#endif
+#include <assert.h>
+#include <wchar.h>
+#include <shlobj.h>
+#include <malloc.h>
+#include <time.h>
+
+#include "i18n.h"
+#include "asprintf.h"
+#include "win32helper.h"
+#include "codeconv.h"
+#include "compat_win.h"
+#include "fileread.h"
+
+#include "ttlib.h"
+
+#if defined(__CYGWIN__)
+#define _wcsdup(p1) wcsdup(p1)
+#endif
+
+/**
+ *	\x83|\x81[\x83^\x83u\x83\x8B\x94łƎw\x92蓮\x8D삷\x82邩
+ *
+ *	@retval		TRUE		\x83|\x81[\x83^\x83u\x83\x8B\x94\xC5
+ *	@retval		FALSE		\x92ʏ\xED\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x94\xC5
+ */
+BOOL IsPortableMode(void)
+{
+	return FALSE;
+}
+
+/**
+ *	\x83t\x83@\x83C\x83\x8B\x96\xBC(\x83p\x83X\x96\xBC)\x82\xF0\x89\xF0\x90͂\xB7\x82\xE9
+ *	GetFileNamePos() \x82\xCC wchar_t\x94\xC5
+ *
+ *	@param[in]	PathName	\x83t\x83@\x83C\x83\x8B\x96\xBC\x81A\x83t\x83\x8B\x83p\x83X
+ *	@param[out]	DirLen		\x96\x96\x94\xF6\x82̃X\x83\x89\x83b\x83V\x83\x85\x82\xF0\x8A܂ރf\x83B\x83\x8C\x83N\x83g\x83\x8A\x83p\x83X\x92\xB7
+ *							NULL\x82̂Ƃ\xAB\x92l\x82\xF0\x95Ԃ\xB3\x82Ȃ\xA2
+ *	@param[out]	FNPos		\x83t\x83@\x83C\x83\x8B\x96\xBC\x82ւ\xCCindex
+ *							&PathName[FNPos] \x82\xAA\x83t\x83@\x83C\x83\x8B\x96\xBC
+ *							NULL\x82̂Ƃ\xAB\x92l\x82\xF0\x95Ԃ\xB3\x82Ȃ\xA2
+ *	@retval		FALSE		PathName\x82\xAA\x95s\x90\xB3
+ */
+BOOL GetFileNamePosW(const wchar_t *PathName, size_t *DirLen, size_t *FNPos)
+{
+	const wchar_t *Ptr;
+	const wchar_t *DirPtr;
+	const wchar_t *FNPtr;
+	const wchar_t *PtrOld;
+
+	if (DirLen != NULL) *DirLen = 0;
+	if (FNPos != NULL) *FNPos = 0;
+
+	if (PathName==NULL)
+		return FALSE;
+
+	if ((wcslen(PathName)>=2) && (PathName[1]==L':'))
+		Ptr = &PathName[2];
+	else
+		Ptr = PathName;
+	if (Ptr[0]=='\\' || Ptr[0]=='/')
+		Ptr++;
+
+	DirPtr = Ptr;
+	FNPtr = Ptr;
+	while (Ptr[0]!=0) {
+		wchar_t b = Ptr[0];
+		PtrOld = Ptr;
+		Ptr++;
+		switch (b) {
+			case L':':
+				return FALSE;
+			case L'/':	/* FALLTHROUGH */
+			case L'\\':
+				DirPtr = PtrOld;
+				FNPtr = Ptr;
+				break;
+		}
+	}
+	if (DirLen != NULL) *DirLen = DirPtr-PathName;
+	if (FNPos != NULL) *FNPos = FNPtr-PathName;
+	return TRUE;
+}
+
+/**
+ *	ExtractFileName() \x82\xCC wchar_t \x94\xC5
+ *	\x83t\x83\x8B\x83p\x83X\x82\xA9\x82\xE7\x83t\x83@\x83C\x83\x8B\x96\xBC\x95\x94\x95\xAA\x82\xF0\x8E\xE6\x82\xE8\x8Fo\x82\xB7
+ *
+ *	@return	\x83t\x83@\x83C\x83\x8B\x96\xBC\x95\x94\x95\xAA(\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7free()\x82\xB7\x82\xE9)
+ */
+wchar_t *ExtractFileNameW(const wchar_t *PathName)
+{
+	size_t i;
+	if (!GetFileNamePosW(PathName, NULL, &i))
+		return NULL;
+	wchar_t *filename = _wcsdup(&PathName[i]);
+	return filename;
+}
+
+/**
+ *	ExtractDirName() \x82\xCC wchar_t \x94\xC5
+ *
+ *	@return	\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x96\xBC\x95\x94\x95\xAA(\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7free()\x82\xB7\x82\xE9)
+ */
+wchar_t *ExtractDirNameW(const wchar_t *PathName)
+{
+	size_t i;
+	wchar_t *DirName = _wcsdup(PathName);
+	if (!GetFileNamePosW(DirName, &i, NULL))
+		return NULL;
+	DirName[i] = 0;
+	return DirName;
+}
+
+/*
+ * Get Exe(exe,dll) directory
+ *	ttermpro.exe, \x83v\x83\x89\x83O\x83C\x83\x93\x82\xAA\x82\xA0\x82\xE9\x83t\x83H\x83\x8B\x83_
+ *	ttypes.ExeDirW \x82Ɠ\xAF\x88\xEA
+ *	\x82\xE0\x82Ƃ\xCD GetHomeDirW() \x82\xBE\x82\xC1\x82\xBD
+ *
+ * @param[in]		hInst		WinMain()\x82\xCC HINSTANCE \x82܂\xBD\x82\xCD NULL
+ * @return			ExeDir		\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
+ */
+wchar_t *GetExeDirW(HINSTANCE hInst)
+{
+	wchar_t *TempW;
+	wchar_t *dir;
+	DWORD error = hGetModuleFileNameW(hInst, &TempW);
+	if (error != NO_ERROR) {
+		// \x83p\x83X\x82̎擾\x82Ɏ\xB8\x94s\x82\xB5\x82\xBD\x81B\x92v\x96\xBD\x93I\x81Aabort() \x82\xB7\x82\xE9\x81B
+		abort();
+	}
+	dir = ExtractDirNameW(TempW);
+	free(TempW);
+	return dir;
+}
+
+/*
+ * Get home directory
+ *		\x8Cl\x97p\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x83t\x83H\x83\x8B\x83_\x8E擾
+ *		ttypes.HomeDirW \x82Ɠ\xAF\x88\xEA
+ *		TERATERM.INI \x82Ȃǂ\xAA\x82\xA8\x82\xA2\x82Ă\xA0\x82\xE9\x83t\x83H\x83\x8B\x83_
+ *		ttermpro.exe \x82\xAA\x82\xA0\x82\xE9\x83t\x83H\x83\x8B\x83_\x82\xCD GetExeDirW() \x82Ŏ擾
+ *		%APPDATA%\teraterm5 (%USERPROFILE%\AppData\Roaming\teraterm5)
+ *
+ * @param[in]		hInst		WinMain()\x82\xCC HINSTANCE \x82܂\xBD\x82\xCD NULL
+ * @return			HomeDir		\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
+ */
+wchar_t *GetHomeDirW(HINSTANCE hInst)
+{
+	if (IsPortableMode()) {
+		wchar_t *path;
+		_SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, NULL, &path);
+		wchar_t *ret = NULL;
+		awcscats(&ret, path, L"\\teraterm5", NULL);
+		free(path);
+		return ret;
+	}
+	else {
+		return GetExeDirW(hInst);
+	}
+}
+
+/*
+ * Get log directory
+ *		\x83\x8D\x83O\x95ۑ\xB6\x83t\x83H\x83\x8B\x83_\x8E擾
+ *		ttypes.LogDirW \x82Ɠ\xAF\x88\xEA
+ *		%LOCALAPPDATA%\teraterm5 (%USERPROFILE%\AppData\Local\teraterm5)
+ *
+ * @param[in]		hInst		WinMain()\x82\xCC HINSTANCE \x82܂\xBD\x82\xCD NULL
+ * @return			LogDir		\x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82邱\x82\xC6
+ */
+wchar_t* GetLogDirW(void)
+{
+	if (IsPortableMode()) {
+		wchar_t *path;
+		_SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, NULL, &path);
+		wchar_t *ret = NULL;
+		awcscats(&ret, path, L"\\teraterm5", NULL);
+		free(path);
+		return ret;
+	}
+	else {
+		wchar_t *path;
+		_SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &path);
+		return path;
+	}
+}

Modified: branches/cygterm/teraterm/common/win32helper.cpp
===================================================================
--- branches/cygterm/teraterm/common/win32helper.cpp	2022-01-28 16:34:34 UTC (rev 9705)
+++ branches/cygterm/teraterm/common/win32helper.cpp	2022-01-28 16:36:06 UTC (rev 9706)
@@ -29,12 +29,19 @@
 #include <windows.h>
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #include <crtdbg.h>
+#endif
+#include <wchar.h>
 
 #include "asprintf.h"
 
 #include "win32helper.h"
 
+#if defined(__CYGWIN__)
+#define _wcsdup(p1)	wcsdup(p1)
+#endif
+
 /**
  *	GetModuleFileNameW() \x82̓\xAE\x93I\x83o\x83b\x83t\x83@\x94\xC5
  *

From scmnotify ＠ osdn.net  Sat Jan 29 08:49:12 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sat, 29 Jan 2022 08:49:12 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MDddIFRUU1NILkxPRyDjga7lh7rlips=?=
 =?utf-8?b?5YWI44KS44Ot44Kw5L+d5a2Y44OV44Kp44Or44OA77yIJUxPQ0FMQVBQREFU?=
 =?utf-8?b?QSVcdGVyYXRlcm0177yJ44Gr5aSJ5pu0?=
Message-ID: <1643413752.296170.12017.nullmailer@users.osdn.me>

Revision: 9707
          https://osdn.net/projects/ttssh2/scm/svn/commits/9707
Author:   nmaya
Date:     2022-01-29 08:49:12 +0900 (Sat, 29 Jan 2022)
Log Message:
-----------
TTSSH.LOG の出力先をログ保存フォルダ（%LOCALAPPDATA%\teraterm5）に変更

#43507

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43507

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2022-01-28 16:36:06 UTC (rev 9706)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2022-01-28 23:49:12 UTC (rev 9707)
@@ -800,9 +800,9 @@
 	if (level <= pvar->settings.LogLevel) {
 		int file;
 
-		wchar_t *fname = get_teraterm_dir_relative_nameW(L"TTSSH.LOG");
+		wchar_t *fname = get_log_dir_relative_nameW(L"TTSSH.LOG");
 		file = _wopen(fname, _O_RDWR | _O_APPEND | _O_CREAT | _O_TEXT,
-					  _S_IREAD | _S_IWRITE);
+		              _S_IREAD | _S_IWRITE);
 		free(fname);
 
 		if (file >= 0) {
@@ -2446,7 +2446,7 @@
 }
 
 /**
- *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0 exe \x82̂\xA0\x82\xE9\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB5\x81A\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
  *	@return	\x83t\x83\x8B\x83p\x83X\x83t\x83@\x83C\x83\x8B\x96\xBC
  *			free()\x82\xB7\x82邱\x82\xC6
  */
@@ -2533,7 +2533,8 @@
 }
 
 /**
- *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8Cl\x97p\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB5\x81A\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *		%APPDATA%\teraterm5 (%USERPROFILE%\AppData\Roaming\teraterm5)
  *	@return	\x83t\x83\x8B\x83p\x83X\x83t\x83@\x83C\x83\x8B\x96\xBC
  *			free()\x82\xB7\x82邱\x82\xC6
  */
@@ -2550,6 +2551,25 @@
 	return path;
 }
 
+/**
+ *	\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x83\x8D\x83O\x95ۑ\xB6\x83t\x83H\x83\x8B\x83_\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB5\x81A\x83t\x83\x8B\x83p\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
+ *		%LOCALAPPDATA%\teraterm5 (%USERPROFILE%\AppData\Local\teraterm5)
+ *	@return	\x83t\x83\x8B\x83p\x83X\x83t\x83@\x83C\x83\x8B\x96\xBC
+ *			free()\x82\xB7\x82邱\x82\xC6
+ */
+wchar_t *get_log_dir_relative_nameW(const wchar_t *basename)
+{
+	wchar_t *path;
+
+	if (!IsRelativePathW(basename)) {
+		return _wcsdup(basename);
+	}
+
+	path = GetLogDirW();
+	awcscats(&path, L"\\", basename, NULL);
+	return path;
+}
+
 static void complete_setup_dlg(PTInstVar pvar, HWND dlg)
 {
 	char buf[4096];

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2022-01-28 16:36:06 UTC (rev 9706)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2022-01-28 23:49:12 UTC (rev 9707)
@@ -387,6 +387,7 @@
 wchar_t *get_teraterm_dir_relative_nameW(const wchar_t *basename);
 int copy_teraterm_dir_relative_path(char *dest, int destsize, char *basename);
 wchar_t *get_home_dir_relative_nameW(const wchar_t *basename);
+wchar_t *get_log_dir_relative_nameW(const wchar_t *basename);
 int uuencode(unsigned char *src, int srclen, unsigned char *target, int targsize);
 
 #endif

From scmnotify ＠ osdn.net  Sun Jan 30 01:49:55 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 30 Jan 2022 01:49:55 +0900
Subject: [ttssh2-commit] =?utf-8?q?=5B9708=5D_reference/keyboard=5Fcfg=2Em?=
 =?utf-8?b?ZCDjgpIgc2V0dXAva2V5Ym9hcmQuaHRtbCDjgavjg57jg7zjgrjjgZfjgZ8=?=
Message-ID: <1643474995.570186.7761.nullmailer@users.osdn.me>

Revision: 9708
          https://osdn.net/projects/ttssh2/scm/svn/commits/9708
Author:   zmatsuo
Date:     2022-01-30 01:49:55 +0900 (Sun, 30 Jan 2022)
Log Message:
-----------
reference/keyboard_cfg.md を setup/keyboard.html にマージした

- reference/keyboard_cfg.md(html) へのリンクを setup/keyboard.html へ変更
- スクリプト内のreference/keyboard_cfg.md に関連する部分を削除

ticket #43658

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43658

Modified Paths:
--------------
    trunk/doc/convtext.bat
    trunk/doc/en/html/index.html
    trunk/doc/en/html/setup/keyboard.html
    trunk/doc/en/teraterm.hhc
    trunk/doc/ja/html/index.html
    trunk/doc/ja/html/setup/keyboard.html
    trunk/doc/ja/teraterm.hhc
    trunk/doc/makechm.cmake

Removed Paths:
-------------
    trunk/doc/en/html/reference/keyboard_cfg.md
    trunk/doc/ja/html/reference/keyboard_cfg.md

-------------- next part --------------
Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/convtext.bat	2022-01-29 16:49:55 UTC (rev 9708)
@@ -24,8 +24,6 @@
 %TOSJIS% -i %REF_E%/build_with_cmake.md -o %REF_E%/build_with_cmake.html
 %TOSJIS% -i %REF_J%/build_library_with_cmake.md -o %REF_J%/build_library_with_cmake.html
 %TOSJIS% -i %REF_E%/build_library_with_cmake.md -o %REF_E%/build_library_with_cmake.html
-%TOSJIS% -i %REF_J%/keyboard_cfg.md     -o %REF_J%/keyboard_cfg.html
-%TOSJIS% -i %REF_E%/keyboard_cfg.md     -o %REF_E%/keyboard_cfg.html
 %TOSJIS% -i %REF_J%/menu_id.md          -o %REF_J%/menu_id.html
 %TOSJIS% -i %REF_E%/menu_id.md          -o %REF_E%/menu_id.html
 

Modified: trunk/doc/en/html/index.html
===================================================================
--- trunk/doc/en/html/index.html	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/en/html/index.html	2022-01-29 16:49:55 UTC (rev 9708)
@@ -125,10 +125,7 @@
 <UL>
  <LI><A HREF="setup/folder.html">Folder to put setup files</A></LI>
  <LI><A HREF="setup/teraterm.html">Tera Term setup file</A></LI>
- <LI><A HREF="setup/keyboard.html">Keyboard setup file (overview)</A></LI>
- <UL>
-   <LI><A HREF="reference/keyboard_cfg.html">Keyboard setup file (detail)</A></LI>
- </UL>
+ <LI><A HREF="setup/keyboard.html">Keyboard setup file</A></LI>
  <LI><A HREF="setup/knownfiles.html">TTSSH known_hosts file</A></LI>
  <LI><A HREF="setup/cygterm.html">CygTerm+ setup file</A></LI>
  <LI><A HREF="setup/lng.html">Language file</A></LI>

Deleted: trunk/doc/en/html/reference/keyboard_cfg.md
===================================================================
--- trunk/doc/en/html/reference/keyboard_cfg.md	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/en/html/reference/keyboard_cfg.md	2022-01-29 16:49:55 UTC (rev 9708)
@@ -1,286 +0,0 @@
-# ABOUT THE KEYBOARD SETUP FILE
-
-## FORMAT OF THE KEYBOARD SETUP FILE
-
-Each key or key combination has a unique key code, which is called
-"PC key code".
-
-The keyboard setup file has six sections.
-
-- [VT editor keypad]
-- [VT numeric keypad]
-- [VT function keys]
-- [X function keys]
-- [Shortcut keys]
-- [User keys]
-
-### [VT editor keypad] section
-
-In this section, VT editor keys are assigned to PC keys.
-
-	Format:
-		<VT editor key name>=<PC key code>
-
-	where:
-
-	<VT editor key name>
-		Up, Down, Right, Left, Find, Insert, Remove, Select,
-		Prev, Next
-
-	  <PC key code>
-		PC key code (decimal number)
-
-	Example:
-		Up=328
-
-### [VT numeric keypad] section
-
-In this section, VT numeric keys are assigned to PC keys.
-
-	Format:
-		<VT numeric key name>=<PC key code>
-
-	where:
-
-	  <VT numeric key name>
-		Num0, Num1, Num2, Num3, Num4, Num5, Num6, Num7, Num8,
-		Num9, NumMinus, NumComma, NumPeriod, NumEnter, PF1,
-		PF2, PF3, PF4
-
-	  <PC key code>
-		PC key code (decimal number)
-
-	Example:
-		Num0=82
-
-#### 注意
-
-VT 端末ではメインキーパッドの "Enter" キーと数値キーパッドの
-"Enter" キーが違う文字列を送出するモードがあるので、"NumEnter=" の
-後にはメインキーの "Enter" の PC key code を書かないでください。
-メインキーパッドの "Enter" と数値キーパッドの "Enter" が同じ
-PC key code を発生するキーボード(例えば PC9801 キーボード)の場合は
-注意が必要です。
-
-### [VT function keys] section
-
-In this section, VT function keys are assigned to PC keys.
-
-	Format:
-		<VT function key name>=<PC key code>
-
-	where:
-
-	  <VT function key name>
-		(Function keys of VT terminal)
-		Hold, Print, Break, F6, F7, F8, F9, F10, F11, F12,
-		F13, F14, Help, Do, F17, F18, F19, F20
-		("User defined keys" of VT terminal)
-		UDK6, UDK7, UDK8, UDK9, UDK10, UDK11, UDK12, UDK13,
-		UDK14, UDK15, UDK16, UDK17, UDK18, UDK19, UDK20
-
-	  <PC key code>
-		PC key code (decimal number)
-
-	Example:
-		F6=64
-
-### [X function keys] section
-
-In this section, Xterm F1-F5 keys and BackTab key are assigned to PC keys.
-
-	Format:
-		<Xterm function key name>=<PC key code>
-
-	where:
-
-	  <Xterm function key name>
-		XF1, XF2, XF3, XF4, XF5, XBackTab
-
-	  <PC key code>
-		PC key code (decimal number)
-
-	Example:
-		XF1=59
-
-### [Shortcut keys] section
-
-In this section, Tera Term functions are assigned to PC keys.
-
-	Format:
-		<Shortcut key name>=<PC key code>
-
-	where:
-	  <Shortcut key name>	Function
-	  --------------------------------------------
-	  EditCopy		[Edit] Copy command
-	  EditPaste		[Edit] Paste command
-	  EditPasteCR		[Edit] Paste<CR> command
-	  EditCLS		[Edit] Clear screen command
-	  EditCLB		[Edit] Clear buffer command
-	  ControlOpenTEK	[Control] Open TEK command
-	  ControlCloseTEK	[Control] Close TEK command
-	  LineUp		Scrolls up screen by 1 line
-	  LineDown		Scrolls down by 1 line
-	  PageUp		Scrolls up by 1 page
-	  PageDown		Scrolls down by 1 page
-	  BuffTop		Scrolls screen to buffer top
-	  BuffBottom		Scrolls screen to buffer bottom
-	  NextWin		Moves to the next Tera Term window
-	  PrevWin		Moves to the previous Tera Term window
-	  NextShownWin		Moves to the next Tera Term window (except minimized)
-	  PrevShownWin		Moves to the previous Tera Term window (except minimized)
-	  LocalEcho		Toggles the local echo status
-
-	  <PC key code>
-		PC key code (decimal number)
-
-	Example:
-		LineUp=1352
-
-### [User keys] section
-
-This section defines user keys for functions, sending a character
-string, executing a macro file or executing a menu command.
-
-	Format:
-		<User key name>=<PC key code>,<Control flag>,
-				<Character string>
-
-	where:
-
-	  <User key name>
-		User1, User2, User3,...., User99
-		Maximum number of user keys is 99. 
-		For example, if you want to define ten user keys,
-		you must use the first ten names, from "User1" to "User10".
-
-	  <PC key code>
-		PC key code (decimal number)
-
-	  <Control flag>
-		Control flag which specifies how <character string>
-		is treated when the PC key is pressed.
-			0	<Character string> is sent as it is.
-			1	New-line codes in <Character string>
-				are converted by Tera Term and
-				the converted string is sent.
-			2	A macro file which has the name of
-				<Character string> is executed.
-			3	A Tera Term menu command specified
-				by the menu ID <Character string> is
-				executed.
-
-	  <Character string>
-		If <Control flag> is 0 or 1, <Character string>
-		represents the character string to be sent.
-		A non-printable character (control character) in
-		the string can be expressed as a "$" and ASCII code
-		in two-character hex number. For example, CR character
-		is expressed as "$0D". "$" itself is expressed as "$24".
-		See "Appendix A  ASCII CODE TABLE".
-
-		If <Control flag> is 2, <Character string> specifies
-		the macro file name to be executed.
-
-		If <Control flag> is 3, <Character string> is the menu
-		ID which specifies the menu command to be executed.
-		The menu ID should be expressed as a decimal number.
-		See "Appendix B  LIST OF MENU IDs".
-
-	Example:
-		User1=1083,0,telnet myhost
-		User2=1084,0,$0D$0A
-		User3=1085,1,$0D
-		User4=1086,2,test.ttl
-		User5=1087,3,50110
-
-## NOTE
-
-You can use a PC key code only once in the setup file.
-If you use a PC key code for multiple key assignments,
-the warning message "Key code XXX is used more than once" is
-displayed when the file is loaded by Tera Term. In this case,
-one of the assignments becomes effective and others are ignored.
-
-If you don't want to assign a key item to any PC key,
-use the word "off" like the following:
-
-EditCopy=off
-
-## KEY COMBINATIONS
-
-The following key combinations are acceptable to Tera Term and KEYCODE.EXE:
-
-	Shift+key
-	Ctrl+key
-	Shift+Ctrl+key
-	Shift+Alt+key
-	Ctrl+Alt+key
-	Shift+Ctrl+Alt+key
-
-Since some combinations (such as Alt+key) are used as shortcut keys of
-Tera Term and Windows, they don't have PC key codes and can't be specified
-in the keyboard setup file.
-
-[NOTE]
-You can specify `Alt+key' combination when Alt key uses meta key. Check
-`Meta key' under Keyboard of Setup menu. The key code can be obtained by
-KEYCODE.EXE, unfortunately the key code of `Alt+key' combination can not
-be obtained. Also, you obtain the key code and add 2048 on the value.
-
-For example, the `V' key code is 47, also `Alt+V' key code is 2095.
-
-; Shift + Insert
-EditPaste=850
-
-If you change above entry to `EditPaste=2095', you can paste by using
-`Alt+V' on condition that Meta key is pass through.
-
-You add in the following entry to [User keys] section in KEYBOARD.CNF if
-you wan to paster by using `Alt+V' remaining `Shift+Insert' function.
-
-User1=2095,3,50230
-
-## Q & A
-
-- Q. Every time I run Tera Term, the warning message
-   "Key code XXX is used more than once" is displayed.
-- A. See "3.2 NOTE".
-
-- Q. I want to use the PC "F1" key as the VT100 PF1 key. I edit the 
-   keyboard setup file like the following but it does not work:
-
-	[VT function keys]
-	F1=PF1		(This is wrong.)
-
-- A. The left hand side can not be the name of a **PC key** but
-   the name of a **VT terminal key**. The right hand side can not be
-   the name of a key but a PC key code.
-   See "3.1 FORMAT OF THE KEYBOARD SETUP FILE".
-   You should also be careful not to specify a PC key code more than
-   once in the setup file (see "3.2 NOTE").
-
-   Edit the keyboard setup file like the following:
-
-	[VT function keys]
-	PF1=59			(59 is the keycode for the F1 key.)
-	[X function keys]
-	;XF1=59			(Avoid specifying 59 twice.)
-	XF1=off			(Replace 59 by "off".)
-
-- Q. How to edit the keyboard setup file to assign the F1 key
-   for sending the escape sequence "ESC [ A"?
-- A. You can send any character string by using a user key.
-   See "3.1 FORMAT OF THE KEYBOARD SETUP FILE".
-   You should also be careful not to specify a PC keycode more than
-   once in the setup file (see "3.2 NOTE").
-
-   Edit the keyboard setup file like the following:
-
-	[X function keys]
-	;XF1=59			(59 is the keycode for the F1 key.)
-					(Avoid specifying 59 twice.)
-	XF1=off			(Replace 59 by "off".)
-	[User keys]
-	User1=59,0,$1B[A		(The ASCII code for ESC is $1B.)

Modified: trunk/doc/en/html/setup/keyboard.html
===================================================================
--- trunk/doc/en/html/setup/keyboard.html	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/en/html/setup/keyboard.html	2022-01-29 16:49:55 UTC (rev 9708)
@@ -74,11 +74,362 @@
 </p>
 
 <p>
-\x83t\x83@\x83C\x83\x8B\x8C`\x8E\xAE\x82ɂ‚\xA2\x82ẮA<A HREF="../reference/keyboard_cfg.html">\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x8Fڍ\xD7(keyboard_cfg.md)</A>\x82\xF0\x8EQ\x8FƂ\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+\x83L\x81[\x83R\x81[\x83h\x82\xCD keycode.exe \x82Œ\xB2\x82ׂ邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B<A HREF="../reference/keycode.txt">keycode.txt</A>\x82\xF0\x8EQ\x8FƂ\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+
+
+<h1>ABOUT THE KEYBOARD SETUP FILE</h1>
+
+<h2 id="keyboard_cfg">FORMAT OF THE KEYBOARD SETUP FILE</h2>
+
+<p>
+Each key or key combination has a unique key code, which is called
+"PC key code".
 </p>
 
 <p>
-\x83L\x81[\x83R\x81[\x83h\x82\xCD keycode.exe \x82Œ\xB2\x82ׂ邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B<A HREF="../reference/keycode.txt">keycode.txt</A>\x82\xF0\x8EQ\x8FƂ\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+The keyboard setup file has six sections.
+</p>
 
+<ul>
+<li>[VT editor keypad]
+<li>[VT numeric keypad]
+<li>[VT function keys]
+<li>[X function keys]
+<li>[Shortcut keys]
+<li>[User keys]
+</ul>
+
+<h3>[VT editor keypad] section</h3>
+
+<p>
+In this section, VT editor keys are assigned to PC keys.
+</p>
+
+<pre>
+	Format:
+		<VT editor key name>=<PC key code>
+
+	where:
+
+	<VT editor key name>
+		Up, Down, Right, Left, Find, Insert, Remove, Select,
+		Prev, Next
+
+	  <PC key code>
+		PC key code (decimal number)
+
+	Example:
+		Up=328
+</pre>
+
+<h3>[VT numeric keypad] section</h3>
+
+<p>
+In this section, VT numeric keys are assigned to PC keys.
+</p>
+
+<pre>
+	Format:
+		<VT numeric key name>=<PC key code>
+
+	where:
+
+	  <VT numeric key name>
+		Num0, Num1, Num2, Num3, Num4, Num5, Num6, Num7, Num8,
+		Num9, NumMinus, NumComma, NumPeriod, NumEnter, PF1,
+		PF2, PF3, PF4
+
+	  <PC key code>
+		PC key code (decimal number)
+
+	Example:
+		Num0=82
+</pre>
+
+<h4>\x92\x8D\x88\xD3</h4>
+
+<p>
+VT \x92[\x96\x96\x82ł̓\x81\x83C\x83\x93\x83L\x81[\x83p\x83b\x83h\x82\xCC "Enter" \x83L\x81[\x82Ɛ\x94\x92l\x83L\x81[\x83p\x83b\x83h\x82\xCC
+"Enter" \x83L\x81[\x82\xAA\x88Ⴄ\x95\xB6\x8E\x9A\x97\xF1\x82𑗏o\x82\xB7\x82郂\x81[\x83h\x82\xAA\x82\xA0\x82\xE9\x82̂ŁA"NumEnter=" \x82\xCC
+\x8C\xE3\x82ɂ̓\x81\x83C\x83\x93\x83L\x81[\x82\xCC "Enter" \x82\xCC PC key code \x82\xF0\x8F\x91\x82\xA9\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+\x83\x81\x83C\x83\x93\x83L\x81[\x83p\x83b\x83h\x82\xCC "Enter" \x82Ɛ\x94\x92l\x83L\x81[\x83p\x83b\x83h\x82\xCC "Enter" \x82\xAA\x93\xAF\x82\xB6
+PC key code \x82𔭐\xB6\x82\xB7\x82\xE9\x83L\x81[\x83{\x81[\x83h(\x97Ⴆ\x82\xCE PC9801 \x83L\x81[\x83{\x81[\x83h)\x82̏ꍇ\x82\xCD
+\x92\x8D\x88ӂ\xAA\x95K\x97v\x82ł\xB7\x81B
+</p>
+
+<h3>[VT function keys] section</h3>
+
+<p>
+In this section, VT function keys are assigned to PC keys.
+</p>
+
+<pre>
+	Format:
+		<VT function key name>=<PC key code>
+
+	where:
+
+	  <VT function key name>
+		(Function keys of VT terminal)
+		Hold, Print, Break, F6, F7, F8, F9, F10, F11, F12,
+		F13, F14, Help, Do, F17, F18, F19, F20
+		("User defined keys" of VT terminal)
+		UDK6, UDK7, UDK8, UDK9, UDK10, UDK11, UDK12, UDK13,
+		UDK14, UDK15, UDK16, UDK17, UDK18, UDK19, UDK20
+
+	  <PC key code>
+		PC key code (decimal number)
+
+	Example:
+		F6=64
+</pre>
+
+<h3>[X function keys] section</h3>
+
+<p>
+In this section, Xterm F1-F5 keys and BackTab key are assigned to PC keys.
+</p>
+
+<pre>
+	Format:
+		<Xterm function key name>=<PC key code>
+
+	where:
+
+	  <Xterm function key name>
+		XF1, XF2, XF3, XF4, XF5, XBackTab
+
+	  <PC key code>
+		PC key code (decimal number)
+
+	Example:
+		XF1=59
+</pre>
+
+<h3>[Shortcut keys] section</h3>
+
+<p>
+In this section, Tera Term functions are assigned to PC keys.
+</p>
+
+<pre>
+	Format:
+		<Shortcut key name>=<PC key code>
+
+	where:
+	  <Shortcut key name>	Function
+	  --------------------------------------------
+	  EditCopy		[Edit] Copy command
+	  EditPaste		[Edit] Paste command
+	  EditPasteCR		[Edit] Paste<CR> command
+	  EditCLS		[Edit] Clear screen command
+	  EditCLB		[Edit] Clear buffer command
+	  ControlOpenTEK	[Control] Open TEK command
+	  ControlCloseTEK	[Control] Close TEK command
+	  LineUp		Scrolls up screen by 1 line
+	  LineDown		Scrolls down by 1 line
+	  PageUp		Scrolls up by 1 page
+	  PageDown		Scrolls down by 1 page
+	  BuffTop		Scrolls screen to buffer top
+	  BuffBottom		Scrolls screen to buffer bottom
+	  NextWin		Moves to the next Tera Term window
+	  PrevWin		Moves to the previous Tera Term window
+	  NextShownWin		Moves to the next Tera Term window (except minimized)
+	  PrevShownWin		Moves to the previous Tera Term window (except minimized)
+	  LocalEcho		Toggles the local echo status
+
+	  <PC key code>
+		PC key code (decimal number)
+
+	Example:
+		LineUp=1352
+</pre>
+
+<h3>[User keys] section</h3>
+
+<p>
+This section defines user keys for functions, sending a character
+string, executing a macro file or executing a menu command.
+</p>
+
+<pre>
+	Format:
+		<User key name>=<PC key code>,<Control flag>,
+				<Character string>
+
+	where:
+
+	  <User key name>
+		User1, User2, User3,...., User99
+		Maximum number of user keys is 99. 
+		For example, if you want to define ten user keys,
+		you must use the first ten names, from "User1" to "User10".
+
+	  <PC key code>
+		PC key code (decimal number)
+
+	  <Control flag>
+		Control flag which specifies how <character string>
+		is treated when the PC key is pressed.
+			0	<Character string> is sent as it is.
+			1	New-line codes in <Character string>
+				are converted by Tera Term and
+				the converted string is sent.
+			2	A macro file which has the name of
+				<Character string> is executed.
+			3	A Tera Term menu command specified
+				by the menu ID <Character string> is
+				executed.
+
+	  <Character string>
+		If <Control flag> is 0 or 1, <Character string>
+		represents the character string to be sent.
+		A non-printable character (control character) in
+		the string can be expressed as a "$" and ASCII code
+		in two-character hex number. For example, CR character
+		is expressed as "$0D". "$" itself is expressed as "$24".
+		See "Appendix A  ASCII CODE TABLE".
+
+		If <Control flag> is 2, <Character string> specifies
+		the macro file name to be executed.
+
+		If <Control flag> is 3, <Character string> is the menu
+		ID which specifies the menu command to be executed.
+		The menu ID should be expressed as a decimal number.
+		See "Appendix B  LIST OF MENU IDs".
+
+	Example:
+		User1=1083,0,telnet myhost
+		User2=1084,0,$0D$0A
+		User3=1085,1,$0D
+		User4=1086,2,test.ttl
+		User5=1087,3,50110
+</pre>
+
+<h2 id="note">NOTE</h2>
+
+<p>
+You can use a PC key code only once in the setup file.
+If you use a PC key code for multiple key assignments,
+the warning message "Key code XXX is used more than once" is
+displayed when the file is loaded by Tera Term. In this case,
+one of the assignments becomes effective and others are ignored.
+</p>
+
+<p>
+If you don't want to assign a key item to any PC key,
+use the word "off" like the following:
+</p>
+
+<pre>
+    EditCopy=off
+</pre>
+
+<h2>KEY COMBINATIONS</h2>
+
+<p>
+The following key combinations are acceptable to Tera Term and KEYCODE.EXE:
+</p>
+
+<pre>
+	Shift+key
+	Ctrl+key
+	Shift+Ctrl+key
+	Shift+Alt+key
+	Ctrl+Alt+key
+	Shift+Ctrl+Alt+key
+</pre>
+
+<p>
+Since some combinations (such as Alt+key) are used as shortcut keys of
+Tera Term and Windows, they don't have PC key codes and can't be specified
+in the keyboard setup file.
+</p>
+
+<p>
+[NOTE]
+You can specify `Alt+key' combination when Alt key uses meta key. Check
+`Meta key' under Keyboard of Setup menu. The key code can be obtained by
+KEYCODE.EXE, unfortunately the key code of `Alt+key' combination can not
+be obtained. Also, you obtain the key code and add 2048 on the value.
+</p>
+
+<p>
+For example, the `V' key code is 47, also `Alt+V' key code is 2095.
+</p>
+
+<pre>
+; Shift + Insert
+EditPaste=850
+</pre>
+
+<p>
+If you change above entry to `EditPaste=2095', you can paste by using
+`Alt+V' on condition that Meta key is pass through.
+</p>
+
+<p>
+You add in the following entry to [User keys] section in KEYBOARD.CNF if
+you wan to paster by using `Alt+V' remaining `Shift+Insert' function.
+</p>
+
+<pre>
+User1=2095,3,50230
+</pre>
+
+<h1>Q & A</h1>
+
+<p>
+<span class="qanda">Q.</span> Every time I run Tera Term, the warning message
+   "Key code XXX is used more than once" is displayed.<br>
+<span class="qanda">A.</span> See <a href="#note">NOTE</a>.
+</p>
+
+<p>
+<span class="qanda">Q.</span> I want to use the PC "F1" key as the VT100 PF1 key. I edit the 
+   keyboard setup file like the following but it does not work:<br>
+
+<pre>
+	[VT function keys]
+	F1=PF1		(This is wrong.)
+</pre>
+
+<span class="qanda">A.</span> The left hand side can not be the name of a **PC key** but
+   the name of a **VT terminal key**. The right hand side can not be
+   the name of a key but a PC key code.
+   See "3.1 FORMAT OF THE KEYBOARD SETUP FILE".
+   You should also be careful not to specify a PC key code more than
+   once in the setup file (see "3.2 NOTE").<br>
+
+   Edit the keyboard setup file like the following:<br>
+
+<pre>
+	[VT function keys]
+	PF1=59			(59 is the keycode for the F1 key.)
+	[X function keys]
+	;XF1=59			(Avoid specifying 59 twice.)
+	XF1=off			(Replace 59 by "off".)
+</pre>
+</p>
+
+<p>
+<span class="qanda">Q.</span> How to edit the keyboard setup file to assign the F1 key
+   for sending the escape sequence "ESC [ A"?<br>
+<span class="qanda">A.</span> You can send any character string by using a user key.
+   See <a href="#keyboard_cfg">FORMAT OF THE KEYBOARD SETUP FILE</a>.
+   You should also be careful not to specify a PC keycode more than
+   once in the setup file (see <a href="#note">NOTE</a>).<br>
+
+   Edit the keyboard setup file like the following:
+<pre>
+	[X function keys]
+	;XF1=59			(59 is the keycode for the F1 key.)
+					(Avoid specifying 59 twice.)
+	XF1=off			(Replace 59 by "off".)
+	[User keys]
+	User1=59,0,$1B[A		(The ASCII code for ESC is $1B.)
+</pre>
+</p>
+
 </body>
 </html>

Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/en/teraterm.hhc	2022-01-29 16:49:55 UTC (rev 9708)
@@ -514,13 +514,6 @@
 			<param name="Local" value="html\setup\keyboard.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
-			<UL>
-			<LI> <OBJECT type="text/sitemap">
-				<param name="Name" value="Keyboard setup file detail">
-				<param name="Local" value="html\reference\keyboard_cfg.html">
-				<param name="ImageNumber" value="11">
-			</OBJECT>
-			</UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="TTSSH known_hosts file">
 			<param name="Local" value="html\setup\knownfiles.html">

Modified: trunk/doc/ja/html/index.html
===================================================================
--- trunk/doc/ja/html/index.html	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/ja/html/index.html	2022-01-29 16:49:55 UTC (rev 9708)
@@ -125,10 +125,7 @@
 <UL>
  <LI><A HREF="setup/folder.html">\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xAA\x92u\x82\xA9\x82\xEA\x82\xE9\x83t\x83H\x83\x8B\x83_</A></LI>
  <LI><A HREF="setup/teraterm.html">Tera Term \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B</A></LI>
- <LI><A HREF="setup/keyboard.html">\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B \x8AT\x97v</A></LI>
- <UL>
-   <LI><A HREF="reference/keyboard_cfg.html">\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B \x8Fڍ\xD7</A></LI>
- </UL>
+ <LI><A HREF="setup/keyboard.html">\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B</A></LI>
  <LI><A HREF="setup/knownfiles.html">TTSSH known_hosts \x83t\x83@\x83C\x83\x8B</A></LI>
  <LI><A HREF="setup/cygterm.html">CygTerm+ \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B</A></LI>
  <LI><A HREF="setup/lng.html">\x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B</A></LI>

Deleted: trunk/doc/ja/html/reference/keyboard_cfg.md
===================================================================
--- trunk/doc/ja/html/reference/keyboard_cfg.md	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/ja/html/reference/keyboard_cfg.md	2022-01-29 16:49:55 UTC (rev 9708)
@@ -1,278 +0,0 @@
-# キーボード設定ファイルについて
-
-## キーボード設定ファイルの形式
-
-キーボード設定ファイルの中で用いられる PC key code は PC の各キーまたはキーの
-組み合わせに対応した数値で、使用するキーボードによって異なります。
-
-キーボード設定ファイルには次の6つのセクションが存在します。
-
-- [VT editor keypad]
-- [VT numeric keypad]
-- [VT function keys]
-- [X function keys]
-- [Shortcut keys]
-- [User keys]
-
-### [VT editor keypad] セクション
-
-VT 端末のエディターキーを PC キーに割り当てます。
-
-	形式:
-		<VT editor key name>=<PC key code>
-
-	<VT editor key name>
-		Up, Down, Right, Left, Find, Insert, Remove, Select,
-		Prev, Next
-
-	<PC key code>
-		PC key code (10進数)
-
-	例:
-		Up=328
-
-### [VT numeric keypad] セクション
-
-VT端末の数値キーを PC キーに割り当てます。
-
-	形式:
-		<VT numeric key name>=<PC key code>
-
-	<VT numeric key name>
-		Num0, Num1, Num2, Num3, Num4, Num5, Num6, Num7, Num8,
-		Num9, NumMinus, NumComma, NumPeriod, NumEnter, PF1,
-		PF2, PF3, PF4
-
-	<PC key code>
-		PC key code (10進数)
-
-	例:
-		Num0=82
-
-#### 注意
-
-VT 端末ではメインキーパッドの "Enter" キーと数値キーパッドの
-"Enter" キーが違う文字列を送出するモードがあるので、"NumEnter=" の
-後にはメインキーの "Enter" の PC key code を書かないでください。
-メインキーパッドの "Enter" と数値キーパッドの "Enter" が同じ
-PC key code を発生するキーボード(例えば PC9801 キーボード)の場合は
-注意が必要です。
-
-### [VT function keys] セクション
-
-VT 端末のファンクションキーを PC キーに割り当てます。
-
-	形式:
-		<VT function key name>=<PC key code>
-
-	<VT function key name>
-		(VT 端末のファンクションキー)
-		Hold, Print, Break, F6, F7, F8, F9, F10, F11, F12,
-		F13, F14, Help, Do, F17, F18, F19, F20
-		(VT 端末の"ユーザー定義キー")
-		UDK6, UDK7, UDK8, UDK9, UDK10, UDK11, UDK12, UDK13,
-		UDK14, UDK15, UDK16, UDK17, UDK18, UDK19, UDK20
-
-	<PC key code>
-		PC key code (10進数)
-
-	例:
-		F6=64
-
-### [X function keys] セクション
-
-Xterm の F1-F5 キー、およびバックタブキーを PC キーに割り当てます。
-
-	形式:
-		<Xterm function key name>=<PC key code>
-
-	<Xterm function key name>
-		XF1, XF2, XF3, XF4, XF5, XBackTab
-
-	<PC key code>
-		PC key code (10進数)
-
-	例:
-		XF1=59
-
-### [Shortcut keys] セクション
-
-Tera Term の機能をPC キーに割り当てます。
-
-	形式:
-		<Shortcut key name>=<PC key code>
-
-	<Shortcut key name>	機能
-	---------------------------------------------------------
-	EditCopy		[Edit] Copy コマンド
-	EditPaste		[Edit] Paste コマンド
-	EditPasteCR		[Edit] Paste<CR> コマンド
-	EditCLS 		[Edit] Clear screen コマンド
-	EditCLB 		[Edit] Clear buffer コマンド
-	ControlOpenTEK		[Control] Open TEK コマンド
-	ControlCloseTEK 	[Control] Close TEK コマンド
-	LineUp			一行スクロールアップ
-	LineDown		一行スクロールダウン
-	PageUp			一ページスクロールアップ
-	PageDown		一ページスクロールダウン
-	BuffTop 		バッファー先頭へスクロール
-	BuffBottom		バッファー最後へスクロール
-	NextWin 		次の Tera Term ウィンドウへ移動
-	PrevWin 		前の Tera Term ウィンドウへ移動
-	NextShownWin 		次の最小化されていない Tera Term ウィンドウへ移動
-	PrevShownWin 		前の最小化されていない Tera Term ウィンドウへ移動
-	LocalEcho		Local echo を on/off する
-
-	<PC key code>
-		PC key code (10進数)
-
-	例:
-		LineUp=1352
-
-### [User keys] セクション
-
-ユーザーキーと、そのキーを押したときに実行される機能
-(文字列の送出、マクロファイルの実行、メニューコマンドの実行)を
-定義します。
-
-	形式:
-		<User key name>=<PC key code>,<Control flag>,<文字列>
-		<User key name>=off
-
-	<User key name>
-		User1, User2, User3,...., User99
-		最大99個まで設定可能
-
-	<PC key code>
-		PC key code (10進数)
-
-	<Control flag>
-		キーを押したときに <文字列> をどのように取り扱うかを指定
-		するフラグ。
-			0	<文字列>をそのまま(8bit/文字として)送出する。
-			1	<文字列>に含まれる文字や改行コードを
-				Tera Term の設定にあわせて変換し、変換
-				された文字列を送出する。
-			2	<文字列>のファイル名のマクロファイルを
-				実行する。
-			3	メニュー ID <文字列> で指定される
-				Tera Term のメニューコマンドを実行する。
-
-	<文字列>:
-		<Control flag> が 0 または 1 の場合、キーを押したときに
-		送出される文字列。表示不可能な文字(制御文字等)はその
-		文字コードを $ と2文字の16進数で表現する。
-		(例: CR 文字は '$0D')。"$" そのものは "$24" で表現する。
-		Tera Term 内部では設定ファイルはUTF-16(16bit/文字)で処理している。
-		<Control flag> が 0 の場合、8bit/文字として処理する。
-		U+0000..U+00FFは$00..$FFとしてそのまま送信する。
-		それ以外は$FFとして送信する。
-			U+0000..U+007F=基本ラテン文字
-			U+0080..U+00FF=ラテン1補助
-		<Control flag> が 1 の場合、
-		Unicode文字列として処理する。
-
-		<Control flag> が 2 の場合、
-		実行されるマクロファイルのファイル名。
-
-		<Control flag> が 3 の場合、
-		実行されるメニューコマンドのメニュー ID (数字)。
-		メニュー IDについては「メニュー ID 表」参照。
-
-	例:
-		User1=1083,0,telnet myhost
-		User2=1084,0,$0D$0A
-		User3=1085,1,こんにちは。
-		User4=1086,2,test.ttl
-		User5=1087,3,50110
-
-## 注意
-
-1つの PC key code はキーボード設定ファイルの中で一回だけ使用することが
-できます。もし、1つの PC key code を複数のキー定義で使用した場合、
-Tera Term がキーボード設定ファイルを読み込んだときに、
-"Key code XXX is used more than once" という警告メッセージが表示されます。
-この場合ある一つのキー定義だけが有効になり、その他は無視されます。
-
-あるキー設定項目にどの PC キーも割り当てたくない場合は、以下のように
-PC key code の代わりに "off" を指定してください。
-
-    EditCopy=off
-
-## 可能なキーの組み合わせ
-
-キーボード設定ファイルで設定可能な PC のキーは, KEYCODE.EXE で PC key code が
-表示されるキーです。単一のキーだけでなく、Ctrl, Shift, Alt を用いたキーの組み
-合わせでも PC key code を表示させることができます。可能な組み合わせを
-以下に示します。
-
-	Shift+key
-	Ctrl+key
-	Shift+Ctrl+key
-	Shift+Alt+key
-	Ctrl+Alt+key
-	Shift+Ctrl+Alt+key
-
-Tera Term や Windows のショートカットキーに割り当てられているキーの組み合わせ
-(例えば Alt+key など)はキーボード設定ファイルで指定できません。
-
-ただし、Altキーをメタ・キーとして使う設定にしている場合(設定->キーボードにある
-Metaキーにチェックをいれている状態)はAlt+keyも指定する事ができます。
-キーコードは KEYCODE.EXE で調べられますが、単体のAltキーとの組合せには
-対応していません。Altキーとの組合せでのキーコードを調べるには、単独での
-キーコードを調べて、その値に2048を足してください。
-
-たとえば、Alt+Vのキーコードは V が 47 なので、2095 となります。
-
-    ; Shift + Insert
-    EditPaste=850
-
-これを例えば EditPaste=2095 に変更すれば、Metaキーをパススルーにしていても
-Alt+Vで張り付けができるようになります。
-
-Shift+Insertを残したままAlt+Vでの張り付けを行いたい場合は、KEYBOARD.CNF の
-[User keys]セクションに以下の設定を追加します。
-
-    User1=2095,3,50230
-
-## Q & A
-
-- Q. Tera Term を起動するたびに "Key code XXX is used more than once" という
-   メッセージがでる。
-- A. 「注意」を参照。
-
-- Q. PC の F1 キーを VT100 の PF1 キーとして使いたい。以下のように設定したが
-   うまくいかない。
-
-	[VT function keys]
-	F1=PF1		(これはまちがい)
-
-- A. 左辺は **PC** のキーの名前ではなく **VT端末** のキーの名前を指定しなけ
-   ればなりません。また、右辺にはキーの名前ではなく、キーコードを指定して
-   ください。
-   また、キー設定を変えるときは、キーコードの重複使用をしないようにして
-   ください。
-
-   以下のように設定してください。
-
-	[VT function keys]
-	PF1=59			(59 は F1 キーのキーコード)
-	[X function keys]
-	;XF1=59			(キーコード 59 の重複使用をさける)
-	XF1=off			("off" で置き換える)
-
-- Q. F1 キーを押したときにエスケープシーケンス ESC [ A を送出するように
-   するための設定方法は?
-- A. ユーザーキーを使えば、好きな文字列を送出することができます。
-   くわしくは、「3.1 キーボード設定ファイルの形式」を読んでください。
-   また、キー設定を変えるときは、キーコードの重複使用をしないようにして
-   ください(「3.2 注意」を参照)。
-
-   以下のように設定してください。
-
-	[X function keys]
-	;XF1=59			(F1 キーのキーコード 59 の重複使用をさける)
-	XF1=off			("off" で置き換える)
-	[User keys]
-	User1=59,0,$1B[A		(ESC の ASCII コードは $1B)
-

Modified: trunk/doc/ja/html/setup/keyboard.html
===================================================================
--- trunk/doc/ja/html/setup/keyboard.html	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/ja/html/setup/keyboard.html	2022-01-29 16:49:55 UTC (rev 9708)
@@ -73,11 +73,352 @@
 </p>
 
 <p>
-\x83t\x83@\x83C\x83\x8B\x8C`\x8E\xAE\x82ɂ‚\xA2\x82ẮA<A HREF="../reference/keyboard_cfg.html">\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x8Fڍ\xD7(keyboard_cfg.md)</A>\x82\xF0\x8EQ\x8FƂ\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+\x83L\x81[\x83R\x81[\x83h\x82\xCD keycode.exe \x82Œ\xB2\x82ׂ邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B<A HREF="../reference/keycode.txt">keycode.txt</A>\x82\xF0\x8EQ\x8FƂ\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+
+<h1>\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x8Fڍ\xD7</h1>
+
+<h2 id="keyboard_cfg">\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̌`\x8E\xAE</h2>
+
+<p>
+\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̒\x86\x82ŗp\x82\xA2\x82\xE7\x82\xEA\x82\xE9 PC key code \x82\xCD PC \x82̊e\x83L\x81[\x82܂\xBD\x82̓L\x81[\x82\xCC
+\x91g\x82ݍ\x87\x82킹\x82ɑΉ\x9E\x82\xB5\x82\xBD\x90\x94\x92l\x82ŁA\x8Eg\x97p\x82\xB7\x82\xE9\x83L\x81[\x83{\x81[\x83h\x82ɂ\xE6\x82\xC1\x82ĈقȂ\xE8\x82܂\xB7\x81B
 </p>
 
 <p>
-\x83L\x81[\x83R\x81[\x83h\x82\xCD keycode.exe \x82Œ\xB2\x82ׂ邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B<A HREF="../reference/keycode.txt">keycode.txt</A>\x82\xF0\x8EQ\x8FƂ\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82ɂ͎\x9F\x82\xCC6\x82‚̃Z\x83N\x83V\x83\x87\x83\x93\x82\xAA\x91\xB6\x8D݂\xB5\x82܂\xB7\x81B
+</p>
 
+<ul>
+<li>[VT editor keypad]
+<li>[VT numeric keypad]
+<li>[VT function keys]
+<li>[X function keys]
+<li>[Shortcut keys]
+<li>[User keys]
+</ul>
+
+<h3>[VT editor keypad] \x83Z\x83N\x83V\x83\x87\x83\x93</h3>
+
+<p>
+VT \x92[\x96\x96\x82̃G\x83f\x83B\x83^\x81[\x83L\x81[\x82\xF0 PC \x83L\x81[\x82Ɋ\x84\x82蓖\x82Ă܂\xB7\x81B
+</p>
+
+<pre>
+	\x8C`\x8E\xAE:
+		<VT editor key name>=<PC key code>
+
+	<VT editor key name>
+		Up, Down, Right, Left, Find, Insert, Remove, Select,
+		Prev, Next
+
+	<PC key code>
+		PC key code (10\x90i\x90\x94)
+
+	\x97\xE1:
+		Up=328
+</pre>
+
+<h3>[VT numeric keypad] \x83Z\x83N\x83V\x83\x87\x83\x93</h3>
+
+<p>
+VT\x92[\x96\x96\x82̐\x94\x92l\x83L\x81[\x82\xF0 PC \x83L\x81[\x82Ɋ\x84\x82蓖\x82Ă܂\xB7\x81B
+</p>
+
+<pre>
+	\x8C`\x8E\xAE:
+		<VT numeric key name>=<PC key code>
+
+	<VT numeric key name>
+		Num0, Num1, Num2, Num3, Num4, Num5, Num6, Num7, Num8,
+		Num9, NumMinus, NumComma, NumPeriod, NumEnter, PF1,
+		PF2, PF3, PF4
+
+	<PC key code>
+		PC key code (10\x90i\x90\x94)
+
+	\x97\xE1:
+		Num0=82
+</pre>
+
+<h4>\x92\x8D\x88\xD3</h4>
+
+<p>
+VT \x92[\x96\x96\x82ł̓\x81\x83C\x83\x93\x83L\x81[\x83p\x83b\x83h\x82\xCC "Enter" \x83L\x81[\x82Ɛ\x94\x92l\x83L\x81[\x83p\x83b\x83h\x82\xCC
+"Enter" \x83L\x81[\x82\xAA\x88Ⴄ\x95\xB6\x8E\x9A\x97\xF1\x82𑗏o\x82\xB7\x82郂\x81[\x83h\x82\xAA\x82\xA0\x82\xE9\x82̂ŁA"NumEnter=" \x82\xCC
+\x8C\xE3\x82ɂ̓\x81\x83C\x83\x93\x83L\x81[\x82\xCC "Enter" \x82\xCC PC key code \x82\xF0\x8F\x91\x82\xA9\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+\x83\x81\x83C\x83\x93\x83L\x81[\x83p\x83b\x83h\x82\xCC "Enter" \x82Ɛ\x94\x92l\x83L\x81[\x83p\x83b\x83h\x82\xCC "Enter" \x82\xAA\x93\xAF\x82\xB6
+PC key code \x82𔭐\xB6\x82\xB7\x82\xE9\x83L\x81[\x83{\x81[\x83h(\x97Ⴆ\x82\xCE PC9801 \x83L\x81[\x83{\x81[\x83h)\x82̏ꍇ\x82\xCD
+\x92\x8D\x88ӂ\xAA\x95K\x97v\x82ł\xB7\x81B
+</p>
+
+<h3>[VT function keys] \x83Z\x83N\x83V\x83\x87\x83\x93</h3>
+
+<p>
+VT \x92[\x96\x96\x82̃t\x83@\x83\x93\x83N\x83V\x83\x87\x83\x93\x83L\x81[\x82\xF0 PC \x83L\x81[\x82Ɋ\x84\x82蓖\x82Ă܂\xB7\x81B
+</p>
+
+<pre>
+	\x8C`\x8E\xAE:
+		<VT function key name>=<PC key code>
+
+	<VT function key name>
+		(VT \x92[\x96\x96\x82̃t\x83@\x83\x93\x83N\x83V\x83\x87\x83\x93\x83L\x81[)
+		Hold, Print, Break, F6, F7, F8, F9, F10, F11, F12,
+		F13, F14, Help, Do, F17, F18, F19, F20
+		(VT \x92[\x96\x96\x82\xCC"\x83\x86\x81[\x83U\x81[\x92\xE8\x8B`\x83L\x81[")
+		UDK6, UDK7, UDK8, UDK9, UDK10, UDK11, UDK12, UDK13,
+		UDK14, UDK15, UDK16, UDK17, UDK18, UDK19, UDK20
+
+	<PC key code>
+		PC key code (10\x90i\x90\x94)
+
+	\x97\xE1:
+		F6=64
+</pre>
+
+<h3>[X function keys] \x83Z\x83N\x83V\x83\x87\x83\x93</h3>
+
+<p>
+Xterm \x82\xCC F1-F5 \x83L\x81[\x81A\x82\xA8\x82\xE6\x82уo\x83b\x83N\x83^\x83u\x83L\x81[\x82\xF0 PC \x83L\x81[\x82Ɋ\x84\x82蓖\x82Ă܂\xB7\x81B
+</p>
+
+<pre>
+	\x8C`\x8E\xAE:
+		<Xterm function key name>=<PC key code>
+
+	<Xterm function key name>
+		XF1, XF2, XF3, XF4, XF5, XBackTab
+
+	<PC key code>
+		PC key code (10\x90i\x90\x94)
+
+	\x97\xE1:
+		XF1=59
+</pre>
+
+<h3>[Shortcut keys] \x83Z\x83N\x83V\x83\x87\x83\x93</h3>
+
+<p>
+Tera Term \x82̋@\x94\\x82\xF0PC \x83L\x81[\x82Ɋ\x84\x82蓖\x82Ă܂\xB7\x81B
+</p>
+
+<pre>
+	\x8C`\x8E\xAE:
+		<Shortcut key name>=<PC key code>
+
+	<Shortcut key name>	\x8B@\x94\
+	---------------------------------------------------------
+	EditCopy		[Edit] Copy \x83R\x83}\x83\x93\x83h
+	EditPaste		[Edit] Paste \x83R\x83}\x83\x93\x83h
+	EditPasteCR		[Edit] Paste<CR> \x83R\x83}\x83\x93\x83h
+	EditCLS 		[Edit] Clear screen \x83R\x83}\x83\x93\x83h
+	EditCLB 		[Edit] Clear buffer \x83R\x83}\x83\x93\x83h
+	ControlOpenTEK		[Control] Open TEK \x83R\x83}\x83\x93\x83h
+	ControlCloseTEK 	[Control] Close TEK \x83R\x83}\x83\x93\x83h
+	LineUp			\x88\xEA\x8Ds\x83X\x83N\x83\x8D\x81[\x83\x8B\x83A\x83b\x83v
+	LineDown		\x88\xEA\x8Ds\x83X\x83N\x83\x8D\x81[\x83\x8B\x83_\x83E\x83\x93
+	PageUp			\x88\xEA\x83y\x81[\x83W\x83X\x83N\x83\x8D\x81[\x83\x8B\x83A\x83b\x83v
+	PageDown		\x88\xEA\x83y\x81[\x83W\x83X\x83N\x83\x8D\x81[\x83\x8B\x83_\x83E\x83\x93
+	BuffTop 		\x83o\x83b\x83t\x83@\x81[\x90擪\x82փX\x83N\x83\x8D\x81[\x83\x8B
+	BuffBottom		\x83o\x83b\x83t\x83@\x81[\x8DŌ\xE3\x82փX\x83N\x83\x8D\x81[\x83\x8B
+	NextWin 		\x8E\x9F\x82\xCC Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82ֈړ\xAE
+	PrevWin 		\x91O\x82\xCC Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82ֈړ\xAE
+	NextShownWin 		\x8E\x9F\x82̍ŏ\xAC\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2 Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82ֈړ\xAE
+	PrevShownWin 		\x91O\x82̍ŏ\xAC\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2 Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82ֈړ\xAE
+	LocalEcho		Local echo \x82\xF0 on/off \x82\xB7\x82\xE9
+
+	<PC key code>
+		PC key code (10\x90i\x90\x94)
+
+	\x97\xE1:
+		LineUp=1352
+</pre>
+
+<h3>[User keys] \x83Z\x83N\x83V\x83\x87\x83\x93</h3>
+
+<p>
+\x83\x86\x81[\x83U\x81[\x83L\x81[\x82ƁA\x82\xBB\x82̃L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x82Ɏ\xC0\x8Ds\x82\xB3\x82\xEA\x82\xE9\x8B@\x94\
+(\x95\xB6\x8E\x9A\x97\xF1\x82̑\x97\x8Fo\x81A\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82̎\xC0\x8Ds\x81A\x83\x81\x83j\x83\x85\x81[\x83R\x83}\x83\x93\x83h\x82̎\xC0\x8Ds)\x82\xF0
+\x92\xE8\x8B`\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<pre>
+	\x8C`\x8E\xAE:
+		<User key name>=<PC key code>,<Control flag>,<\x95\xB6\x8E\x9A\x97\xF1>
+		<User key name>=off
+
+	<User key name>
+		User1, User2, User3,...., User99
+		\x8Dő\xE599\x8C‚܂Őݒ\xE8\x89”\
+
+	<PC key code>
+		PC key code (10\x90i\x90\x94)
+
+	<Control flag>
+		\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x82\xC9 <\x95\xB6\x8E\x9A\x97\xF1> \x82\xF0\x82ǂ̂悤\x82Ɏ\xE6\x82舵\x82\xA4\x82\xA9\x82\xF0\x8Ew\x92\xE8
+		\x82\xB7\x82\xE9\x83t\x83\x89\x83O\x81B
+			0	<\x95\xB6\x8E\x9A\x97\xF1>\x82\xF0\x82\xBB\x82̂܂\xDC(8bit/\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82\xC4)\x91\x97\x8Fo\x82\xB7\x82\xE9\x81B
+			1	<\x95\xB6\x8E\x9A\x97\xF1>\x82Ɋ܂܂\xEA\x82镶\x8E\x9A\x82\xE2\x89\xFC\x8Ds\x83R\x81[\x83h\x82\xF0
+				Tera Term \x82̐ݒ\xE8\x82ɂ\xA0\x82킹\x82ĕϊ\xB7\x82\xB5\x81A\x95ϊ\xB7
+				\x82\xB3\x82ꂽ\x95\xB6\x8E\x9A\x97\xF1\x82𑗏o\x82\xB7\x82\xE9\x81B
+			2	<\x95\xB6\x8E\x9A\x97\xF1>\x82̃t\x83@\x83C\x83\x8B\x96\xBC\x82̃}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82\xF0
+				\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
+			3	\x83\x81\x83j\x83\x85\x81[ ID <\x95\xB6\x8E\x9A\x97\xF1> \x82Ŏw\x92肳\x82\xEA\x82\xE9
+				Tera Term \x82̃\x81\x83j\x83\x85\x81[\x83R\x83}\x83\x93\x83h\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
+
+	<\x95\xB6\x8E\x9A\x97\xF1>:
+		<Control flag> \x82\xAA 0 \x82܂\xBD\x82\xCD 1 \x82̏ꍇ\x81A\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x82\xC9
+		\x91\x97\x8Fo\x82\xB3\x82\xEA\x82镶\x8E\x9A\x97\xF1\x81B\x95\\x8E\xA6\x95s\x89”\\x82ȕ\xB6\x8E\x9A(\x90\xA7\x8C䕶\x8E\x9A\x93\x99)\x82͂\xBB\x82\xCC
+		\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xF0 $ \x82\xC62\x95\xB6\x8E\x9A\x82\xCC16\x90i\x90\x94\x82ŕ\\x8C\xBB\x82\xB7\x82\xE9\x81B
+		(\x97\xE1: CR \x95\xB6\x8E\x9A\x82\xCD '$0D')\x81B"$" \x82\xBB\x82̂\xE0\x82̂\xCD "$24" \x82ŕ\\x8C\xBB\x82\xB7\x82\xE9\x81B
+		Tera Term \x93\xE0\x95\x94\x82ł͐ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCDUTF-16(16bit/\x95\xB6\x8E\x9A)\x82ŏ\x88\x97\x9D\x82\xB5\x82Ă\xA2\x82\xE9\x81B
+		<Control flag> \x82\xAA 0 \x82̏ꍇ\x81A8bit/\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82ď\x88\x97\x9D\x82\xB7\x82\xE9\x81B
+		U+0000..U+00FF\x82\xCD$00..$FF\x82Ƃ\xB5\x82Ă\xBB\x82̂܂ܑ\x97\x90M\x82\xB7\x82\xE9\x81B
+		\x82\xBB\x82\xEA\x88ȊO\x82\xCD$FF\x82Ƃ\xB5\x82đ\x97\x90M\x82\xB7\x82\xE9\x81B
+			U+0000..U+007F=\x8A\xEE\x96{\x83\x89\x83e\x83\x93\x95\xB6\x8E\x9A
+			U+0080..U+00FF=\x83\x89\x83e\x83\x931\x95⏕
+		<Control flag> \x82\xAA 1 \x82̏ꍇ\x81A
+		Unicode\x95\xB6\x8E\x9A\x97\xF1\x82Ƃ\xB5\x82ď\x88\x97\x9D\x82\xB7\x82\xE9\x81B
+
+		<Control flag> \x82\xAA 2 \x82̏ꍇ\x81A
+		\x8E\xC0\x8Ds\x82\xB3\x82\xEA\x82\xE9\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82̃t\x83@\x83C\x83\x8B\x96\xBC\x81B
+
+		<Control flag> \x82\xAA 3 \x82̏ꍇ\x81A
+		\x8E\xC0\x8Ds\x82\xB3\x82\xEA\x82郁\x83j\x83\x85\x81[\x83R\x83}\x83\x93\x83h\x82̃\x81\x83j\x83\x85\x81[ ID (\x90\x94\x8E\x9A)\x81B
+		\x83\x81\x83j\x83\x85\x81[ ID\x82ɂ‚\xA2\x82Ắu\x83\x81\x83j\x83\x85\x81[ ID \x95\\x81v\x8EQ\x8FƁB
+
+	\x97\xE1:
+		User1=1083,0,telnet myhost
+		User2=1084,0,$0D$0A
+		User3=1085,1,\x82\xB1\x82\xF1\x82ɂ\xBF\x82́B
+		User4=1086,2,test.ttl
+		User5=1087,3,50110
+</pre>
+
+<h2 id="note">\x92\x8D\x88\xD3</h2>
+
+<p>
+1\x82‚\xCC PC key code \x82̓L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̒\x86\x82ň\xEA\x89񂾂\xAF\x8Eg\x97p\x82\xB7\x82邱\x82Ƃ\xAA
+\x82ł\xAB\x82܂\xB7\x81B\x82\xE0\x82\xB5\x81A1\x82‚\xCC PC key code \x82𕡐\x94\x82̃L\x81[\x92\xE8\x8B`\x82Ŏg\x97p\x82\xB5\x82\xBD\x8Fꍇ\x81A
+Tera Term \x82\xAA\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xF0\x93ǂݍ\x9E\x82񂾂Ƃ\xAB\x82ɁA
+"Key code XXX is used more than once" \x82Ƃ\xA2\x82\xA4\x8Cx\x8D\x90\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82܂\xB7\x81B
+\x82\xB1\x82̏ꍇ\x82\xA0\x82\xE9\x88\xEA\x82‚̃L\x81[\x92\xE8\x8B`\x82\xBE\x82\xAF\x82\xAA\x97L\x8C\xF8\x82ɂȂ\xE8\x81A\x82\xBB\x82̑\xBC\x82͖\xB3\x8E\x8B\x82\xB3\x82\xEA\x82܂\xB7\x81B
+</p>
+
+<p>
+\x82\xA0\x82\xE9\x83L\x81[\x90ݒ荀\x96ڂɂǂ\xCC PC \x83L\x81[\x82\xE0\x8A\x84\x82蓖\x82Ă\xBD\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x82́A\x88ȉ\xBA\x82̂悤\x82\xC9
+PC key code \x82̑\xE3\x82\xED\x82\xE8\x82\xC9 "off" \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<pre>
+    EditCopy=off
+</pre>
+
+<h2>\x89”\\x82ȃL\x81[\x82̑g\x82ݍ\x87\x82킹</h2>
+
+<p>
+\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82Őݒ\xE8\x89”\\x82\xC8 PC \x82̃L\x81[\x82\xCD, KEYCODE.EXE \x82\xC5 PC key code \x82\xAA
+\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83L\x81[\x82ł\xB7\x81B\x92P\x88\xEA\x82̃L\x81[\x82\xBE\x82\xAF\x82łȂ\xAD\x81ACtrl, Shift, Alt \x82\xF0\x97p\x82\xA2\x82\xBD\x83L\x81[\x82̑g\x82\xDD
+\x8D\x87\x82킹\x82ł\xE0 PC key code \x82\xF0\x95\\x8E\xA6\x82\xB3\x82\xB9\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B\x89”\\x82ȑg\x82ݍ\x87\x82킹\x82\xF0
+\x88ȉ\xBA\x82Ɏ\xA6\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<pre>
+	Shift+key
+	Ctrl+key
+	Shift+Ctrl+key
+	Shift+Alt+key
+	Ctrl+Alt+key
+	Shift+Ctrl+Alt+key
+</pre>
+
+<p>
+Tera Term \x82\xE2 Windows \x82̃V\x83\x87\x81[\x83g\x83J\x83b\x83g\x83L\x81[\x82Ɋ\x84\x82蓖\x82Ă\xE7\x82\xEA\x82Ă\xA2\x82\xE9\x83L\x81[\x82̑g\x82ݍ\x87\x82킹
+(\x97Ⴆ\x82\xCE Alt+key \x82Ȃ\xC7)\x82̓L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82Ŏw\x92\xE8\x82ł\xAB\x82܂\xB9\x82\xF1\x81B
+</p>
+
+<p>
+\x82\xBD\x82\xBE\x82\xB5\x81AAlt\x83L\x81[\x82\xF0\x83\x81\x83^\x81E\x83L\x81[\x82Ƃ\xB5\x82Ďg\x82\xA4\x90ݒ\xE8\x82ɂ\xB5\x82Ă\xA2\x82\xE9\x8Fꍇ(\x90ݒ\xE8->\x83L\x81[\x83{\x81[\x83h\x82ɂ\xA0\x82\xE9
+Meta\x83L\x81[\x82Ƀ`\x83F\x83b\x83N\x82\xF0\x82\xA2\x82\xEA\x82Ă\xA2\x82\xE9\x8F\xF3\x91\xD4)\x82\xCDAlt+key\x82\xE0\x8Ew\x92肷\x82鎖\x82\xAA\x82ł\xAB\x82܂\xB7\x81B
+\x83L\x81[\x83R\x81[\x83h\x82\xCD KEYCODE.EXE \x82Œ\xB2\x82ׂ\xE7\x82\xEA\x82܂\xB7\x82\xAA\x81A\x92P\x91̂\xCCAlt\x83L\x81[\x82Ƃ̑g\x8D\x87\x82\xB9\x82ɂ\xCD
+\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82܂\xB9\x82\xF1\x81BAlt\x83L\x81[\x82Ƃ̑g\x8D\x87\x82\xB9\x82ł̃L\x81[\x83R\x81[\x83h\x82𒲂ׂ\xE9\x82ɂ́A\x92P\x93Ƃł\xCC
+\x83L\x81[\x83R\x81[\x83h\x82𒲂ׂāA\x82\xBB\x82̒l\x82\xC92048\x82𑫂\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<p>
+\x82\xBD\x82Ƃ\xA6\x82΁AAlt+V\x82̃L\x81[\x83R\x81[\x83h\x82\xCD V \x82\xAA 47 \x82Ȃ̂ŁA2095 \x82ƂȂ\xE8\x82܂\xB7\x81B
+</p>
+
+<pre>
+    ; Shift + Insert
+    EditPaste=850
+</pre>
+
+<p>
+\x82\xB1\x82\xEA\x82\xF0\x97Ⴆ\x82\xCE EditPaste=2095 \x82ɕύX\x82\xB7\x82\xEA\x82΁AMeta\x83L\x81[\x82\xF0\x83p\x83X\x83X\x83\x8B\x81[\x82ɂ\xB5\x82Ă\xA2\x82Ă\xE0
+Alt+V\x82Œ\xA3\x82\xE8\x95t\x82\xAF\x82\xAA\x82ł\xAB\x82\xE9\x82悤\x82ɂȂ\xE8\x82܂\xB7\x81B
+</p>
+
+<p>
+Shift+Insert\x82\xF0\x8Ec\x82\xB5\x82\xBD\x82܂\xDCAlt+V\x82ł̒\xA3\x82\xE8\x95t\x82\xAF\x82\xF0\x8Ds\x82\xA2\x82\xBD\x82\xA2\x8Fꍇ\x82́AKEYBOARD.CNF \x82\xCC
+[User keys]\x83Z\x83N\x83V\x83\x87\x83\x93\x82Ɉȉ\xBA\x82̐ݒ\xE8\x82\xF0\x92lj\xC1\x82\xB5\x82܂\xB7\x81B
+</p>
+
+<pre>
+    User1=2095,3,50230
+</pre>
+
+<h1>Q & A</h1>
+
+<p>
+<span class="qanda">Q.</span> Tera Term \x82\xF0\x8BN\x93\xAE\x82\xB7\x82邽\x82т\xC9 "Key code XXX is used more than once" \x82Ƃ\xA2\x82\xA4
+   \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x82ł\xE9\x81B<br>
+<span class="qanda">A.</span> <a href="#note">\x92\x8D\x88\xD3</a>\x82\xF0\x8EQ\x8FƁB
+</p>
+
+<p>
+<span class="qanda">Q.</span> PC \x82\xCC F1 \x83L\x81[\x82\xF0 VT100 \x82\xCC PF1 \x83L\x81[\x82Ƃ\xB5\x82Ďg\x82\xA2\x82\xBD\x82\xA2\x81B\x88ȉ\xBA\x82̂悤\x82ɐݒ肵\x82\xBD\x82\xAA
+   \x82\xA4\x82܂\xAD\x82\xA2\x82\xA9\x82Ȃ\xA2\x81B<br>
+
+<pre>
+	[VT function keys]
+	F1=PF1		(\x82\xB1\x82\xEA\x82͂܂\xBF\x82\xAA\x82\xA2)
+</pre>
+
+<span class="qanda">A.</span> \x8D\xB6\x95ӂ\xCD **PC** \x82̃L\x81[\x82̖\xBC\x91O\x82ł͂Ȃ\xAD **VT\x92[\x96\x96** \x82̃L\x81[\x82̖\xBC\x91O\x82\xF0\x8Ew\x92肵\x82Ȃ\xAF
+   \x82\xEA\x82΂Ȃ\xE8\x82܂\xB9\x82\xF1\x81B\x82܂\xBD\x81A\x89E\x95ӂɂ̓L\x81[\x82̖\xBC\x91O\x82ł͂Ȃ\xAD\x81A\x83L\x81[\x83R\x81[\x83h\x82\xF0\x8Ew\x92肵\x82\xC4
+   \x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+   \x82܂\xBD\x81A\x83L\x81[\x90ݒ\xE8\x82\xF0\x95ς\xA6\x82\xE9\x82Ƃ\xAB\x82́A\x83L\x81[\x83R\x81[\x83h\x82̏d\x95\xA1\x8Eg\x97p\x82\xF0\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xC4
+   \x82\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
+
+   \x88ȉ\xBA\x82̂悤\x82ɐݒ肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
+
+<pre>
+	[VT function keys]
+	PF1=59			(59 \x82\xCD F1 \x83L\x81[\x82̃L\x81[\x83R\x81[\x83h)
+	[X function keys]
+	;XF1=59			(\x83L\x81[\x83R\x81[\x83h 59 \x82̏d\x95\xA1\x8Eg\x97p\x82\xF0\x82\xB3\x82\xAF\x82\xE9)
+	XF1=off			("off" \x82Œu\x82\xAB\x8A\xB7\x82\xA6\x82\xE9)
+</pre>
+</p>
+
+<p>
+<span class="qanda">Q.</span> F1 \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x82ɃG\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X ESC [ A \x82𑗏o\x82\xB7\x82\xE9\x82悤\x82\xC9
+   \x82\xB7\x82邽\x82߂̐ݒ\xE8\x95\xFB\x96@\x82\xCD?<br>
+<span class="qanda">A.</span> \x83\x86\x81[\x83U\x81[\x83L\x81[\x82\xF0\x8Eg\x82\xA6\x82΁A\x8DD\x82\xAB\x82ȕ\xB6\x8E\x9A\x97\xF1\x82𑗏o\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
+   \x82\xAD\x82킵\x82\xAD\x82́A<a href="#keyboard_cfg">\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̌`\x8E\xAE</a>\x82\xF0\x93ǂ\xF1\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+   \x82܂\xBD\x81A\x83L\x81[\x90ݒ\xE8\x82\xF0\x95ς\xA6\x82\xE9\x82Ƃ\xAB\x82́A\x83L\x81[\x83R\x81[\x83h\x82̏d\x95\xA1\x8Eg\x97p\x82\xF0\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xC4
+   \x82\xAD\x82\xBE\x82\xB3\x82\xA2(<a href="#note">\x92\x8D\x88\xD3</a>\x82\xF0\x8EQ\x8F\xC6)\x81B<br>
+
+   \x88ȉ\xBA\x82̂悤\x82ɐݒ肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+<pre>
+	[X function keys]
+	;XF1=59			(F1 \x83L\x81[\x82̃L\x81[\x83R\x81[\x83h 59 \x82̏d\x95\xA1\x8Eg\x97p\x82\xF0\x82\xB3\x82\xAF\x82\xE9)
+	XF1=off			("off" \x82Œu\x82\xAB\x8A\xB7\x82\xA6\x82\xE9)
+	[User keys]
+	User1=59,0,$1B[A		(ESC \x82\xCC ASCII \x83R\x81[\x83h\x82\xCD $1B)
+</pre>
+</p>
+
 </body>
 </html>

Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/ja/teraterm.hhc	2022-01-29 16:49:55 UTC (rev 9708)
@@ -552,13 +552,6 @@
 			<param name="Local" value="html\setup\keyboard.html">
 			<param name="ImageNumber" value="11">
 			</OBJECT>
-			<UL>
-			<LI> <OBJECT type="text/sitemap">
-				<param name="Name" value="\x83L\x81[\x83{\x81[\x83h\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x8Fڍ\xD7">
-				<param name="Local" value="html\reference\keyboard_cfg.html">
-				<param name="ImageNumber" value="11">
-			</OBJECT>
-			</UL>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="TTSSH known_hosts \x83t\x83@\x83C\x83\x8B">
 			<param name="Local" value="html\setup\knownfiles.html">

Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake	2022-01-28 23:49:12 UTC (rev 9707)
+++ trunk/doc/makechm.cmake	2022-01-29 16:49:55 UTC (rev 9708)
@@ -86,8 +86,6 @@
   ConvertHTML("-i ${REF_J}/build_with_cmake.md           -o ${REF_J}/build_with_cmake.html")
   ConvertHTML("-i ${REF_E}/build_library_with_cmake.md   -o ${REF_E}/build_library_with_cmake.html")
   ConvertHTML("-i ${REF_J}/build_library_with_cmake.md   -o ${REF_J}/build_library_with_cmake.html")
-  ConvertHTML("-i ${REF_E}/keyboard_cfg.md               -o ${REF_E}/keyboard_cfg.html")
-  ConvertHTML("-i ${REF_J}/keyboard_cfg.md               -o ${REF_J}/keyboard_cfg.html")
   ConvertHTML("-i ${REF_E}/menu_id.md                    -o ${REF_E}/menu_id.html")
   ConvertHTML("-i ${REF_J}/menu_id.md                    -o ${REF_J}/menu_id.html")
 

From scmnotify ＠ osdn.net  Sun Jan 30 23:06:35 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 30 Jan 2022 23:06:35 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MDldIOODreOCsOODleOCoeOCpOODqw==?=
 =?utf-8?b?5ZCN44Gu5Yem55CG44KS5aSJ5pu0?=
Message-ID: <1643551595.374200.16740.nullmailer@users.osdn.me>

Revision: 9709
          https://osdn.net/projects/ttssh2/scm/svn/commits/9709
Author:   nmaya
Date:     2022-01-30 23:06:34 +0900 (Sun, 30 Jan 2022)
Log Message:
-----------
ログファイル名の処理を変更

#43507

- コマンドラインでフルパスでないログファイル名を指定した場合
フルパス化せず実行ファイルのあるディレクトリが基準になっていたのを、
LogDefaultPath, LogDir の順でフルパス化して開くようにした。

- LogAutoStart が on の場合
LogDefaultPath, FileDir, LogDir の順でフルパス化していたのを、
LogDefaultPath, LogDir の順でフルパス化して開くようにした。

- コマンドラインでログファイル名を指定した場合
デフォルトファイル名を使う場合と同様、ファイル名に Tera Term の置換・strftime の変換をかけるようにした。
https://ttssh2.osdn.jp/manual/4/ja/menu/setup-additional.html#LogDefaultName

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/43507

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/commandline/teraterm.html
    trunk/doc/en/html/menu/setup-additional-log.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/commandline/teraterm.html
    trunk/doc/ja/html/menu/setup-additional-log.html
    trunk/teraterm/teraterm/filesys_log.cpp
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/en/html/about/history.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -40,6 +40,10 @@
       <ul>
         <li>Same behavior as before the change when DPIAware=off add to Tera Term section in TERATERM.INI</li>
       </ul>
+<!--
+      <li>\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x81A<a href="../menu/setup-additional-log.html#LogDefaultName">\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC</a>\x82Ɠ\xAF\x82\xB6\x82悤\x82\xC9<a href="../menu/setup-additional-log.html#LogFileNameFormat">\x92u\x8A\xB7\x82\xB7\x82\xE9</a>\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x81A\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ƃ\xE0\x82ɁA\x83t\x83\x8B\x83p\x83X\x82łȂ\xA2\x8Fꍇ\x82\xC9<a href="../menu/setup-additional-log.html#LogDefaultPath">\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6</a>\x82܂\xBD\x82\xCD<a href="../setup/folder.html#LogDir">\x83\x8D\x83O\x83t\x83H\x83\x8B\x83_</a>\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB7\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+-->
     </ul>
   </li>
 

Modified: trunk/doc/en/html/commandline/teraterm.html
===================================================================
--- trunk/doc/en/html/commandline/teraterm.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/en/html/commandline/teraterm.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -191,7 +191,9 @@
       </ul></dd>
 
   <dt id="l">/L=&lt;log file&gt;</dt>
-  <dd>Start Tera Term with logging.</dd>
+  <dd>Start Tera Term with logging.<br />
+      File name can include <a href="../menu/setup-additional-log.html#LogFileNameFormat">formats of Tera Term and strftime</a>.<br />
+      If this value is not a full path, it is understood as a relative path from <a href="../menu/setup-additional-log.html#LogDefaultPath">default log save folder</a>. If it is not specified, file name is understood as a relative path from <a href="../setup/folder.html#LogDir">log folder</a>.</dd>
 
   <dt id="la">/LA=&lt;language&gt;</dt>
   <dd>Language mode.

Modified: trunk/doc/en/html/menu/setup-additional-log.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional-log.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/en/html/menu/setup-additional-log.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -19,12 +19,15 @@
 
       <dt id="LogDefaultName">Default log file name(strftime format)</dt>
       <dd>
-	Specify default log file name. It can include a format of strftime.
+	Specify default log file name.<br />
+	<span id="LogFileNameFormat">It can include formats of Tera Term and strftime.</span>
 <pre>
-SYNOPSIS:
+SYNOPSIS of Tera Term:
 &amp;h      Host name(or empty when not connecting)
 &amp;p      TCP port number(or empty when not connecting, not TCP connection)
 &amp;u      Logon user name
+
+SYNOPSIS of strftime:
 %a      Abbreviated weekday name
 %A      Full weekday name
 %b      Abbreviated month name
@@ -53,16 +56,8 @@
 
       <dt id="LogDefaultPath">Default log save folder</dt>
       <dd>
-	    <p>\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
-
-        <p>\x8Ew\x92肪\x82Ȃ\xA2\x8Fꍇ\x82́Ateraterm.ini \x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93 FileDir \x82Ŏw\x92肳\x82ꂽ
-          \x8A‹\xAB\x95ϐ\x94\x82\xF0\x93W\x8AJ\x82\xB3\x82ꂽ\x82̃t\x83H\x83\x8B\x83_\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-          (\x95\xB6\x8E\x9A\x97\xF1\x82Ɋ‹\xAB\x95ϐ\x94\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82\xE9\x82ƓW\x8AJ\x82\xB3\x82\xEA\x82܂\xB7)
-
-        <p>\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82́AOS\x82̃_\x83E\x83\x93\x83\x8D\x81[\x83h\x83t\x83H\x83\x8B\x83_\x82\xAA\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-
-        <p>\x8Eg\x97p\x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x82́Attermpro.exe\x82̃t\x83H\x83\x8B\x83_\x82\xAA\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-
+	    <p>Specify default log save folder that is used when log file name is not a full path.<br />
+           If it is not specified, <a href="../setup/folder.html#LogDir">log folder</a> is used.
       </dd>
 
       <dt id="LogAutoStart">Auto start logging</dt>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/ja/html/about/history.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -40,6 +40,8 @@
       <ul>
         <li>TERATERM.INI \x82\xCC Tera Term \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xC9 DPIAware=off \x82\xF0\x89\xC1\x82\xA6\x82\xE9\x82Ə]\x97\x88\x92ʂ\xE8\x82̓\xAE\x8D\xEC\x82ƂȂ\xE9</li>
       </ul>
+      <li>\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x81A\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ɠ\xAF\x82\xB6\x82悤\x82\xC9<a href="../menu/setup-additional-log.html#LogFileNameFormat">\x92u\x8A\xB7\x82\xB7\x82\xE9</a>\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>\x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x81A\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ƃ\xE0\x82ɁA\x83t\x83\x8B\x83p\x83X\x82łȂ\xA2\x8Fꍇ\x82\xC9<a href="../menu/setup-additional-log.html#LogDefaultPath">\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6</a>\x82܂\xBD\x82\xCD<a href="../setup/folder.html#LogDir">\x83\x8D\x83O\x83t\x83H\x83\x8B\x83_</a>\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82Ƃ݂Ȃ\xB7\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/commandline/teraterm.html
===================================================================
--- trunk/doc/ja/html/commandline/teraterm.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/ja/html/commandline/teraterm.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -192,7 +192,9 @@
       </ul></dd>
 
   <dt id="l">/L=&lt;log file&gt;</dt>
-  <dd>\x8BN\x93\xAE\x8E\x9E\x82Ƀ\x8D\x83O\x82\xF0\x8AJ\x8En</dd>
+  <dd>\x8BN\x93\xAE\x8E\x9E\x82Ƀ\x8D\x83O\x82\xF0\x8AJ\x8En<br />
+      \x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ɋ܂܂ꂽ<a href="../menu/setup-additional-log.html#LogFileNameFormat">Tera Term \x82\xC6 strftime \x82̏\x91\x8E\xAE</a>\x82\xAA\x89\xF0\x8E߂\xB3\x82\xEA\x82܂\xB7\x81B<br />
+      \x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xAA\x90\xE2\x91΃p\x83X\x82łȂ\xA2\x82Ƃ\xAB\x82́A<a href="../menu/setup-additional-log.html#LogDefaultPath">\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6</a>\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82ƌ\xA9\x82Ȃ\xB3\x82\xEA\x82܂\xB7\x81B\x82\xBB\x82ꂪ\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82\xCD<a href="../setup/folder.html#LogDir">\x83\x8D\x83O\x83t\x83H\x83\x8B\x83_</a>\x82\xA9\x82\xE7\x82̑\x8A\x91΃p\x83X\x82ƌ\xA9\x82Ȃ\xB3\x82\xEA\x82܂\xB7\x81B</dd>
 
   <dt id="la">/LA=&lt;language&gt;</dt>
   <dd>\x8C\xBE\x8Cꃂ\x81[\x83h

Modified: trunk/doc/ja/html/menu/setup-additional-log.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional-log.html	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/doc/ja/html/menu/setup-additional-log.html	2022-01-30 14:06:34 UTC (rev 9709)
@@ -19,12 +19,15 @@
 
       <dt id="LogDefaultName">Default log file name(strftime format)</dt>
       <dd>
-	\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81Bstrftime \x82̏\x91\x8E\xAE\x82\xAA\x8Eg\x97p\x82ł\xAB\x82܂\xB7\x81B
+	\x95W\x8F\x80\x82̃\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B<br />
+	<span id="LogFileNameFormat">Tera Term \x82\xC6 strftime \x82̏\x91\x8E\xAE\x82\xAA\x8Eg\x97p\x82ł\xAB\x82܂\xB7\x81B</span>
 <pre>
-\x8F\x91\x8E\xAE:
+Tera Term \x82̏\x91\x8E\xAE:
 &amp;h      \x83z\x83X\x83g\x96\xBC\x81B\x96\xA2\x90ڑ\xB1\x82̏ꍇ\x82͋\xF3\x81B
 &amp;p      TCP \x83|\x81[\x83g\x94ԍ\x86\x81B\x96\xA2\x90ڑ\xB1\x82̏ꍇ\x82͋\xF3\x81BTCP \x90ڑ\xB1\x82łȂ\xA2\x82Ƃ\xAB\x82\xE0\x8B\xF3\x81B
 &amp;u      \x83\x8D\x83O\x83I\x83\x93\x92\x86\x82̃\x86\x81[\x83U\x96\xBC\x81B
+
+strftime \x82̏\x91\x8E\xAE:
 %a      \x97j\x93\xFA\x82̏ȗ\xAA\x8C`\x81B
 %A      \x97j\x93\xFA\x82̐\xB3\x8E\xAE\x96\xBC\x81B
 %b      \x8C\x8E\x82̏ȗ\xAA\x8C`\x81B
@@ -53,16 +56,8 @@
 
       <dt id="LogDefaultPath">Default log save folder</dt>
       <dd>
-	    <p>\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B
-
-        <p>\x8Ew\x92肪\x82Ȃ\xA2\x8Fꍇ\x82́Ateraterm.ini \x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93 FileDir \x82Ŏw\x92肳\x82ꂽ
-          \x8A‹\xAB\x95ϐ\x94\x82\xF0\x93W\x8AJ\x82\xB3\x82ꂽ\x82̃t\x83H\x83\x8B\x83_\x82\xF0\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-          (\x95\xB6\x8E\x9A\x97\xF1\x82Ɋ‹\xAB\x95ϐ\x94\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82\xE9\x82ƓW\x8AJ\x82\xB3\x82\xEA\x82܂\xB7)
-
-        <p>\x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82́AOS\x82̃_\x83E\x83\x93\x83\x8D\x81[\x83h\x83t\x83H\x83\x8B\x83_\x82\xAA\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-
-        <p>\x8Eg\x97p\x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x82́Attermpro.exe\x82̃t\x83H\x83\x8B\x83_\x82\xAA\x8Eg\x97p\x82\xB5\x82܂\xB7\x81B
-
+	    \x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xAA\x83t\x83\x8B\x83p\x83X\x82łȂ\xA2\x82Ƃ\xAB\x82́A\x95W\x8F\x80\x82̃\x8D\x83O\x95ۑ\xB6\x90\xE6\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B<br />
+        \x90ݒ肳\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x82́A<a href="../setup/folder.html#LogDir">\x83\x8D\x83O\x83t\x83H\x83\x8B\x83_</a>\x82\xAA\x8Eg\x97p\x82\xB3\x82\xEA\x82܂\xB7\x81B
       </dd>
 
       <dt id="LogAutoStart">Auto start logging</dt>

Modified: trunk/teraterm/teraterm/filesys_log.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_log.cpp	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/teraterm/teraterm/filesys_log.cpp	2022-01-30 14:06:34 UTC (rev 9709)
@@ -1344,18 +1344,13 @@
  */
 wchar_t *FLogGetLogFilename(const wchar_t *log_filename)
 {
-	// \x83t\x83H\x83\x8B\x83_
-	char FileDirExpanded[MAX_PATH];
 	const char *logdir;
+
 	if (strlen(ts.LogDefaultPath) > 0) {
 		logdir = ts.LogDefaultPath;
 	}
-	else if (strlen(ts.FileDir) > 0) {
-		ExpandEnvironmentStrings(ts.FileDir, FileDirExpanded, sizeof(FileDirExpanded));
-		logdir = FileDirExpanded;
-	}
 	else {
-		logdir = ts.HomeDir;
+		logdir = ToCharW(ts.LogDirW);
 	}
 
 	// \x8C\xB3\x82ƂȂ\xE9\x83t\x83@\x83C\x83\x8B\x96\xBC

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2022-01-29 16:49:55 UTC (rev 9708)
+++ trunk/teraterm/teraterm/vtwin.cpp	2022-01-30 14:06:34 UTC (rev 9709)
@@ -3341,8 +3341,11 @@
 	if (ts.LogAutoStart || ts.LogFN[0] != 0) {
 		if (ts.LogFN == NULL || ts.LogFN[0] == 0) {
 			ts.LogFNW = FLogGetLogFilename(NULL);
-			WideCharToACP_t(ts.LogFNW, ts.LogFN, sizeof(ts.LogFN));
 		}
+		else {
+			ts.LogFNW = FLogGetLogFilename(ToWcharA(ts.LogFN));
+		}
+		WideCharToACP_t(ts.LogFNW, ts.LogFN, sizeof(ts.LogFN));
 		if (ts.LogFN[0]!=0) {
 			FLogOpen(ts.LogFNW, LOG_UTF8, FALSE);
 		}

From scmnotify ＠ osdn.net  Sun Jan 30 23:59:22 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Sun, 30 Jan 2022 23:59:22 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MTBdIOOAjE15IERvY3VtZW50cyDjgasg?=
 =?utf-8?b?YnJvYWRjYXN0LmxvZyDjgYzlrZjlnKjjgZnjgovloLTlkIjjgavkvb/jgYY=?=
 =?utf-8?b?44CN5YuV5L2c44KS5YmK6Zmk?=
Message-ID: <1643554762.235504.32648.nullmailer@users.osdn.me>

Revision: 9710
          https://osdn.net/projects/ttssh2/scm/svn/commits/9710
Author:   nmaya
Date:     2022-01-30 23:59:22 +0900 (Sun, 30 Jan 2022)
Log Message:
-----------
「My Documents に broadcast.log が存在する場合に使う」動作を削除

Modified Paths:
--------------
    trunk/teraterm/teraterm/broadcast.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/broadcast.cpp
===================================================================
--- trunk/teraterm/teraterm/broadcast.cpp	2022-01-30 14:06:34 UTC (rev 9709)
+++ trunk/teraterm/teraterm/broadcast.cpp	2022-01-30 14:59:22 UTC (rev 9710)
@@ -102,7 +102,7 @@
 
 	// My Documents \x82\xC9 file \x82\xAA\x91\xB6\x8D݂\xB7\x82\xE9\x8Fꍇ\x81A\x82\xBB\x82\xEA\x82\xF0\x97D\x90悵\x82Ďg\x97p\x82\xB7\x82\xE9
 	// TODO \x82\xB1\x82̓\xAE\x8D\xEC\x82͍폜\x82\xB5\x82\xBD\x82ق\xA4\x82\xAA\x82悳\x82\xBB\x82\xA4
-#if 1
+#if 0
 	HRESULT hr = _SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &fname);
 	awcscats(&fname, L"\\", BROADCAST_LOGFILE, NULL);
 	DWORD r = GetFileAttributesW(fname);

From scmnotify ＠ osdn.net  Mon Jan 31 01:13:36 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 31 Jan 2022 01:13:36 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MTFdIGh0bWzlhoXjga4iPCLjgagiPiI=?=
 =?utf-8?b?44KSIiZsdCLjgagiJmd0IuOBq+e9ruaPmw==?=
Message-ID: <1643559216.950835.30407.nullmailer@users.osdn.me>

Revision: 9711
          https://osdn.net/projects/ttssh2/scm/svn/commits/9711
Author:   zmatsuo
Date:     2022-01-31 01:13:36 +0900 (Mon, 31 Jan 2022)
Log Message:
-----------
html内の"<"と">"を"&lt"と"&gt"に置換

Modified Paths:
--------------
    trunk/doc/en/html/setup/keyboard.html
    trunk/doc/ja/html/setup/keyboard.html

-------------- next part --------------
Modified: trunk/doc/en/html/setup/keyboard.html
===================================================================
--- trunk/doc/en/html/setup/keyboard.html	2022-01-30 14:59:22 UTC (rev 9710)
+++ trunk/doc/en/html/setup/keyboard.html	2022-01-30 16:13:36 UTC (rev 9711)
@@ -107,15 +107,15 @@
 
 <pre>
 	Format:
-		<VT editor key name>=<PC key code>
+		&lt;VT editor key name&gt;=&lt;PC key code&gt;
 
 	where:
 
-	<VT editor key name>
+	&lt;VT editor key name&gt;
 		Up, Down, Right, Left, Find, Insert, Remove, Select,
 		Prev, Next
 
-	  <PC key code>
+	  &lt;PC key code&gt;
 		PC key code (decimal number)
 
 	Example:
@@ -130,16 +130,16 @@
 
 <pre>
 	Format:
-		<VT numeric key name>=<PC key code>
+		&lt;VT numeric key name&gt;=&lt;PC key code&gt;
 
 	where:
 
-	  <VT numeric key name>
+	  &lt;VT numeric key name&gt;
 		Num0, Num1, Num2, Num3, Num4, Num5, Num6, Num7, Num8,
 		Num9, NumMinus, NumComma, NumPeriod, NumEnter, PF1,
 		PF2, PF3, PF4
 
-	  <PC key code>
+	  &lt;PC key code&gt;
 		PC key code (decimal number)
 
 	Example:
@@ -165,11 +165,11 @@
 
 <pre>
 	Format:
-		<VT function key name>=<PC key code>
+		&lt;VT function key name&gt;=&lt;PC key code&gt;
 
 	where:
 
-	  <VT function key name>
+	  &lt;VT function key name&gt;
 		(Function keys of VT terminal)
 		Hold, Print, Break, F6, F7, F8, F9, F10, F11, F12,
 		F13, F14, Help, Do, F17, F18, F19, F20
@@ -177,7 +177,7 @@
 		UDK6, UDK7, UDK8, UDK9, UDK10, UDK11, UDK12, UDK13,
 		UDK14, UDK15, UDK16, UDK17, UDK18, UDK19, UDK20
 
-	  <PC key code>
+	  &lt;PC key code&gt;
 		PC key code (decimal number)
 
 	Example:
@@ -192,14 +192,14 @@
 
 <pre>
 	Format:
-		<Xterm function key name>=<PC key code>
+		&lt;Xterm function key name&gt;=&lt;PC key code&gt;
 
 	where:
 
-	  <Xterm function key name>
+	  &lt;Xterm function key name&gt;
 		XF1, XF2, XF3, XF4, XF5, XBackTab
 
-	  <PC key code>
+	  &lt;PC key code&gt;
 		PC key code (decimal number)
 
 	Example:
@@ -214,14 +214,14 @@
 
 <pre>
 	Format:
-		<Shortcut key name>=<PC key code>
+		&lt;Shortcut key name&gt;=&lt;PC key code&gt;
 
 	where:
-	  <Shortcut key name>	Function
+	  &lt;Shortcut key name&gt;	Function
 	  --------------------------------------------
 	  EditCopy		[Edit] Copy command
 	  EditPaste		[Edit] Paste command
-	  EditPasteCR		[Edit] Paste<CR> command
+	  EditPasteCR		[Edit] Paste&lt;CR&gt; command
 	  EditCLS		[Edit] Clear screen command
 	  EditCLB		[Edit] Clear buffer command
 	  ControlOpenTEK	[Control] Open TEK command
@@ -238,7 +238,7 @@
 	  PrevShownWin		Moves to the previous Tera Term window (except minimized)
 	  LocalEcho		Toggles the local echo status
 
-	  <PC key code>
+	  &lt;PC key code&gt;
 		PC key code (decimal number)
 
 	Example:
@@ -254,35 +254,35 @@
 
 <pre>
 	Format:
-		<User key name>=<PC key code>,<Control flag>,
-				<Character string>
+		&lt;User key name&gt;=&lt;PC key code&gt;,&lt;Control flag&gt;,
+				&lt;Character string&gt;
 
 	where:
 
-	  <User key name>
+	  &lt;User key name&gt;
 		User1, User2, User3,...., User99
 		Maximum number of user keys is 99. 
 		For example, if you want to define ten user keys,
 		you must use the first ten names, from "User1" to "User10".
 
-	  <PC key code>
+	  &lt;PC key code&gt;
 		PC key code (decimal number)
 
-	  <Control flag>
-		Control flag which specifies how <character string>
+	  &lt;Control flag&gt;
+		Control flag which specifies how &lt;character string&gt;
 		is treated when the PC key is pressed.
-			0	<Character string> is sent as it is.
-			1	New-line codes in <Character string>
+			0	&lt;Character string&gt; is sent as it is.
+			1	New-line codes in &lt;Character string&gt;
 				are converted by Tera Term and
 				the converted string is sent.
 			2	A macro file which has the name of
-				<Character string> is executed.
+				&lt;Character string&gt; is executed.
 			3	A Tera Term menu command specified
-				by the menu ID <Character string> is
+				by the menu ID &lt;Character string&gt; is
 				executed.
 
-	  <Character string>
-		If <Control flag> is 0 or 1, <Character string>
+	  &lt;Character string&gt;
+		If &lt;Control flag&gt; is 0 or 1, &lt;Character string&gt;
 		represents the character string to be sent.
 		A non-printable character (control character) in
 		the string can be expressed as a "$" and ASCII code
@@ -290,10 +290,10 @@
 		is expressed as "$0D". "$" itself is expressed as "$24".
 		See "Appendix A  ASCII CODE TABLE".
 
-		If <Control flag> is 2, <Character string> specifies
+		If &lt;Control flag&gt; is 2, &lt;Character string&gt; specifies
 		the macro file name to be executed.
 
-		If <Control flag> is 3, <Character string> is the menu
+		If &lt;Control flag&gt; is 3, &lt;Character string&gt; is the menu
 		ID which specifies the menu command to be executed.
 		The menu ID should be expressed as a decimal number.
 		See "Appendix B  LIST OF MENU IDs".

Modified: trunk/doc/ja/html/setup/keyboard.html
===================================================================
--- trunk/doc/ja/html/setup/keyboard.html	2022-01-30 14:59:22 UTC (rev 9710)
+++ trunk/doc/ja/html/setup/keyboard.html	2022-01-30 16:13:36 UTC (rev 9711)
@@ -105,13 +105,13 @@
 
 <pre>
 	\x8C`\x8E\xAE:
-		<VT editor key name>=<PC key code>
+		&lt;VT editor key name&gt;=&lt;PC key code&gt;
 
-	<VT editor key name>
+	&lt;VT editor key name&gt;
 		Up, Down, Right, Left, Find, Insert, Remove, Select,
 		Prev, Next
 
-	<PC key code>
+	&lt;PC key code&gt;
 		PC key code (10\x90i\x90\x94)
 
 	\x97\xE1:
@@ -126,14 +126,14 @@
 
 <pre>
 	\x8C`\x8E\xAE:
-		<VT numeric key name>=<PC key code>
+		&lt;VT numeric key name&gt;=&lt;PC key code&gt;
 
-	<VT numeric key name>
+	&lt;VT numeric key name&gt;
 		Num0, Num1, Num2, Num3, Num4, Num5, Num6, Num7, Num8,
 		Num9, NumMinus, NumComma, NumPeriod, NumEnter, PF1,
 		PF2, PF3, PF4
 
-	<PC key code>
+	&lt;PC key code&gt;
 		PC key code (10\x90i\x90\x94)
 
 	\x97\xE1:
@@ -159,9 +159,9 @@
 
 <pre>
 	\x8C`\x8E\xAE:
-		<VT function key name>=<PC key code>
+		&lt;VT function key name&gt;=&lt;PC key code&gt;
 
-	<VT function key name>
+	&lt;VT function key name&gt;
 		(VT \x92[\x96\x96\x82̃t\x83@\x83\x93\x83N\x83V\x83\x87\x83\x93\x83L\x81[)
 		Hold, Print, Break, F6, F7, F8, F9, F10, F11, F12,
 		F13, F14, Help, Do, F17, F18, F19, F20
@@ -169,7 +169,7 @@
 		UDK6, UDK7, UDK8, UDK9, UDK10, UDK11, UDK12, UDK13,
 		UDK14, UDK15, UDK16, UDK17, UDK18, UDK19, UDK20
 
-	<PC key code>
+	&lt;PC key code&gt;
 		PC key code (10\x90i\x90\x94)
 
 	\x97\xE1:
@@ -184,12 +184,12 @@
 
 <pre>
 	\x8C`\x8E\xAE:
-		<Xterm function key name>=<PC key code>
+		&lt;Xterm function key name&gt;=&lt;PC key code&gt;
 
-	<Xterm function key name>
+	&lt;Xterm function key name&gt;
 		XF1, XF2, XF3, XF4, XF5, XBackTab
 
-	<PC key code>
+	&lt;PC key code&gt;
 		PC key code (10\x90i\x90\x94)
 
 	\x97\xE1:
@@ -204,13 +204,13 @@
 
 <pre>
 	\x8C`\x8E\xAE:
-		<Shortcut key name>=<PC key code>
+		&lt;Shortcut key name&gt;=&lt;PC key code&gt;
 
-	<Shortcut key name>	\x8B@\x94\
+	&lt;Shortcut key name&gt;	\x8B@\x94\
 	---------------------------------------------------------
 	EditCopy		[Edit] Copy \x83R\x83}\x83\x93\x83h
 	EditPaste		[Edit] Paste \x83R\x83}\x83\x93\x83h
-	EditPasteCR		[Edit] Paste<CR> \x83R\x83}\x83\x93\x83h
+	EditPasteCR		[Edit] Paste&lt;CR&gt; \x83R\x83}\x83\x93\x83h
 	EditCLS 		[Edit] Clear screen \x83R\x83}\x83\x93\x83h
 	EditCLB 		[Edit] Clear buffer \x83R\x83}\x83\x93\x83h
 	ControlOpenTEK		[Control] Open TEK \x83R\x83}\x83\x93\x83h
@@ -227,7 +227,7 @@
 	PrevShownWin 		\x91O\x82̍ŏ\xAC\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2 Tera Term \x83E\x83B\x83\x93\x83h\x83E\x82ֈړ\xAE
 	LocalEcho		Local echo \x82\xF0 on/off \x82\xB7\x82\xE9
 
-	<PC key code>
+	&lt;PC key code&gt;
 		PC key code (10\x90i\x90\x94)
 
 	\x97\xE1:
@@ -244,46 +244,46 @@
 
 <pre>
 	\x8C`\x8E\xAE:
-		<User key name>=<PC key code>,<Control flag>,<\x95\xB6\x8E\x9A\x97\xF1>
-		<User key name>=off
+		&lt;User key name&gt;=&lt;PC key code&gt;,&lt;Control flag&gt;,&lt;\x95\xB6\x8E\x9A\x97\xF1&gt;
+		&lt;User key name&gt;=off
 
-	<User key name>
+	&lt;User key name&gt;
 		User1, User2, User3,...., User99
 		\x8Dő\xE599\x8C‚܂Őݒ\xE8\x89”\
 
-	<PC key code>
+	&lt;PC key code&gt;
 		PC key code (10\x90i\x90\x94)
 
-	<Control flag>
-		\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x82\xC9 <\x95\xB6\x8E\x9A\x97\xF1> \x82\xF0\x82ǂ̂悤\x82Ɏ\xE6\x82舵\x82\xA4\x82\xA9\x82\xF0\x8Ew\x92\xE8
+	&lt;Control flag&gt;
+		\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x82\xC9 &lt;\x95\xB6\x8E\x9A\x97\xF1&gt; \x82\xF0\x82ǂ̂悤\x82Ɏ\xE6\x82舵\x82\xA4\x82\xA9\x82\xF0\x8Ew\x92\xE8
 		\x82\xB7\x82\xE9\x83t\x83\x89\x83O\x81B
-			0	<\x95\xB6\x8E\x9A\x97\xF1>\x82\xF0\x82\xBB\x82̂܂\xDC(8bit/\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82\xC4)\x91\x97\x8Fo\x82\xB7\x82\xE9\x81B
-			1	<\x95\xB6\x8E\x9A\x97\xF1>\x82Ɋ܂܂\xEA\x82镶\x8E\x9A\x82\xE2\x89\xFC\x8Ds\x83R\x81[\x83h\x82\xF0
+			0	&lt;\x95\xB6\x8E\x9A\x97\xF1&gt;\x82\xF0\x82\xBB\x82̂܂\xDC(8bit/\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82\xC4)\x91\x97\x8Fo\x82\xB7\x82\xE9\x81B
+			1	&lt;\x95\xB6\x8E\x9A\x97\xF1&gt;\x82Ɋ܂܂\xEA\x82镶\x8E\x9A\x82\xE2\x89\xFC\x8Ds\x83R\x81[\x83h\x82\xF0
 				Tera Term \x82̐ݒ\xE8\x82ɂ\xA0\x82킹\x82ĕϊ\xB7\x82\xB5\x81A\x95ϊ\xB7
 				\x82\xB3\x82ꂽ\x95\xB6\x8E\x9A\x97\xF1\x82𑗏o\x82\xB7\x82\xE9\x81B
-			2	<\x95\xB6\x8E\x9A\x97\xF1>\x82̃t\x83@\x83C\x83\x8B\x96\xBC\x82̃}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82\xF0
+			2	&lt;\x95\xB6\x8E\x9A\x97\xF1&gt;\x82̃t\x83@\x83C\x83\x8B\x96\xBC\x82̃}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82\xF0
 				\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
-			3	\x83\x81\x83j\x83\x85\x81[ ID <\x95\xB6\x8E\x9A\x97\xF1> \x82Ŏw\x92肳\x82\xEA\x82\xE9
+			3	\x83\x81\x83j\x83\x85\x81[ ID &lt;\x95\xB6\x8E\x9A\x97\xF1&gt; \x82Ŏw\x92肳\x82\xEA\x82\xE9
 				Tera Term \x82̃\x81\x83j\x83\x85\x81[\x83R\x83}\x83\x93\x83h\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B
 
-	<\x95\xB6\x8E\x9A\x97\xF1>:
-		<Control flag> \x82\xAA 0 \x82܂\xBD\x82\xCD 1 \x82̏ꍇ\x81A\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x82\xC9
+	&lt;\x95\xB6\x8E\x9A\x97\xF1&gt;:
+		&lt;Control flag&gt; \x82\xAA 0 \x82܂\xBD\x82\xCD 1 \x82̏ꍇ\x81A\x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x82Ƃ\xAB\x82\xC9
 		\x91\x97\x8Fo\x82\xB3\x82\xEA\x82镶\x8E\x9A\x97\xF1\x81B\x95\\x8E\xA6\x95s\x89”\\x82ȕ\xB6\x8E\x9A(\x90\xA7\x8C䕶\x8E\x9A\x93\x99)\x82͂\xBB\x82\xCC
 		\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82\xF0 $ \x82\xC62\x95\xB6\x8E\x9A\x82\xCC16\x90i\x90\x94\x82ŕ\\x8C\xBB\x82\xB7\x82\xE9\x81B
 		(\x97\xE1: CR \x95\xB6\x8E\x9A\x82\xCD '$0D')\x81B"$" \x82\xBB\x82̂\xE0\x82̂\xCD "$24" \x82ŕ\\x8C\xBB\x82\xB7\x82\xE9\x81B
 		Tera Term \x93\xE0\x95\x94\x82ł͐ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82\xCDUTF-16(16bit/\x95\xB6\x8E\x9A)\x82ŏ\x88\x97\x9D\x82\xB5\x82Ă\xA2\x82\xE9\x81B
-		<Control flag> \x82\xAA 0 \x82̏ꍇ\x81A8bit/\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82ď\x88\x97\x9D\x82\xB7\x82\xE9\x81B
+		&lt;Control flag&gt; \x82\xAA 0 \x82̏ꍇ\x81A8bit/\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82ď\x88\x97\x9D\x82\xB7\x82\xE9\x81B
 		U+0000..U+00FF\x82\xCD$00..$FF\x82Ƃ\xB5\x82Ă\xBB\x82̂܂ܑ\x97\x90M\x82\xB7\x82\xE9\x81B
 		\x82\xBB\x82\xEA\x88ȊO\x82\xCD$FF\x82Ƃ\xB5\x82đ\x97\x90M\x82\xB7\x82\xE9\x81B
 			U+0000..U+007F=\x8A\xEE\x96{\x83\x89\x83e\x83\x93\x95\xB6\x8E\x9A
 			U+0080..U+00FF=\x83\x89\x83e\x83\x931\x95⏕
-		<Control flag> \x82\xAA 1 \x82̏ꍇ\x81A
+		&lt;Control flag&gt; \x82\xAA 1 \x82̏ꍇ\x81A
 		Unicode\x95\xB6\x8E\x9A\x97\xF1\x82Ƃ\xB5\x82ď\x88\x97\x9D\x82\xB7\x82\xE9\x81B
 
-		<Control flag> \x82\xAA 2 \x82̏ꍇ\x81A
+		&lt;Control flag&gt; \x82\xAA 2 \x82̏ꍇ\x81A
 		\x8E\xC0\x8Ds\x82\xB3\x82\xEA\x82\xE9\x83}\x83N\x83\x8D\x83t\x83@\x83C\x83\x8B\x82̃t\x83@\x83C\x83\x8B\x96\xBC\x81B
 
-		<Control flag> \x82\xAA 3 \x82̏ꍇ\x81A
+		&lt;Control flag&gt; \x82\xAA 3 \x82̏ꍇ\x81A
 		\x8E\xC0\x8Ds\x82\xB3\x82\xEA\x82郁\x83j\x83\x85\x81[\x83R\x83}\x83\x93\x83h\x82̃\x81\x83j\x83\x85\x81[ ID (\x90\x94\x8E\x9A)\x81B
 		\x83\x81\x83j\x83\x85\x81[ ID\x82ɂ‚\xA2\x82Ắu\x83\x81\x83j\x83\x85\x81[ ID \x95\\x81v\x8EQ\x8FƁB
 

From scmnotify ＠ osdn.net  Mon Jan 31 01:13:53 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 31 Jan 2022 01:13:53 +0900
Subject: [ttssh2-commit] =?utf-8?q?=5B9712=5D_=5FExpandEnvironmentStringsW?=
 =?utf-8?b?KCkg44OQ44OD44OV44Kh6ZW35ZWP44GE5ZCI44KP44Gb44Gr5a++5b+c?=
Message-ID: <1643559233.402061.30616.nullmailer@users.osdn.me>

Revision: 9712
          https://osdn.net/projects/ttssh2/scm/svn/commits/9712
Author:   zmatsuo
Date:     2022-01-31 01:13:53 +0900 (Mon, 31 Jan 2022)
Log Message:
-----------
_ExpandEnvironmentStringsW() バッファ長問い合わせに対応

Modified Paths:
--------------
    trunk/teraterm/layer_for_unicode/layer_for_unicode.cpp

-------------- next part --------------
Modified: trunk/teraterm/layer_for_unicode/layer_for_unicode.cpp
===================================================================
--- trunk/teraterm/layer_for_unicode/layer_for_unicode.cpp	2022-01-30 16:13:36 UTC (rev 9711)
+++ trunk/teraterm/layer_for_unicode/layer_for_unicode.cpp	2022-01-30 16:13:53 UTC (rev 9712)
@@ -740,8 +740,13 @@
 	char dstA[MAX_PATH];	// MAX_PATH?
 	DWORD r = ExpandEnvironmentStringsA(srcA, dstA, sizeof(dstA));
 	wchar_t *dstW = ToWcharA(dstA);
-	wcsncpy_s(lpDst, nSize, dstW, _TRUNCATE);
 	r = (DWORD)wcslen(dstW);
+	if (lpDst == NULL || nSize == 0) {
+		r++;
+	}
+	else {
+		wcsncpy_s(lpDst, nSize, dstW, _TRUNCATE);
+	}
 	free(srcA);
 	free(dstW);
 	return r;

From scmnotify ＠ osdn.net  Mon Jan 31 01:14:03 2022
From: scmnotify ＠ osdn.net (scmnotify ＠ osdn.net)
Date: Mon, 31 Jan 2022 01:14:03 +0900
Subject: [ttssh2-commit] =?utf-8?b?Wzk3MTNdIGNtYWtl44OT44Or44OJ44GnVlMy?=
 =?utf-8?b?MDA144Gn44KC44OT44Or44OJ44Gn44GN44KL44KI44GG5L+u5q2j?=
Message-ID: <1643559243.497647.31692.nullmailer@users.osdn.me>

Revision: 9713
          https://osdn.net/projects/ttssh2/scm/svn/commits/9713
Author:   zmatsuo
Date:     2022-01-31 01:14:03 +0900 (Mon, 31 Jan 2022)
Log Message:
-----------
cmakeビルドでVS2005でもビルドできるよう修正

- ttxssh はビルドから外すようにした
- r9668 で chmcmd のファイル名に誤りがあったので修正
- cmake 3.12以下でも動作するよう修正

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9668

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/doc/CMakeLists.txt
    trunk/doc/makechm.cmake

-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2022-01-30 16:13:53 UTC (rev 9712)
+++ trunk/CMakeLists.txt	2022-01-30 16:14:03 UTC (rev 9713)
@@ -12,6 +12,7 @@
 option(SUPPORT_OLD_WINDOWS "windows 95 support" ${SUPPORT_OLD_WINDOWS_DEFAULT})
 option(ENABLE_TTXSAMPLES "TTXSamples" ON)
 option(MORE_WARNING "stronger warning" OFF)
+option(TTXSSH "ttxssh" ON)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -23,6 +24,7 @@
 #set(_WIN32_WINNT "0x0501") # Tera Term がビルドできる最小値
 if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005" OR ${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
   set(_WIN32_WINNT "0x0501")
+  set(TTXSSH OFF)
 endif()
 
 if(MSVC)
@@ -173,7 +175,9 @@
 add_subdirectory(teraterm)
 add_subdirectory(ttpmenu)
 add_subdirectory(TTProxy)
-add_subdirectory(ttssh2)
+if(TTXSSH)
+  add_subdirectory(ttssh2)
+endif(TTXSSH)
 add_subdirectory(TTXKanjiMenu)
 if(${ENABLE_TTXSAMPLES})
   add_subdirectory(TTXSamples)

Modified: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt	2022-01-30 16:13:53 UTC (rev 9712)
+++ trunk/doc/CMakeLists.txt	2022-01-30 16:14:03 UTC (rev 9713)
@@ -13,7 +13,7 @@
 else()
   set(HHC "HHC-NOTFOUND")
   find_program(
-    CHMCMD chmcmd2
+    CHMCMD chmcmd
     )
 endif()
 message("hhc=${HHC}")

Modified: trunk/doc/makechm.cmake
===================================================================
--- trunk/doc/makechm.cmake	2022-01-30 16:13:53 UTC (rev 9712)
+++ trunk/doc/makechm.cmake	2022-01-30 16:14:03 UTC (rev 9713)
@@ -47,7 +47,11 @@
   separate_arguments(CONV_CMD_OPTION)
   set(CMD ${CONV_CMD} ${CONV_CMD_OPTION})
 
-  string(JOIN " " CMD_PRINT ${CMD})
+  if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.12.0")
+    string(JOIN " " CMD_PRINT ${CMD})
+  else()
+    string(REPLACE ";" " " CMD_PRINT "${CMD}")
+  endif()
   #message(STATUS ${CMD_PRINT})
 
   execute_process(