Tera TermRevision: 7829
https://osdn.net/projects/ttssh2/scm/svn/commits/7829
Author: yutakapon
Date: 2019-07-07 15:47:02 +0900 (Sun, 07 Jul 2019)
Log Message:
-----------
OpenSSLの生成を静的リンクライブラリに戻した。
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/libs/buildopenssl11.bat
branches/openssl_1_1_1_v2/teraterm/teraterm/ttplug.c
-------------- next part --------------
Modified: branches/openssl_1_1_1_v2/libs/buildopenssl11.bat
===================================================================
--- branches/openssl_1_1_1_v2/libs/buildopenssl11.bat 2019-07-06 15:01:49 UTC (rev 7828)
+++ branches/openssl_1_1_1_v2/libs/buildopenssl11.bat 2019-07-07 06:47:02 UTC (rev 7829)
@@ -13,7 +13,7 @@
perl -e "open(IN,'Configurations/10-main.conf');while(<IN>){s|/W3|/W1|;s|/WX||;print $_;}close(IN);" > conf.tmp
move conf.tmp Configurations/10-main.conf
-perl Configure no-asm no-async shared no-capieng no-dso no-engine VC-WIN32 -D_WIN32_WINNT=0x0501 --debug
+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
ren makefile.tmp makefile.dbg
@@ -26,7 +26,7 @@
:build_dbg_end
if exist "out32\libcrypto.lib" goto build_end
-perl Configure no-asm no-async shared no-capieng no-dso no-engine VC-WIN32 -D_WIN32_WINNT=0x0501
+perl Configure no-asm no-async no-shared no-capieng no-dso no-engine VC-WIN32 -D_WIN32_WINNT=0x0501
perl -e "open(IN,'makefile');while(<IN>){s| /MD| /MT|;print $_;}close(IN);" > makefile.tmp
if exist "makefile" del makefile
ren makefile.tmp makefile
Modified: branches/openssl_1_1_1_v2/teraterm/teraterm/ttplug.c
===================================================================
--- branches/openssl_1_1_1_v2/teraterm/teraterm/ttplug.c 2019-07-06 15:01:49 UTC (rev 7828)
+++ branches/openssl_1_1_1_v2/teraterm/teraterm/ttplug.c 2019-07-07 06:47:02 UTC (rev 7829)
@@ -119,15 +119,7 @@
char buf[1024];
struct _finddata_t searchData;
long searchHandle;
- HMODULE hm;
- // ttxssh.dll\x82\xC9libcrypto-1_1.dll\x82I\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82\xE9\x8Fꍇ\x81A
- // SetDefaultDllDirectories()\x82̉e\x8B\xBF\x82\xC5ttxssh.dll\x82\xAALoadLibrary\x82ł\xAB\x82Ȃ\xA2\x82Ƃ\xA2\x82\xA4
- // \x8C\xBB\x8Fۂɑ\xB7\x82鉼\x8F\x88\x92u\x81B
- // \x82\xBD\x82\xBE\x82\xB5\x81A\x90\xB3\x8E\xAE\x8F\x88\x92u\x82ɂ͂ł\xAB\x82Ȃ\xA2\x81B
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s\\libcrypto-1_1.dll", ts->HomeDir);
- hm = LoadLibrary(buf);
-
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s\\TTX*.DLL", ts->HomeDir);
searchHandle = _findfirst(buf, &searchData);