Tera TermRevision: 8926
https://osdn.net/projects/ttssh2/scm/svn/commits/8926
Author: youlab
Date: 2020-08-27 20:34:28 +0900 (Thu, 27 Aug 2020)
Log Message:
-----------
OpenSSL 1.1.1gにアップデートした。
Modified Paths:
--------------
branches/4-stable/doc/en/html/about/history.html
branches/4-stable/doc/en/html/reference/develop.txt
branches/4-stable/doc/ja/html/about/history.html
branches/4-stable/doc/ja/html/reference/develop.txt
branches/4-stable/libs/openssl_patch/check_patch.bat
Added Paths:
-----------
branches/4-stable/libs/openssl_patch/ws2_32_dll_patch2.txt
-------------- next part --------------
Modified: branches/4-stable/doc/en/html/about/history.html
===================================================================
--- branches/4-stable/doc/en/html/about/history.html 2020-08-25 10:19:46 UTC (rev 8925)
+++ branches/4-stable/doc/en/html/about/history.html 2020-08-27 11:34:28 UTC (rev 8926)
@@ -3285,11 +3285,11 @@
</ul>
</li>
- <!-- li>Misc
+ <li>Misc
<ul>
- <li></li>
+ <li>upgraded OpenSSL from 1.1.1d to 1.1.1g.</li>
</ul>
- </li -->
+ </li>
</ul>
<h3 id="ttssh_2.91">2019.12.7 (Ver 2.91)</h3>
Modified: branches/4-stable/doc/en/html/reference/develop.txt
===================================================================
--- branches/4-stable/doc/en/html/reference/develop.txt 2020-08-25 10:19:46 UTC (rev 8925)
+++ branches/4-stable/doc/en/html/reference/develop.txt 2020-08-27 11:34:28 UTC (rev 8926)
@@ -51,7 +51,7 @@
* Libraries
- Oniguruma 6.9.3 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.1d (http://www.openssl.org/)
+- OpenSSL 1.1.1g (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)
Modified: branches/4-stable/doc/ja/html/about/history.html
===================================================================
--- branches/4-stable/doc/ja/html/about/history.html 2020-08-25 10:19:46 UTC (rev 8925)
+++ branches/4-stable/doc/ja/html/about/history.html 2020-08-27 11:34:28 UTC (rev 8926)
@@ -3291,11 +3291,11 @@
</ul>
</li>
- <!-- li>\x82\xBB\x82̑\xBC
+ <li>\x82\xBB\x82̑\xBC
<ul>
- <li></li>
+ <li>OpenSSL 1.1.1d\x82\xA9\x82\xE71.1.1g\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
</ul>
- </li -->
+ </li>
</ul>
<h3 id="ttssh_2.91">2019.12.7 (Ver 2.91)</h3>
Modified: branches/4-stable/doc/ja/html/reference/develop.txt
===================================================================
--- branches/4-stable/doc/ja/html/reference/develop.txt 2020-08-25 10:19:46 UTC (rev 8925)
+++ branches/4-stable/doc/ja/html/reference/develop.txt 2020-08-27 11:34:28 UTC (rev 8926)
@@ -55,7 +55,7 @@
\x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
- Oniguruma 6.9.3 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.1.1d (http://www.openssl.org/)
+- OpenSSL 1.1.1g (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)
Modified: branches/4-stable/libs/openssl_patch/check_patch.bat
===================================================================
--- branches/4-stable/libs/openssl_patch/check_patch.bat 2020-08-25 10:19:46 UTC (rev 8925)
+++ branches/4-stable/libs/openssl_patch/check_patch.bat 2020-08-27 11:34:28 UTC (rev 8926)
@@ -5,7 +5,7 @@
set cmdopt1=--dry-run %cmdopt2%
rem
-echo OpenSSL 1.1.1\x82Ƀp\x83b\x83`\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82邩\x82\xF0\x8Am\x94F\x82\xB5\x82܂\xB7...
+echo OpenSSL 1.1.1g\x82Ƀp\x83b\x83`\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82邩\x82\xF0\x8Am\x94F\x82\xB5\x82܂\xB7...
echo.
rem
@@ -20,13 +20,13 @@
:patch1
rem freeaddrinfo/getnameinfo/getaddrinfo API(WindowsXP\x88ȍ~)\x88ˑ\xB6\x8F\x9C\x8B\x8E\x82̂\xBD\x82\xDF
-findstr /c:"# undef AI_PASSIVE" ..\openssl\crypto\bio\bio_lcl.h
+findstr /c:"# undef AI_PASSIVE" ..\openssl\crypto\bio\bio_local.h
if ERRORLEVEL 1 goto fail1
goto patch2
:fail1
pushd ..
-%folder%\patch %cmdopt1% < %folder%\ws2_32_dll_patch.txt
-%folder%\patch %cmdopt2% < %folder%\ws2_32_dll_patch.txt
+%folder%\patch %cmdopt1% < %folder%\ws2_32_dll_patch2.txt
+%folder%\patch %cmdopt2% < %folder%\ws2_32_dll_patch2.txt
popd
:patch2
Added: branches/4-stable/libs/openssl_patch/ws2_32_dll_patch2.txt
===================================================================
--- branches/4-stable/libs/openssl_patch/ws2_32_dll_patch2.txt (rev 0)
+++ branches/4-stable/libs/openssl_patch/ws2_32_dll_patch2.txt 2020-08-27 11:34:28 UTC (rev 8926)
@@ -0,0 +1,13 @@
+*** openssl-1.1.1g/crypto/bio/bio_local.h 2020-04-21 21:22:38.000000000 +0900
+--- openssl/crypto/bio/bio_local.h 2020-08-27 19:00:53.991266900 +0900
+***************
+*** 11,16 ****
+--- 11,18 ----
+ #include "internal/sockets.h"
+ #include "internal/refcount.h"
+
++ # undef AI_PASSIVE
++
+ /* BEGIN BIO_ADDRINFO/BIO_ADDR stuff. */
+
+ #ifndef OPENSSL_NO_SOCK