Tera TermRevision: 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