• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

よく使われているワード(クリックで追加)

javac++androidlinuxc#objective-cqt誰得windowscocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Loweynet


コミットメタ情報

リビジョンed4d179277181fc0bcd49f52d74b36d9a5e58128 (tree)
日時2017-11-11 19:48:22
作者s_kawamoto <s_kawamoto@user...>
コミッターs_kawamoto

ログメッセージ

Remove SFTP options.
Rebuild OpenSSL for the new version.

変更サマリ

差分

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ
--- a/OpenSSL/buildx64.bat
+++ b/OpenSSL/buildx64.bat
@@ -7,7 +7,7 @@ rem Use compat50.bat to support Windows 2000.
77 call compat50.bat
88 perl nodebug.pl
99 nmake /f makefile build_libs
10-copy /y libeay32.dll %var1%\libeay32.dll
11-copy /y ssleay32.dll %var1%\ssleay32.dll
10+copy /y libcrypto-1_1-x64.dll %var1%\libcrypto-1_1-x64.dll
11+copy /y libssl-1_1-x64.dll %var1%\libssl-1_1-x64.dll
1212 popd
1313 exit /b
--- a/OpenSSL/buildx86.bat
+++ b/OpenSSL/buildx86.bat
@@ -7,7 +7,7 @@ rem Use compat50.bat to support Windows 2000.
77 call compat50.bat
88 perl nodebug.pl
99 nmake /f makefile build_libs
10-copy /y libeay32.dll %var1%\libeay32.dll
11-copy /y ssleay32.dll %var1%\ssleay32.dll
10+copy /y libcrypto-1_1.dll %var1%\libcrypto-1_1.dll
11+copy /y libssl-1_1.dll %var1%\libssl-1_1.dll
1212 popd
1313 exit /b
--- a/OpenSSL/nodebug.pl
+++ b/OpenSSL/nodebug.pl
@@ -5,12 +5,10 @@ open(FILE, '>makefile');
55 for(@data)
66 {
77 $_ =~ s/ \/debug//g;
8- $_ =~ s/libssl-1_1-x64/ssleay32/g;
9- $_ =~ s/libcrypto-1_1-x64/libeay32/g;
10- $_ =~ s/libssl-1_1/ssleay32/g;
11- $_ =~ s/libcrypto-1_1/libeay32/g;
12- $_ =~ s/\$\(MTOUTFLAG\)ssleay32\.dll/\$\(MTOUTFLAG\)ssleay32\.dll;#2/g;
13- $_ =~ s/\$\(MTOUTFLAG\)libeay32\.dll/\$\(MTOUTFLAG\)libeay32\.dll;#2/g;
8+ $_ =~ s/\$\(MTOUTFLAG\)libssl-1_1-x64\.dll/\$\(MTOUTFLAG\)libssl-1_1-x64\.dll;#2/g;
9+ $_ =~ s/\$\(MTOUTFLAG\)libcrypto-1_1-x64\.dll/\$\(MTOUTFLAG\)libcrypto-1_1-x64\.dll;#2/g;
10+ $_ =~ s/\$\(MTOUTFLAG\)libssl-1_1\.dll/\$\(MTOUTFLAG\)libssl-1_1\.dll;#2/g;
11+ $_ =~ s/\$\(MTOUTFLAG\)libcrypto-1_1\.dll/\$\(MTOUTFLAG\)libcrypto-1_1\.dll;#2/g;
1412 $_ =~ s/\"-DENGINESDIR=/\"-DENGINESDIR=\\\"\.\\\"\" \"-D_ENGINESDIR=/g;
1513 $_ =~ s/\"-DOPENSSLDIR=/\"-DOPENSSLDIR=\\\"\.\\\"\" \"-D_OPENSSLDIR=/g;
1614 print FILE $_;
--- a/OpenSSL/openssl_readme.txt
+++ b/OpenSSL/openssl_readme.txt
@@ -11,10 +11,10 @@
1111 3. OpenSSLのビルド(32ビット版)
1212 3.1. Visual Studio 2008 コマンド プロンプトを起動
1313 3.2. コマンド プロンプト内でbuildx86.batを実行
14- 3.3. 正常にビルドされた場合distディレクトリ内にlibeay32.dllおよびssleay32.dllが作成される
14+ 3.3. 正常にビルドされた場合distディレクトリ内にlibcrypto-1_1.dllおよびlibssl-1_1.dllが作成される
1515
1616 3. OpenSSLのビルド(64ビット版)
1717 3.1. Visual Studio 2008 x64 Win64 コマンド プロンプトを起動
1818 3.2. コマンド プロンプト内でbuildx64.batを実行
19- 3.3. 正常にビルドされた場合dist\amd64ディレクトリ内にlibeay32.dllおよびssleay32.dllが作成される
19+ 3.3. 正常にビルドされた場合dist\amd64ディレクトリ内にlibcrypto-1_1-x64.dllおよびlibssl-1_1-x64.dllが作成される
2020
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ
--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -235,21 +235,21 @@ END
235235 // Dialog
236236 //
237237
238-about_dlg DIALOGEX 0, 0, 319, 315
238+about_dlg DIALOGEX 0, 0, 319, 267
239239 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
240240 CAPTION "FFFTP‚ɂ‚¢‚Ä"
241241 FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243- DEFPUSHBUTTON "OK",IDOK,133,294,50,14
243+ DEFPUSHBUTTON "OK",IDOK,133,246,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99a-20171104",-1,113,11,90,8
246- CTEXT "FFFTP‚Ífreeware‚Å‚·",-1,7,279,305,8
247- CTEXT "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)",-1,7,25,305,44,SS_NOPREFIX
248- CTEXT "",ABOUT_JRE,7,96,305,8
249- EDITTEXT ABOUT_URL,7,76,305,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
250- CTEXT "OLE D&&D‹@”\ by •½“c–L‚³‚ñAnakka‚³‚ñ\nƒzƒXƒg“à‚ł̃tƒ@ƒCƒ‹ˆÚ“®‹@”\ by •½“c–L‚³‚ñ\n‚¢‚­‚‚©‚Ì‹@”\ by miau‚³‚ñ\nƒ}ƒXƒ^[ƒpƒXƒ[ƒh‹@”\ by ‚°‚ñ‚°‚ñ‚³‚ñ\nAESˆÃ†‰» by Moca‚³‚ñ\n\n‘¼A‘½‚­‚Ì•û‚Ì‚²‹¦—Í‚ð‚¢‚½‚¾‚«‚Ü‚µ‚½B",-1,7,143,305,60
251- CTEXT "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,111,305,27
252- CTEXT "FTP over SSL/TLS‚ÌŽÀ‘•‚É‚ÍOpenSSL‚ðŽg—p‚µ‚Ä‚¢‚Ü‚·B\nCopyright (c) 1998-2011 The OpenSSL Project. All rights reserved.",-1,7,207,305,60
245+ CTEXT "FFFTP Ver 2.00",-1,113,11,90,8
246+ CTEXT "FFFTP‚Ífreeware‚Å‚·",-1,7,231,305,8
247+ CTEXT "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)",-1,7,25,305,32,SS_NOPREFIX
248+ CTEXT "",ABOUT_JRE,7,84,305,8
249+ EDITTEXT ABOUT_URL,7,64,305,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
250+ CTEXT "OLE D&&D‹@”\ by •½“c–L‚³‚ñAnakka‚³‚ñ\nƒzƒXƒg“à‚ł̃tƒ@ƒCƒ‹ˆÚ“®‹@”\ by •½“c–L‚³‚ñ\n‚¢‚­‚‚©‚Ì‹@”\ by miau‚³‚ñ\nƒ}ƒXƒ^[ƒpƒXƒ[ƒh‹@”\ by ‚°‚ñ‚°‚ñ‚³‚ñ\nAESˆÃ†‰» by Moca‚³‚ñ\n\n‘¼A‘½‚­‚Ì•û‚Ì‚²‹¦—Í‚ð‚¢‚½‚¾‚«‚Ü‚µ‚½B",-1,7,131,305,60
251+ CTEXT "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,99,305,27
252+ CTEXT "FTP over SSL/TLS‚ÌŽÀ‘•‚É‚ÍOpenSSL‚ðŽg—p‚µ‚Ä‚¢‚Ü‚·B\nCopyright (c) 1998-2011 The OpenSSL Project. All rights reserved.",-1,7,195,305,24
253253 END
254254
255255 transfer_dlg DIALOG 0, 0, 199, 91
@@ -1385,11 +1385,7 @@ BEGIN
13851385 CONTROL "ˆÃ†‰»‚È‚µ‚Őڑ±‚ð‹–‰Â(&A)",HSET_NO_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,148,10
13861386 CONTROL "FTPS (Explicit)‚Őڑ±(&E)",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
13871387 CONTROL "FTPS (Implicit)‚Őڑ±(&I)",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1388- CONTROL "SFTP‚Őڑ±(&S)",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
1389- LTEXT "”é–§Œ®‚̃eƒLƒXƒg",-1,7,63,64,8
1390- PUSHBUTTON "...",PKEY_FILE_BR,72,63,13,12
1391- EDITTEXT HSET_PRIVATE_KEY,7,79,193,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
1392- CONTROL "Žã‚¢ˆÃ†‰»•ûŽ®‚ðŽg—p‚µ‚È‚¢(&W)",HSET_NO_WEAK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,148,10
1388+ CONTROL "Žã‚¢ˆÃ†‰»•ûŽ®‚ðŽg—p‚µ‚È‚¢(&W)",HSET_NO_WEAK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
13931389 END
13941390
13951391 hset_adv3_dlg DIALOG 0, 0, 207, 155
@@ -2214,8 +2210,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22142210 //
22152211
22162212 VS_VERSION_INFO VERSIONINFO
2217- FILEVERSION 1,99,1,19
2218- PRODUCTVERSION 1,99,1,19
2213+ FILEVERSION 2,0,0,0
2214+ PRODUCTVERSION 2,0,0,0
22192215 FILEFLAGSMASK 0x3fL
22202216 #ifdef _DEBUG
22212217 FILEFLAGS 0x1L
@@ -2233,12 +2229,12 @@ BEGIN
22332229 VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B"
22342230 VALUE "CompanyName", "Sota, FFFTP Project"
22352231 VALUE "FileDescription", "FFFTP"
2236- VALUE "FileVersion", "1, 99, 1, 19"
2232+ VALUE "FileVersion", "2, 0, 0, 0"
22372233 VALUE "InternalName", "FFFTP"
22382234 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)."
22392235 VALUE "OriginalFilename", "FFFTP.exe"
22402236 VALUE "ProductName", "FFFTP"
2241- VALUE "ProductVersion", "1, 99, 1, 19"
2237+ VALUE "ProductVersion", "2, 0, 0, 0"
22422238 END
22432239 END
22442240 BLOCK "VarFileInfo"
--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -235,21 +235,21 @@ END
235235 // Dialog
236236 //
237237
238-about_dlg DIALOGEX 0, 0, 315, 317
238+about_dlg DIALOGEX 0, 0, 315, 269
239239 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
240240 CAPTION "About FFFTP"
241241 FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243- DEFPUSHBUTTON "OK",IDOK,132,296,50,14
243+ DEFPUSHBUTTON "OK",IDOK,132,248,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99a-20171104",-1,110,11,90,8
246- CTEXT "FFFTP is freeware",-1,7,281,301,8
247- CTEXT "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)",-1,7,25,301,44
248- CTEXT "",ABOUT_JRE,7,93,301,8
249- EDITTEXT ABOUT_URL,7,76,301,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
250- CTEXT "OLE D&&D by Yutaka Hirata-san, nakka-san\nIn site file mover by Hirata-san\nAny issues by miau-san\nMaster Password by Gengen-san\nAES encryption by Moca-san\n\nI had cooperation of many other one.",-1,7,142,301,59
251- CTEXT "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,110,301,27
252- CTEXT "OpenSSL is used for implementation of FTP over SSL/TLS.\nCopyright (c) 1998-2011 The OpenSSL Project. All rights reserved.",-1,7,209,305,60
245+ CTEXT "FFFTP Ver 2.00",-1,110,11,90,8
246+ CTEXT "FFFTP is freeware",-1,7,233,301,8
247+ CTEXT "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)",-1,7,25,301,32
248+ CTEXT "",ABOUT_JRE,7,81,301,8
249+ EDITTEXT ABOUT_URL,7,64,301,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
250+ CTEXT "OLE D&&D by Yutaka Hirata-san, nakka-san\nIn site file mover by Hirata-san\nAny issues by miau-san\nMaster Password by Gengen-san\nAES encryption by Moca-san\n\nI had cooperation of many other one.",-1,7,130,301,59
251+ CTEXT "AES program code :\nCopyright (c) 1998-2008, Brian Gladman, Worcester, UK.\nAll rights reserved.",-1,7,98,301,27
252+ CTEXT "OpenSSL is used for implementation of FTP over SSL/TLS.\nCopyright (c) 1998-2011 The OpenSSL Project. All rights reserved.",-1,7,197,305,24
253253 END
254254
255255 transfer_dlg DIALOG 0, 0, 199, 91
@@ -1423,12 +1423,8 @@ BEGIN
14231423 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,148,10
14241424 CONTROL "Connect with FTPS (&Explicit)",HSET_FTPES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,148,10
14251425 CONTROL "Connect with FTPS (&Implicit)",HSET_FTPIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,148,10
1426- CONTROL "Connect with &SFTP",HSET_SFTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
1427- LTEXT "Private key text",-1,7,63,64,8
1428- PUSHBUTTON "...",PKEY_FILE_BR,72,63,13,12
1429- EDITTEXT HSET_PRIVATE_KEY,7,79,193,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
14301426 CONTROL "Do not use &weak encryption methods",HSET_NO_WEAK,
1431- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,148,10
1427+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,148,10
14321428 END
14331429
14341430 hset_adv3_dlg DIALOG 0, 0, 207, 155
@@ -2255,8 +2251,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22552251 //
22562252
22572253 VS_VERSION_INFO VERSIONINFO
2258- FILEVERSION 1,99,1,19
2259- PRODUCTVERSION 1,99,1,19
2254+ FILEVERSION 2,0,0,0
2255+ PRODUCTVERSION 2,0,0,0
22602256 FILEFLAGSMASK 0x3fL
22612257 #ifdef _DEBUG
22622258 FILEFLAGS 0x1L
@@ -2274,12 +2270,12 @@ BEGIN
22742270 VALUE "Comments", "This software is Free Software"
22752271 VALUE "CompanyName", "Sota, FFFTP Project"
22762272 VALUE "FileDescription", "FFFTP"
2277- VALUE "FileVersion", "1, 99, 1, 19"
2273+ VALUE "FileVersion", "2, 0, 0, 0"
22782274 VALUE "InternalName", "FFFTP"
22792275 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)."
22802276 VALUE "OriginalFilename", "FFFTP.exe"
22812277 VALUE "ProductName", "FFFTP"
2282- VALUE "ProductVersion", "1, 99, 1, 19"
2278+ VALUE "ProductVersion", "2, 0, 0, 0"
22832279 END
22842280 END
22852281 BLOCK "VarFileInfo"
--- a/common.h
+++ b/common.h
@@ -72,12 +72,12 @@
7272 //#define PROGRAM_VERSION_NUM 1972 /* バージョン */
7373 // 64ビット対応
7474 #ifdef _WIN64
75-#define VER_STR "1.99a-20171104 64bit"
75+#define VER_STR "2.00 64bit"
7676 #else
77-#define VER_STR "1.99a-20171104"
77+#define VER_STR "2.00"
7878 #endif
79-#define VER_NUM 1991 /* 設定バージョン */
80-#define PROGRAM_VERSION_NUM 1991 /* バージョン */
79+#define VER_NUM 2000 /* 設定バージョン */
80+#define PROGRAM_VERSION_NUM 2000 /* バージョン */
8181 // ソフトウェア自動更新
8282 // リリースバージョンはリリース予定年(10進数4桁)+月(2桁)+日(2桁)+通し番号(0スタート2桁)とする
8383 // 2014年7月31日中の30個目のリリースは2014073129
Binary files a/dist/amd64/libeay32.dll and b/dist/amd64/libcrypto-1_1-x64.dll differ
Binary files a/dist/amd64/ssleay32.dll and b/dist/amd64/libssl-1_1-x64.dll differ
Binary files a/dist/libeay32.dll and b/dist/libcrypto-1_1.dll differ
Binary files a/dist/ssleay32.dll and b/dist/libssl-1_1.dll differ
--- a/filehash.h
+++ b/filehash.h
@@ -4,14 +4,14 @@
44 // ssl.pem
55 #define FILEHASH_SSL_PEM_SHA1 "\xB5\x0E\xE9\xDC\x25\x9D\xAC\x83\x09\xB3\x42\xA3\xB9\x7C\xF2\x1A\xAD\xA8\x27\xA6"
66 #if defined(_M_IX86)
7-// libeay32.dll
8-#define FILEHASH_LIBEAY32_DLL_SHA1 "\xE4\xA5\x2E\xB0\x80\xB5\x07\x4B\x40\xB0\x15\x71\xC5\xAA\x6F\xF8\xF3\xC4\x97\xFC"
9-// ssleay32.dll
10-#define FILEHASH_SSLEAY32_DLL_SHA1 "\x93\x4D\xF4\xDA\x2C\x4A\x65\x53\x56\xA7\xB3\xD3\x2F\x9C\x86\xBA\xB4\xF8\xDD\x48"
7+// libcrypto-1_1.dll
8+#define FILEHASH_LIBCRYPTO_DLL_SHA1 "\x8F\xA8\x54\xD1\x27\x65\x18\xE4\x43\xA5\x5C\xAF\x65\x39\x66\xB8\x3A\x05\xE8\x0B"
9+// libssl-1_1.dll
10+#define FILEHASH_LIBSSL_DLL_SHA1 "\x42\x65\x00\x4A\xC9\xF8\xFE\x28\x49\xE2\x90\x51\x58\x2B\x57\x09\x97\xB0\x3B\xAD"
1111 #elif defined(_M_AMD64)
12-// libeay32.dll
13-#define FILEHASH_LIBEAY32_DLL_SHA1 "\x70\xA9\xCC\x67\x1B\xE5\x18\xF4\x29\x20\xD6\x3F\xBD\xAA\x57\xA6\x12\x43\xE5\xFB"
14-// ssleay32.dll
15-#define FILEHASH_SSLEAY32_DLL_SHA1 "\xF8\xF1\xF0\x1E\x7E\x20\xC6\xBF\x01\x84\xF6\x86\x90\x72\x5F\x8C\xF4\xF3\x2F\x57"
12+// libcrypto-1_1-x64.dll
13+#define FILEHASH_LIBCRYPTO_DLL_SHA1 "\xAF\xD4\xCF\x21\x2B\x87\x92\x25\x6B\x6F\x8E\x49\x36\x85\xD4\xC9\x2E\xFC\x88\xC7"
14+// libssl-1_1-x64.dll
15+#define FILEHASH_LIBSSL_DLL_SHA1 "\x91\xE6\xC3\x0B\xAF\x9A\x13\x24\x12\x73\x3D\x96\x3A\xBA\xB2\xA1\x0D\x43\x44\x5E"
1616 #endif
1717
--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -160,12 +160,18 @@ BOOL LoadOpenSSL()
160160 if(g_bOpenSSLLoaded)
161161 return FALSE;
162162 #ifdef ENABLE_PROCESS_PROTECTION
163- // ssleay32.dll 1.1.0b
164- RegisterTrustedModuleSHA1Hash(FILEHASH_SSLEAY32_DLL_SHA1);
165- // libeay32.dll 1.1.0b
166- RegisterTrustedModuleSHA1Hash(FILEHASH_LIBEAY32_DLL_SHA1);
163+ // libssl-1_1.dll 1.1.0g
164+ RegisterTrustedModuleSHA1Hash(FILEHASH_LIBCRYPTO_DLL_SHA1);
165+ // libcrypto-1_1.dll 1.1.0g
166+ RegisterTrustedModuleSHA1Hash(FILEHASH_LIBSSL_DLL_SHA1);
167+#endif
168+ // OpenSSL 1.1.0対応
169+// g_hOpenSSL = LoadLibrary("ssleay32.dll");
170+#if defined(_M_IX86)
171+ g_hOpenSSL = LoadLibrary("libssl-1_1.dll");
172+#elif defined(_M_AMD64)
173+ g_hOpenSSL = LoadLibrary("libssl-1_1-x64.dll");
167174 #endif
168- g_hOpenSSL = LoadLibrary("ssleay32.dll");
169175 // バージョン固定のためlibssl32.dllの読み込みは脆弱性の原因になり得るので廃止
170176 // if(!g_hOpenSSL)
171177 // g_hOpenSSL = LoadLibrary("libssl32.dll");
@@ -204,7 +210,13 @@ BOOL LoadOpenSSL()
204210 g_hOpenSSL = NULL;
205211 return FALSE;
206212 }
207- g_hOpenSSLCommon = LoadLibrary("libeay32.dll");
213+ // OpenSSL 1.1.0対応
214+// g_hOpenSSLCommon = LoadLibrary("libeay32.dll");
215+#if defined(_M_IX86)
216+ g_hOpenSSLCommon = LoadLibrary("libcrypto-1_1.dll");
217+#elif defined(_M_AMD64)
218+ g_hOpenSSLCommon = LoadLibrary("libcrypto-1_1-x64.dll");
219+#endif
208220 if(!g_hOpenSSLCommon
209221 || !(p_BIO_s_mem = (_BIO_s_mem)GetProcAddress(g_hOpenSSLCommon, "BIO_s_mem"))
210222 || !(p_BIO_new = (_BIO_new)GetProcAddress(g_hOpenSSLCommon, "BIO_new"))