• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision8926 (tree)
Time2020-08-27 20:34:28
Authoryoulab

Log Message

OpenSSL 1.1.1gにアップデートした。

Change Summary

Incremental Difference

--- branches/4-stable/doc/en/html/about/history.html (revision 8925)
+++ branches/4-stable/doc/en/html/about/history.html (revision 8926)
@@ -3285,11 +3285,11 @@
32853285 </ul>
32863286 </li>
32873287
3288- <!-- li>Misc
3288+ <li>Misc
32893289 <ul>
3290- <li></li>
3290+ <li>upgraded OpenSSL from 1.1.1d to 1.1.1g.</li>
32913291 </ul>
3292- </li -->
3292+ </li>
32933293 </ul>
32943294
32953295 <h3 id="ttssh_2.91">2019.12.7 (Ver 2.91)</h3>
--- branches/4-stable/doc/en/html/reference/develop.txt (revision 8925)
+++ branches/4-stable/doc/en/html/reference/develop.txt (revision 8926)
@@ -51,7 +51,7 @@
5151
5252 * Libraries
5353 - Oniguruma 6.9.3 (https://github.com/kkos/oniguruma)
54-- OpenSSL 1.1.1d (http://www.openssl.org/)
54+- OpenSSL 1.1.1g (http://www.openssl.org/)
5555 - zlib 1.2.11 (http://www.zlib.net/)
5656 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
5757 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)
--- branches/4-stable/doc/ja/html/about/history.html (revision 8925)
+++ branches/4-stable/doc/ja/html/about/history.html (revision 8926)
@@ -3291,11 +3291,11 @@
32913291 </ul>
32923292 </li>
32933293
3294- <!-- li>その他
3294+ <li>その他
32953295 <ul>
3296- <li></li>
3296+ <li>OpenSSL 1.1.1dから1.1.1gへ差し替えた。</li>
32973297 </ul>
3298- </li -->
3298+ </li>
32993299 </ul>
33003300
33013301 <h3 id="ttssh_2.91">2019.12.7 (Ver 2.91)</h3>
--- branches/4-stable/doc/ja/html/reference/develop.txt (revision 8925)
+++ branches/4-stable/doc/ja/html/reference/develop.txt (revision 8926)
@@ -55,7 +55,7 @@
5555
5656 ■ ライブラリ
5757 - Oniguruma 6.9.3 (https://github.com/kkos/oniguruma)
58-- OpenSSL 1.1.1d (http://www.openssl.org/)
58+- OpenSSL 1.1.1g (http://www.openssl.org/)
5959 - zlib 1.2.11 (http://www.zlib.net/)
6060 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
6161 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html)
--- branches/4-stable/libs/openssl_patch/check_patch.bat (revision 8925)
+++ branches/4-stable/libs/openssl_patch/check_patch.bat (revision 8926)
@@ -5,7 +5,7 @@
55 set cmdopt1=--dry-run %cmdopt2%
66
77 rem
8-echo OpenSSL 1.1.1にパッチが適用されているかを確認します...
8+echo OpenSSL 1.1.1gにパッチが適用されているかを確認します...
99 echo.
1010 rem
1111
@@ -20,13 +20,13 @@
2020
2121 :patch1
2222 rem freeaddrinfo/getnameinfo/getaddrinfo API(WindowsXP以降)依存除去のため
23-findstr /c:"# undef AI_PASSIVE" ..\openssl\crypto\bio\bio_lcl.h
23+findstr /c:"# undef AI_PASSIVE" ..\openssl\crypto\bio\bio_local.h
2424 if ERRORLEVEL 1 goto fail1
2525 goto patch2
2626 :fail1
2727 pushd ..
28-%folder%\patch %cmdopt1% < %folder%\ws2_32_dll_patch.txt
29-%folder%\patch %cmdopt2% < %folder%\ws2_32_dll_patch.txt
28+%folder%\patch %cmdopt1% < %folder%\ws2_32_dll_patch2.txt
29+%folder%\patch %cmdopt2% < %folder%\ws2_32_dll_patch2.txt
3030 popd
3131
3232 :patch2
--- branches/4-stable/libs/openssl_patch/ws2_32_dll_patch2.txt (nonexistent)
+++ branches/4-stable/libs/openssl_patch/ws2_32_dll_patch2.txt (revision 8926)
@@ -0,0 +1,13 @@
1+*** openssl-1.1.1g/crypto/bio/bio_local.h 2020-04-21 21:22:38.000000000 +0900
2+--- openssl/crypto/bio/bio_local.h 2020-08-27 19:00:53.991266900 +0900
3+***************
4+*** 11,16 ****
5+--- 11,18 ----
6+ #include "internal/sockets.h"
7+ #include "internal/refcount.h"
8+
9++ # undef AI_PASSIVE
10++
11+ /* BEGIN BIO_ADDRINFO/BIO_ADDR stuff. */
12+
13+ #ifndef OPENSSL_NO_SOCK
Show on old repository browser