Revision: 9164 https://osdn.net/projects/ttssh2/scm/svn/commits/9164 Author: nmaya Date: 2021-02-18 23:14:15 +0900 (Thu, 18 Feb 2021) Log Message: ----------- 以下を 4-stable からマージ r8926 OpenSSL 1.1.1gにアップデートした。 r8938 patch.exe をリポジトリから削除 r9160 OpenSSL にパッチを適用するバッチを修正 r9162 OpenSSL 1.1.1j へ更新した。 注: Visual Studio 2019 環境ではパッチを当てにいかなくなった Revision Links: -------------- https://osdn.net/projects/ttssh2/scm/svn/commits/8926 https://osdn.net/projects/ttssh2/scm/svn/commits/8938 https://osdn.net/projects/ttssh2/scm/svn/commits/9160 https://osdn.net/projects/ttssh2/scm/svn/commits/9162 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/buildopenssl11.bat Added Paths: ----------- trunk/libs/openssl_patch/apply_patch.bat trunk/libs/openssl_patch/ws2_32_dll_patch2.txt Removed Paths: ------------- trunk/libs/openssl_patch/check_patch.bat -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2021-02-18 13:51:12 UTC (rev 9163) +++ trunk/doc/en/html/about/history.html 2021-02-18 14:14:15 UTC (rev 9164) @@ -3262,6 +3262,25 @@ <h2 id="ttssh">TTSSH</h2> +<!--h3 id="ttssh_2.92">202x.xx.x (Ver 2.92)</h3> +<ul class="history"> + <li>Changes + <ul> + </ul> + </li> + + <li>Bug fixes + <ul> + </ul> + </li> + + <li>Misc + <ul> + <li>upgraded OpenSSL to 1.1.1j.</li> + </ul> + </li> +</ul--> + <h3 id="ttssh_2.91">2019.12.7 (Ver 2.91)</h3> <ul class="history"> <li>Changes Modified: trunk/doc/en/html/reference/develop.txt =================================================================== --- trunk/doc/en/html/reference/develop.txt 2021-02-18 13:51:12 UTC (rev 9163) +++ trunk/doc/en/html/reference/develop.txt 2021-02-18 14:14:15 UTC (rev 9164) @@ -64,7 +64,7 @@ * Libraries - Oniguruma 6.9.6 (https://github.com/kkos/oniguruma) -- OpenSSL 1.1.1d (http://www.openssl.org/) +- OpenSSL 1.1.1j (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: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2021-02-18 13:51:12 UTC (rev 9163) +++ trunk/doc/ja/html/about/history.html 2021-02-18 14:14:15 UTC (rev 9164) @@ -3268,6 +3268,25 @@ <h2 id="ttssh">TTSSH</h2> +<!--h3 id="ttssh_2.92">202x.xx.x (Ver 2.92)</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>OpenSSL 1.1.1j \x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li> + </ul> + </li> +</ul--> + <h3 id="ttssh_2.91">2019.12.7 (Ver 2.91)</h3> <ul class="history"> <li>\x95ύX Modified: trunk/doc/ja/html/reference/develop.txt =================================================================== --- trunk/doc/ja/html/reference/develop.txt 2021-02-18 13:51:12 UTC (rev 9163) +++ trunk/doc/ja/html/reference/develop.txt 2021-02-18 14:14:15 UTC (rev 9164) @@ -59,7 +59,7 @@ \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A - Oniguruma 6.9.6 (https://github.com/kkos/oniguruma) -- OpenSSL 1.1.1d (http://www.openssl.org/) +- OpenSSL 1.1.1j (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: trunk/libs/buildopenssl11.bat =================================================================== --- trunk/libs/buildopenssl11.bat 2021-02-18 13:51:12 UTC (rev 9163) +++ trunk/libs/buildopenssl11.bat 2021-02-18 14:14:15 UTC (rev 9164) @@ -1,31 +1,23 @@ +rem OpenSSL\x82̃r\x83\x8B\x83h -rem OpenSSL\x82̃r\x83\x8B\x83h\x82ֈڍs - cd openssl -if exist "out32.dbg\libcrypto.lib" goto build_dbg_end -rem \x83p\x83b\x83`\x93K\x97p\x83`\x83F\x83b\x83N +rem Visual Studio 2005 \x82̏ꍇ\x82̓p\x83b\x83`\x82\xF0\x93K\x97p +set CL_VER= +for /f "delims=" %%o in ('cl 2^>^&1') do set CL_VER=%%o & goto end_clver_chk +:end_clver_chk + +echo %CL_VER% | find "Compiler Version 14" >nul +if ERRORLEVEL 1 goto patch_end pushd ..\openssl_patch -call check_patch.bat +call apply_patch.bat popd +:patch_end -rem \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̃o\x83b\x83N\x83A\x83b\x83v\x82\xF0\x8E\xE6\x82\xE9 -copy /y Configurations\10-main.conf Configurations\10-main.conf.orig -rem VS2005\x82\xBE\x82ƌx\x8D\x90\x83G\x83\x89\x81[\x82ŃR\x83\x93\x83p\x83C\x83\x8B\x82\xAA\x8E~\x82܂\xE9\x96\xE2\x91\xE8\x82ւ̏\x88\x92u -perl -e "open(IN,'Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|/W3|/W1|;s|/WX||;print $_;}close(IN);" > conf.tmp -move conf.tmp Configurations/10-main.conf - -rem GetModuleHandleExW API(WindowsXP\x88ȍ~)\x88ˑ\xB6\x8F\x9C\x8B\x8E\x82̂\xBD\x82\xDF -perl -e "open(IN,'Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|(dso_scheme(.+)"win32")|#$1|;print $_;}close(IN);" > conf.tmp -move conf.tmp Configurations/10-main.conf - -rem Debug build\x82\xCCwarning LNK4099\x91\xF4(Workaround) -perl -e "open(IN,'Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|/Zi|/Z7|;s|/WX||;print $_;}close(IN);" > conf.tmp -move conf.tmp Configurations/10-main.conf - +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 -D_WIN32_WINNT=0x0501 --debug perl -e "open(IN,'makefile');while(<IN>){s| /MDd| /MTd|;print $_;}close(IN);" > makefile.tmp if exist "makefile.dbg" del makefile.dbg Copied: trunk/libs/openssl_patch/apply_patch.bat (from rev 9161, trunk/libs/openssl_patch/check_patch.bat) =================================================================== --- trunk/libs/openssl_patch/apply_patch.bat (rev 0) +++ trunk/libs/openssl_patch/apply_patch.bat 2021-02-18 14:14:15 UTC (rev 9164) @@ -0,0 +1,166 @@ + @ echo off + +rem folder \x82́Apatch \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9 .. \x82\xA9\x82猩\x82\xBD\x91\x8A\x91p\x83X +set folder=openssl_patch + +set cmdopt2=--binary --backup -p0 +set cmdopt1=--dry-run %cmdopt2% + + +rem \x83p\x83b\x83`\x83R\x83}\x83\x93\x83h\x82̑\xB6\x8D݃`\x83F\x83b\x83N +rem ..\%folder%\patch.exe, PATH\x82\xAA\x92ʂ\xC1\x82Ă\xA2\x82\xE9patch \x82̗D\x90揇 +pushd .. +set patchcmd="%folder%\patch.exe" +if exist %patchcmd% ( + popd + goto cmd_true +) +popd + +set patchcmd=patch +%patchcmd% -v +if %errorlevel% == 0 (goto cmd_true) else goto cmd_false + +:cmd_true + + +: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_local.h +if ERRORLEVEL 1 goto fail1 +goto patch2 +:fail1 +pushd .. +%patchcmd% %cmdopt1% < %folder%\ws2_32_dll_patch2.txt +%patchcmd% %cmdopt2% < %folder%\ws2_32_dll_patch2.txt +popd + +:patch2 +:patch3 +:patch4 + + +:patch5 +rem WindowsMe\x82\xC5RAND_bytes\x82ŗ\x8E\x82\xBF\x82錻\x8Fۉ\xF1\x94\xF0\x82̂\xBD\x82߁B +rem OpenSSL 1.0.2\x82ł\xCDmeth\x82\xCCNULL\x83`\x83F\x83b\x83N\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82\xAA\x81AOpenSSL 1.1.1\x82łȂ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xE9\x81B +rem \x82\xB1\x82\xCCNULL\x83`\x83F\x83b\x83N\x82͂Ȃ\xAD\x82Ă\xE0\x96\xE2\x91\xE8\x82͂Ȃ\xAD\x81A\x96{\x8E\xBF\x82\xCDInitializeCriticalSectionAndSpinCount\x82ɂ\xA0\x82邽\x82߁A +rem \x83f\x83t\x83H\x83\x8B\x83g\x82ł͓K\x97p\x82\xB5\x82Ȃ\xA2\x82\xE0\x82̂Ƃ\xB7\x82\xE9\x81B +rem findstr /c:"added if meth is NULL pointer" ..\openssl\crypto\rand\rand_lib.c +rem if ERRORLEVEL 1 goto fail5 +rem goto patch6 +rem :fail5 +rem pushd .. +rem %patchcmd% %cmdopt1% < %folder%\RAND_bytes.txt +rem %patchcmd% %cmdopt2% < %folder%\RAND_bytes.txt +rem popd + + +:patch6 +rem WindowsMe\x82\xC5InitializeCriticalSectionAndSpinCount\x82\xAA\x83G\x83\x89\x81[\x82ƂȂ錻\x8Fۉ\xF1\x94\xF0\x82̂\xBD\x82߁B +findstr /c:"myInitializeCriticalSectionAndSpinCount" ..\openssl\crypto\threads_win.c +if ERRORLEVEL 1 goto fail6 +goto patch7 +:fail6 +pushd .. +%patchcmd% %cmdopt1% < %folder%\atomic_api.txt +%patchcmd% %cmdopt2% < %folder%\atomic_api.txt +popd + + +:patch7 +rem Windows98/Me/NT4.0\x82ł\xCDCryptAcquireContextW\x82ɂ\xE6\x82\xE9\x83G\x83\x93\x83g\x83\x8D\x83s\x81[\x8E擾\x82\xAA +rem \x82ł\xAB\x82Ȃ\xA2\x82\xBD\x82߁A\x90V\x82\xB5\x82\xAD\x8F\x88\x97\x9D\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9\x81BCryptAcquireContextW\x82̗\x98\x97p\x82͎c\x82\xB7\x81B +findstr /c:"CryptAcquireContextA" ..\openssl\crypto\rand\rand_win.c +if ERRORLEVEL 1 goto fail7 +goto patch8 +:fail7 +pushd .. +%patchcmd% %cmdopt1% < %folder%\CryptAcquireContextW2.txt +%patchcmd% %cmdopt2% < %folder%\CryptAcquireContextW2.txt +popd + + +:patch8 +rem Windows95\x82ł\xCD InterlockedCompareExchange \x82\xC6 InterlockedCompareExchange \x82\xAA +rem \x96\xA2\x83T\x83|\x81[\x83g\x82̂\xBD\x82߁A\x95ʂ̏\x88\x97\x9D\x82Œu\x82\xAB\x8A\xB7\x82\xA6\x82\xE9\x81B +rem InitializeCriticalSectionAndSpinCount \x82\xE0\x96\xA2\x83T\x83|\x81[\x83g\x82\xBE\x82\xAA\x81AWindowsMe\x8C\xFC\x82\xAF\x82\xCC +rem \x8F\x88\x92u\x82Ɋ܂܂\xEA\x82\xE9\x81B +findstr /c:"INTERLOCKEDCOMPAREEXCHANGE" ..\openssl\crypto\threads_win.c +if ERRORLEVEL 1 goto fail8 +goto patch9 +:fail8 +pushd .. +copy /b openssl\crypto\threads_win.c.orig openssl\crypto\threads_win.c.orig2 +%patchcmd% %cmdopt1% < %folder%\atomic_api_win95.txt +%patchcmd% %cmdopt2% < %folder%\atomic_api_win95.txt +popd + + +rem Windows95\x82ł\xCD CryptAcquireContextW \x82\xAA\x96\xA2\x83T\x83|\x81[\x83g\x82̂\xBD\x82߁A\x83G\x83\x89\x81[\x82ŕԂ\xB7\x82悤\x82ɂ\xB7\x82\xE9\x81B +rem \x83G\x83\x89\x81[\x8C\xE3\x82\xCD CryptAcquireContextA \x82\xF0\x8Eg\x82\xA4\x81B +:patch9 +findstr /c:"myCryptAcquireContextW" ..\openssl\crypto\rand\rand_win.c +if ERRORLEVEL 1 goto fail9 +goto patch10 +:fail9 +pushd .. +copy /b openssl\crypto\rand\rand_win.c.orig openssl\crypto\rand\rand_win.c.orig2 +%patchcmd% %cmdopt1% < %folder%\CryptAcquireContextW_win95.txt +%patchcmd% %cmdopt2% < %folder%\CryptAcquireContextW_win95.txt +popd + + +:patch10 + + +:patch_main_conf +rem \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̃o\x83b\x83N\x83A\x83b\x83v\x82\xF0\x8E\xE6\x82\xE9 +if not exist "..\openssl\Configurations\10-main.conf.orig" ( + copy /y ..\openssl\Configurations\10-main.conf ..\openssl\Configurations\10-main.conf.orig +) + +rem VS2005\x82\xBE\x82ƌx\x8D\x90\x83G\x83\x89\x81[\x82ŃR\x83\x93\x83p\x83C\x83\x8B\x82\xAA\x8E~\x82܂\xE9\x96\xE2\x91\xE8\x82ւ̏\x88\x92u +perl -e "open(IN,'..\openssl\Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|/W3|/W1|;s|/WX||;print $_;}close(IN);" > conf.tmp +move conf.tmp ..\openssl\Configurations/10-main.conf + +rem GetModuleHandleExW API(WindowsXP\x88ȍ~)\x88ˑ\xB6\x8F\x9C\x8B\x8E\x82̂\xBD\x82\xDF +perl -e "open(IN,'..\openssl\Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|(dso_scheme(.+)"win32")|#$1|;print $_;}close(IN);" > conf.tmp +move conf.tmp ..\openssl\Configurations/10-main.conf + +rem Debug build\x82\xCCwarning LNK4099\x91\xF4(Workaround) +perl -e "open(IN,'..\openssl\Configurations/10-main.conf');binmode(STDOUT);while(<IN>){s|/Zi|/Z7|;s|/WX||;print $_;}close(IN);" > conf.tmp +move conf.tmp ..\openssl\Configurations/10-main.conf + + +:patch_end +echo "\x83p\x83b\x83`\x82͓K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7" +timeout 5 +goto end + + +:patchfail +echo "\x83p\x83b\x83`\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82悤\x82ł\xB7" +set /P ANS="\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9\x81H(y/n)" +if "%ANS%"=="y" ( + goto end +) else if "%ANS%"=="n" ( + echo "\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7" + exit /b +) else ( + goto fail +) + +goto end + +:cmd_false +echo \x83p\x83b\x83`\x83R\x83}\x83\x93\x83h\x82\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB9\x82\xF1 +echo \x89\xBA\x8BL\x83T\x83C\x83g\x82\xA9\x82\xE7\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82āA..\%folder% \x82\xC9 Git-x.xx.x-32-bit.tar.bz2 \x93\xE0\x82\xCC +echo patch.exe, msys-gcc_s-1.dll, msys-2.0.dll \x82\xF0\x94z\x92u\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2 +echo https://github.com/git-for-windows/git/releases/latest +echo. +goto patchfail + +:end + @ echo on + + Deleted: trunk/libs/openssl_patch/check_patch.bat =================================================================== --- trunk/libs/openssl_patch/check_patch.bat 2021-02-18 13:51:12 UTC (rev 9163) +++ trunk/libs/openssl_patch/check_patch.bat 2021-02-18 14:14:15 UTC (rev 9164) @@ -1,140 +0,0 @@ - @ echo off - -set folder=openssl_patch -set cmdopt2=--binary --backup -p0 -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. -rem - -rem \x83p\x83b\x83`\x83R\x83}\x83\x93\x83h\x82̑\xB6\x8D݃`\x83F\x83b\x83N -set patchcmd="patch.exe" -if exist %patchcmd% (goto cmd_true) else goto cmd_false - -:cmd_true - - -rem \x83p\x83b\x83`\x82̓K\x97p\x97L\x96\xB3\x82\xF0\x83`\x83F\x83b\x83N - -: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 -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 -popd - -:patch2 -:patch3 -:patch4 - - -:patch5 -rem WindowsMe\x82\xC5RAND_bytes\x82ŗ\x8E\x82\xBF\x82錻\x8Fۉ\xF1\x94\xF0\x82̂\xBD\x82߁B -rem OpenSSL 1.0.2\x82ł\xCDmeth\x82\xCCNULL\x83`\x83F\x83b\x83N\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82\xAA\x81AOpenSSL 1.1.1\x82łȂ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xE9\x81B -rem \x82\xB1\x82\xCCNULL\x83`\x83F\x83b\x83N\x82͂Ȃ\xAD\x82Ă\xE0\x96\xE2\x91\xE8\x82͂Ȃ\xAD\x81A\x96{\x8E\xBF\x82\xCDInitializeCriticalSectionAndSpinCount\x82ɂ\xA0\x82邽\x82߁A -rem \x83f\x83t\x83H\x83\x8B\x83g\x82ł͓K\x97p\x82\xB5\x82Ȃ\xA2\x82\xE0\x82̂Ƃ\xB7\x82\xE9\x81B -rem findstr /c:"added if meth is NULL pointer" ..\openssl\crypto\rand\rand_lib.c -rem if ERRORLEVEL 1 goto fail5 -rem goto patch6 -rem :fail5 -rem pushd .. -rem %folder%\patch %cmdopt1% < %folder%\RAND_bytes.txt -rem %folder%\patch %cmdopt2% < %folder%\RAND_bytes.txt -rem popd - - -:patch6 -rem WindowsMe\x82\xC5InitializeCriticalSectionAndSpinCount\x82\xAA\x83G\x83\x89\x81[\x82ƂȂ錻\x8Fۉ\xF1\x94\xF0\x82̂\xBD\x82߁B -findstr /c:"myInitializeCriticalSectionAndSpinCount" ..\openssl\crypto\threads_win.c -if ERRORLEVEL 1 goto fail6 -goto patch7 -:fail6 -pushd .. -%folder%\patch %cmdopt1% < %folder%\atomic_api.txt -%folder%\patch %cmdopt2% < %folder%\atomic_api.txt -popd - - -:patch7 -rem Windows98/Me/NT4.0\x82ł\xCDCryptAcquireContextW\x82ɂ\xE6\x82\xE9\x83G\x83\x93\x83g\x83\x8D\x83s\x81[\x8E擾\x82\xAA -rem \x82ł\xAB\x82Ȃ\xA2\x82\xBD\x82߁A\x90V\x82\xB5\x82\xAD\x8F\x88\x97\x9D\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9\x81BCryptAcquireContextW\x82̗\x98\x97p\x82͎c\x82\xB7\x81B -findstr /c:"CryptAcquireContextA" ..\openssl\crypto\rand\rand_win.c -if ERRORLEVEL 1 goto fail7 -goto patch8 -:fail7 -pushd .. -%folder%\patch %cmdopt1% < %folder%\CryptAcquireContextW2.txt -%folder%\patch %cmdopt2% < %folder%\CryptAcquireContextW2.txt -popd - - -:patch8 -rem Windows95\x82ł\xCD InterlockedCompareExchange \x82\xC6 InterlockedCompareExchange \x82\xAA -rem \x96\xA2\x83T\x83|\x81[\x83g\x82̂\xBD\x82߁A\x95ʂ̏\x88\x97\x9D\x82Œu\x82\xAB\x8A\xB7\x82\xA6\x82\xE9\x81B -rem InitializeCriticalSectionAndSpinCount \x82\xE0\x96\xA2\x83T\x83|\x81[\x83g\x82\xBE\x82\xAA\x81AWindowsMe\x8C\xFC\x82\xAF\x82\xCC -rem \x8F\x88\x92u\x82Ɋ܂܂\xEA\x82\xE9\x81B -findstr /c:"INTERLOCKEDCOMPAREEXCHANGE" ..\openssl\crypto\threads_win.c -if ERRORLEVEL 1 goto fail8 -goto patch9 -:fail8 -pushd .. -copy /b openssl\crypto\threads_win.c.orig openssl\crypto\threads_win.c.orig2 -%folder%\patch %cmdopt1% < %folder%\atomic_api_win95.txt -%folder%\patch %cmdopt2% < %folder%\atomic_api_win95.txt -popd - - -rem Windows95\x82ł\xCD CryptAcquireContextW \x82\xAA\x96\xA2\x83T\x83|\x81[\x83g\x82̂\xBD\x82߁A\x83G\x83\x89\x81[\x82ŕԂ\xB7\x82悤\x82ɂ\xB7\x82\xE9\x81B -rem \x83G\x83\x89\x81[\x8C\xE3\x82\xCD CryptAcquireContextA \x82\xF0\x8Eg\x82\xA4\x81B -:patch9 -findstr /c:"myCryptAcquireContextW" ..\openssl\crypto\rand\rand_win.c -if ERRORLEVEL 1 goto fail9 -goto patch10 -:fail9 -pushd .. -copy /b openssl\crypto\rand\rand_win.c.orig openssl\crypto\rand\rand_win.c.orig2 -%folder%\patch %cmdopt1% < %folder%\CryptAcquireContextW_win95.txt -%folder%\patch %cmdopt2% < %folder%\CryptAcquireContextW_win95.txt -popd - - - -:patch10 - - -:patch_end -echo "\x83p\x83b\x83`\x82͓K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7" -timeout 5 -goto end - -:patchfail -echo "\x83p\x83b\x83`\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82悤\x82ł\xB7" -set /P ANS="\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9\x81H(y/n)" -if "%ANS%"=="y" ( - goto end -) else if "%ANS%"=="n" ( - echo "\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7" - exit /b -) else ( - goto fail -) - -goto end - -:cmd_false -echo \x83p\x83b\x83`\x83R\x83}\x83\x93\x83h %patchcmd% \x82\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB9\x82\xF1 -echo \x89\xBA\x8BL\x83T\x83C\x83g\x82\xA9\x82\xE7\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2 -echo http://geoffair.net/projects/patch.htm -echo. -goto patchfail - -:end - @ echo on - - Added: trunk/libs/openssl_patch/ws2_32_dll_patch2.txt =================================================================== --- trunk/libs/openssl_patch/ws2_32_dll_patch2.txt (rev 0) +++ trunk/libs/openssl_patch/ws2_32_dll_patch2.txt 2021-02-18 14:14:15 UTC (rev 9164) @@ -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