From: s_kawamoto Date: Sun, 11 Sep 2016 09:42:44 +0000 (+0900) Subject: Rebuild OpenSSL with backward compatibility options. X-Git-Url: http://git.osdn.net/view?p=ffftp%2Fffftp.git;a=commitdiff_plain;h=4cace061b31dda39ac8c755b9c9d6c2f93f55490 Rebuild OpenSSL with backward compatibility options. Fix bugs of handling timestamps. --- diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe index 17886a3..d70f884 100644 Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ diff --git a/FFFTP_Eng_Release_64/FFFTP.exe b/FFFTP_Eng_Release_64/FFFTP.exe index 1e91936..f491c51 100644 Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ diff --git a/OpenSSL/buildx64.bat b/OpenSSL/buildx64.bat index 10a7c4d..d453ea8 100644 --- a/OpenSSL/buildx64.bat +++ b/OpenSSL/buildx64.bat @@ -2,7 +2,7 @@ pushd %~dp0 set var0=VC-WIN64A set var1=..\dist\amd64 -perl Configure %var0% no-asm --prefix="%cd%" +perl Configure %var0% no-asm enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers md %var1% perl nodebug.pl nmake /f makefile diff --git a/OpenSSL/buildx86.bat b/OpenSSL/buildx86.bat index bf356a6..49b7c04 100644 --- a/OpenSSL/buildx86.bat +++ b/OpenSSL/buildx86.bat @@ -2,7 +2,7 @@ pushd %~dp0 set var0=VC-WIN32 set var1=..\dist -perl Configure %var0% no-asm --prefix="%cd%" +perl Configure %var0% no-asm enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers md %var1% perl nodebug.pl nmake /f makefile diff --git a/OpenSSL/nodebug.pl b/OpenSSL/nodebug.pl index 2e44e43..61905da 100644 --- a/OpenSSL/nodebug.pl +++ b/OpenSSL/nodebug.pl @@ -11,6 +11,8 @@ for(@data) $_ =~ s/libcrypto-1_1/libeay32/g; $_ =~ s/\$\(MTOUTFLAG\)ssleay32\.dll/\$\(MTOUTFLAG\)ssleay32\.dll;#2/g; $_ =~ s/\$\(MTOUTFLAG\)libeay32\.dll/\$\(MTOUTFLAG\)libeay32\.dll;#2/g; + $_ =~ s/\"-DENGINESDIR=/\"-DENGINESDIR=\\\"\.\\\"\" \"-D_ENGINESDIR=/g; + $_ =~ s/\"-DOPENSSLDIR=/\"-DOPENSSLDIR=\\\"\.\\\"\" \"-D_OPENSSLDIR=/g; print FILE $_; } close(FILE); diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe index f0a3b40..93cf226 100644 Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ diff --git a/Release_64/FFFTP.exe b/Release_64/FFFTP.exe index 7b759e1..deb1936 100644 Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ diff --git a/Resource/FFFTP.rc b/Resource/FFFTP.rc index 02d8dc0..64ca843 100644 --- a/Resource/FFFTP.rc +++ b/Resource/FFFTP.rc @@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,133,294,50,14 ICON ffftp,-1,7,4,20,20 - CTEXT "FFFTP Ver 1.99a-20160828",-1,113,11,90,8 + CTEXT "FFFTP Ver 1.99a-20160911",-1,113,11,90,8 CTEXT "FFFTP‚Ífreeware‚Å‚·",-1,7,279,305,8 CTEXT "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)",-1,7,25,305,44,SS_NOPREFIX CTEXT "",ABOUT_JRE,7,96,305,8 @@ -2213,8 +2213,8 @@ nodrop_csr CURSOR "nodrop_c.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,99,1,4 - PRODUCTVERSION 1,99,1,4 + FILEVERSION 1,99,1,5 + PRODUCTVERSION 1,99,1,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -2232,12 +2232,12 @@ BEGIN VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B" VALUE "CompanyName", "Sota, FFFTP Project" VALUE "FileDescription", "FFFTP" - VALUE "FileVersion", "1, 99, 1, 4" + VALUE "FileVersion", "1, 99, 1, 5" VALUE "InternalName", "FFFTP" VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, ‚¤‚ȁ[, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ‚Ó‚¤‚¹‚ñ)." VALUE "OriginalFilename", "FFFTP.exe" VALUE "ProductName", "FFFTP" - VALUE "ProductVersion", "1, 99, 1, 4" + VALUE "ProductVersion", "1, 99, 1, 5" END END BLOCK "VarFileInfo" diff --git a/Resource_eng/ffftp.rc b/Resource_eng/ffftp.rc index 1d9f25b..4d090cf 100644 --- a/Resource_eng/ffftp.rc +++ b/Resource_eng/ffftp.rc @@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,132,296,50,14 ICON ffftp,-1,7,4,20,20 - CTEXT "FFFTP Ver 1.99a-20160828",-1,110,11,90,8 + CTEXT "FFFTP Ver 1.99a-20160911",-1,110,11,90,8 CTEXT "FFFTP is freeware",-1,7,281,301,8 CTEXT "Copyright(C) 1997-2010 Sota && cooperators\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)",-1,7,25,301,44 CTEXT "",ABOUT_JRE,7,93,301,8 @@ -2253,8 +2253,8 @@ nodrop_csr CURSOR "nodrop_c.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,99,1,4 - PRODUCTVERSION 1,99,1,4 + FILEVERSION 1,99,1,5 + PRODUCTVERSION 1,99,1,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -2272,12 +2272,12 @@ BEGIN VALUE "Comments", "This software is Free Software" VALUE "CompanyName", "Sota, FFFTP Project" VALUE "FileDescription", "FFFTP" - VALUE "FileVersion", "1, 99, 1, 4" + VALUE "FileVersion", "1, 99, 1, 5" VALUE "InternalName", "FFFTP" VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & cooperators\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen)." VALUE "OriginalFilename", "FFFTP.exe" VALUE "ProductName", "FFFTP" - VALUE "ProductVersion", "1, 99, 1, 4" + VALUE "ProductVersion", "1, 99, 1, 5" END END BLOCK "VarFileInfo" diff --git a/common.h b/common.h index 71c4dfb..ca4c248 100644 --- a/common.h +++ b/common.h @@ -72,16 +72,16 @@ //#define PROGRAM_VERSION_NUM 1972 /* バージョン */ // 64ビット対応 #ifdef _WIN64 -#define VER_STR "1.99a-20160828 64bit" +#define VER_STR "1.99a-20160911 64bit" #else -#define VER_STR "1.99a-20160828" +#define VER_STR "1.99a-20160911" #endif #define VER_NUM 1990 /* 設定バージョン */ #define PROGRAM_VERSION_NUM 1990 /* バージョン */ // ソフトウェア自動更新 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする // 2014å¹´7月31日中の30個目のリリースは2014073129 -#define RELEASE_VERSION_NUM 2016082800 /* リリースバージョン */ +#define RELEASE_VERSION_NUM 2016091100 /* リリースバージョン */ // SourceForge.JPによるフォーク diff --git a/contrib/openssl/include/openssl/opensslconf.h b/contrib/openssl/include/openssl/opensslconf.h index 65c821c..e3bb6be 100644 --- a/contrib/openssl/include/openssl/opensslconf.h +++ b/contrib/openssl/include/openssl/opensslconf.h @@ -64,21 +64,12 @@ extern "C" { #ifndef OPENSSL_NO_SSL_TRACE # define OPENSSL_NO_SSL_TRACE #endif -#ifndef OPENSSL_NO_SSL3 -# define OPENSSL_NO_SSL3 -#endif -#ifndef OPENSSL_NO_SSL3_METHOD -# define OPENSSL_NO_SSL3_METHOD -#endif #ifndef OPENSSL_NO_UBSAN # define OPENSSL_NO_UBSAN #endif #ifndef OPENSSL_NO_UNIT_TEST # define OPENSSL_NO_UNIT_TEST #endif -#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS -# define OPENSSL_NO_WEAK_SSL_CIPHERS -#endif #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif diff --git a/dist/amd64/libeay32.dll b/dist/amd64/libeay32.dll index 3c291bd..34fc13d 100644 Binary files a/dist/amd64/libeay32.dll and b/dist/amd64/libeay32.dll differ diff --git a/dist/amd64/ssleay32.dll b/dist/amd64/ssleay32.dll index b8bcd12..bdc6850 100644 Binary files a/dist/amd64/ssleay32.dll and b/dist/amd64/ssleay32.dll differ diff --git a/dist/libeay32.dll b/dist/libeay32.dll index 82e1968..edb4e8b 100644 Binary files a/dist/libeay32.dll and b/dist/libeay32.dll differ diff --git a/dist/ssl.pem b/dist/ssl.pem index c15368b..9954caa 100644 --- a/dist/ssl.pem +++ b/dist/ssl.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Apr 20 03:12:05 2016 +## Certificate data from Mozilla as of: Wed Sep 7 03:12:05 2016 ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -13,8 +13,8 @@ ## an Apache+mod_ssl webserver for SSL client authentication. ## Just configure this file as the SSLCACertificateFile. ## -## Conversion done with mk-ca-bundle.pl version 1.25. -## SHA1: 5df367cda83086392e1acdf22bfef00c48d5eba6 +## Conversion done with mk-ca-bundle.pl version 1.26. +## SHA1: 36aebbcc910dcab8838e6e721523d84f0ed20589 ## @@ -3863,3 +3863,174 @@ ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7 zAYspsbiDrW5viSP -----END CERTIFICATE----- + +Hellenic Academic and Research Institutions RootCA 2015 +======================================================= +-----BEGIN CERTIFICATE----- +MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT +BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0 +aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl +YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx +MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg +QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV +BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw +MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv +bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh +iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+ +6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd +FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr +i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F +GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2 +fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu +iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc +Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI +hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+ +D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM +d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y +d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn +82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb +davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F +Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt +J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa +JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q +p/UsQu0yrbYhnr68 +-----END CERTIFICATE----- + +Hellenic Academic and Research Institutions ECC RootCA 2015 +=========================================================== +-----BEGIN CERTIFICATE----- +MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0 +aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u +cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj +aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw +MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj +IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD +VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290 +Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP +dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK +Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O +BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA +GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn +dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR +-----END CERTIFICATE----- + +Certplus Root CA G1 +=================== +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgISESBVg+QtPlRWhS2DN7cs3EYRMA0GCSqGSIb3DQEBDQUAMD4xCzAJBgNV +BAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTAe +Fw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhD +ZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBANpQh7bauKk+nWT6VjOaVj0W5QOVsjQcmm1iBdTYj+eJZJ+622SLZOZ5KmHN +r49aiZFluVj8tANfkT8tEBXgfs+8/H9DZ6itXjYj2JizTfNDnjl8KvzsiNWI7nC9hRYt6kuJPKNx +Qv4c/dMcLRC4hlTqQ7jbxofaqK6AJc96Jh2qkbBIb6613p7Y1/oA/caP0FG7Yn2ksYyy/yARujVj +BYZHYEMzkPZHogNPlk2dT8Hq6pyi/jQu3rfKG3akt62f6ajUeD94/vI4CTYd0hYCyOwqaK/1jpTv +LRN6HkJKHRUxrgwEV/xhc/MxVoYxgKDEEW4wduOU8F8ExKyHcomYxZ3MVwia9Az8fXoFOvpHgDm2 +z4QTd28n6v+WZxcIbekN1iNQMLAVdBM+5S//Ds3EC0pd8NgAM0lm66EYfFkuPSi5YXHLtaW6uOrc +4nBvCGrch2c0798wct3zyT8j/zXhviEpIDCB5BmlIOklynMxdCm+4kLV87ImZsdo/Rmz5yCTmehd +4F6H50boJZwKKSTUzViGUkAksnsPmBIgJPaQbEfIDbsYIC7Z/fyL8inqh3SV4EJQeIQEQWGw9CEj +jy3LKCHyamz0GqbFFLQ3ZU+V/YDI+HLlJWvEYLF7bY5KinPOWftwenMGE9nTdDckQQoRb5fc5+R+ +ob0V8rqHDz1oihYHAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G +A1UdDgQWBBSowcCbkahDFXxdBie0KlHYlwuBsTAfBgNVHSMEGDAWgBSowcCbkahDFXxdBie0KlHY +lwuBsTANBgkqhkiG9w0BAQ0FAAOCAgEAnFZvAX7RvUz1isbwJh/k4DgYzDLDKTudQSk0YcbX8ACh +66Ryj5QXvBMsdbRX7gp8CXrc1cqh0DQT+Hern+X+2B50ioUHj3/MeXrKls3N/U/7/SMNkPX0XtPG +YX2eEeAC7gkE2Qfdpoq3DIMku4NQkv5gdRE+2J2winq14J2by5BSS7CTKtQ+FjPlnsZlFT5kOwQ/ +2wyPX1wdaR+v8+khjPPvl/aatxm2hHSco1S1cE5j2FddUyGbQJJD+tZ3VTNPZNX70Cxqjm0lpu+F +6ALEUz65noe8zDUa3qHpimOHZR4RKttjd5cUvpoUmRGywO6wT/gUITJDT5+rosuoD6o7BlXGEilX +CNQ314cnrUlZp5GrRHpejXDbl85IULFzk/bwg2D5zfHhMf1bfHEhYxQUqq/F3pN+aLHsIqKqkHWe +tUNy6mSjhEv9DKgma3GX7lZjZuhCVPnHHd/Qj1vfyDBviP4NxDMcU6ij/UgQ8uQKTuEVV/xuZDDC +VRHc6qnNSlSsKWNEz0pAoNZoWRsz+e86i9sgktxChL8Bq4fA1SCC28a5g4VCXA9DO2pJNdWY9BW/ ++mGBDAkgGNLQFwzLSABQ6XaCjGTXOqAHVcweMcDvOrRl++O/QmueD6i9a5jc2NvLi6Td11n0bt3+ +qsOR0C5CB8AMTVPNJLFMWx5R9N/pkvo= +-----END CERTIFICATE----- + +Certplus Root CA G2 +=================== +-----BEGIN CERTIFICATE----- +MIICHDCCAaKgAwIBAgISESDZkc6uo+jF5//pAq/Pc7xVMAoGCCqGSM49BAMDMD4xCzAJBgNVBAYT +AkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjAeFw0x +NDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0 +cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BM0PW1aC3/BFGtat93nwHcmsltaeTpwftEIRyoa/bfuFo8XlGVzX7qY/aWfYeOKmycTbLXku54uN +Am8xIk0G42ByRZ0OQneezs/lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0PAQH/BAQD +AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMB8GA1Ud +IwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqGSM49BAMDA2gAMGUCMHD+sAvZ94OX7PNV +HdTcswYO/jOYnYs5kGuUIe22113WTNchp+e/IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjl +vPl5adytRSv3tjFzzAalU5ORGpOucGpnutee5WEaXw== +-----END CERTIFICATE----- + +OpenTrust Root CA G1 +==================== +-----BEGIN CERTIFICATE----- +MIIFbzCCA1egAwIBAgISESCzkFU5fX82bWTCp59rY45nMA0GCSqGSIb3DQEBCwUAMEAxCzAJBgNV +BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcx +MB4XDTE0MDUyNjA4NDU1MFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM +CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzEwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQD4eUbalsUwXopxAy1wpLuwxQjczeY1wICkES3d5oeuXT2R0odsN7fa +Yp6bwiTXj/HbpqbfRm9RpnHLPhsxZ2L3EVs0J9V5ToybWL0iEA1cJwzdMOWo010hOHQX/uMftk87 +ay3bfWAfjH1MBcLrARYVmBSO0ZB3Ij/swjm4eTrwSSTilZHcYTSSjFR077F9jAHiOH3BX2pfJLKO +YheteSCtqx234LSWSE9mQxAGFiQD4eCcjsZGT44ameGPuY4zbGneWK2gDqdkVBFpRGZPTBKnjix9 +xNRbxQA0MMHZmf4yzgeEtE7NCv82TWLxp2NX5Ntqp66/K7nJ5rInieV+mhxNaMbBGN4zK1FGSxyO +9z0M+Yo0FMT7MzUj8czxKselu7Cizv5Ta01BG2Yospb6p64KTrk5M0ScdMGTHPjgniQlQ/GbI4Kq +3ywgsNw2TgOzfALU5nsaqocTvz6hdLubDuHAk5/XpGbKuxs74zD0M1mKB3IDVedzagMxbm+WG+Oi +n6+Sx+31QrclTDsTBM8clq8cIqPQqwWyTBIjUtz9GVsnnB47ev1CI9sjgBPwvFEVVJSmdz7QdFG9 +URQIOTfLHzSpMJ1ShC5VkLG631UAC9hWLbFJSXKAqWLXwPYYEQRVzXR7z2FwefR7LFxckvzluFqr +TJOVoSfupb7PcSNCupt2LQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUl0YhVyE12jZVx/PxN3DlCPaTKbYwHwYDVR0jBBgwFoAUl0YhVyE12jZVx/Px +N3DlCPaTKbYwDQYJKoZIhvcNAQELBQADggIBAB3dAmB84DWn5ph76kTOZ0BP8pNuZtQ5iSas000E +PLuHIT839HEl2ku6q5aCgZG27dmxpGWX4m9kWaSW7mDKHyP7Rbr/jyTwyqkxf3kfgLMtMrpkZ2Cv +uVnN35pJ06iCsfmYlIrM4LvgBBuZYLFGZdwIorJGnkSI6pN+VxbSFXJfLkur1J1juONI5f6ELlgK +n0Md/rcYkoZDSw6cMoYsYPXpSOqV7XAp8dUv/TW0V8/bhUiZucJvbI/NeJWsZCj9VrDDb8O+WVLh +X4SPgPL0DTatdrOjteFkdjpY3H1PXlZs5VVZV6Xf8YpmMIzUUmI4d7S+KNfKNsSbBfD4Fdvb8e80 +nR14SohWZ25g/4/Ii+GOvUKpMwpZQhISKvqxnUOOBZuZ2mKtVzazHbYNeS2WuOvyDEsMpZTGMKcm +GS3tTAZQMPH9WD25SxdfGbRqhFS0OE85og2WaMMolP3tLR9Ka0OWLpABEPs4poEL0L9109S5zvE/ +bw4cHjdx5RiHdRk/ULlepEU0rbDK5uUTdg8xFKmOLZTW1YVNcxVPS/KyPu1svf0OnWZzsD2097+o +4BGkxK51CUpjAEggpsadCwmKtODmzj7HPiY46SvepghJAwSQiumPv+i2tCqjI40cHLI5kqiPAlxA +OXXUc0ECd97N4EOH1uS6SsNsEn/+KuYj1oxx +-----END CERTIFICATE----- + +OpenTrust Root CA G2 +==================== +-----BEGIN CERTIFICATE----- +MIIFbzCCA1egAwIBAgISESChaRu/vbm9UpaPI+hIvyYRMA0GCSqGSIb3DQEBDQUAMEAxCzAJBgNV +BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcy +MB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM +CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzIwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQDMtlelM5QQgTJT32F+D3Y5z1zCU3UdSXqWON2ic2rxb95eolq5cSG+ +Ntmh/LzubKh8NBpxGuga2F8ORAbtp+Dz0mEL4DKiltE48MLaARf85KxP6O6JHnSrT78eCbY2albz +4e6WiWYkBuTNQjpK3eCasMSCRbP+yatcfD7J6xcvDH1urqWPyKwlCm/61UWY0jUJ9gNDlP7ZvyCV +eYCYitmJNbtRG6Q3ffyZO6v/v6wNj0OxmXsWEH4db0fEFY8ElggGQgT4hNYdvJGmQr5J1WqIP7wt +UdGejeBSzFfdNTVY27SPJIjki9/ca1TSgSuyzpJLHB9G+h3Ykst2Z7UJmQnlrBcUVXDGPKBWCgOz +3GIZ38i1MH/1PCZ1Eb3XG7OHngevZXHloM8apwkQHZOJZlvoPGIytbU6bumFAYueQ4xncyhZW+vj +3CzMpSZyYhK05pyDRPZRpOLAeiRXyg6lPzq1O4vldu5w5pLeFlwoW5cZJ5L+epJUzpM5ChaHvGOz +9bGTXOBut9Dq+WIyiET7vycotjCVXRIouZW+j1MY5aIYFuJWpLIsEPUdN6b4t/bQWVyJ98LVtZR0 +0dX+G7bw5tYee9I8y6jj9RjzIR9u701oBnstXW5DiabA+aC/gh7PU3+06yzbXfZqfUAkBXKJOAGT +y3HCOV0GEfZvePg3DTmEJwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUajn6QiL35okATV59M4PLuG53hq8wHwYDVR0jBBgwFoAUajn6QiL35okATV59 +M4PLuG53hq8wDQYJKoZIhvcNAQENBQADggIBAJjLq0A85TMCl38th6aP1F5Kr7ge57tx+4BkJamz +Gj5oXScmp7oq4fBXgwpkTx4idBvpkF/wrM//T2h6OKQQbA2xx6R3gBi2oihEdqc0nXGEL8pZ0keI +mUEiyTCYYW49qKgFbdEfwFFEVn8nNQLdXpgKQuswv42hm1GqO+qTRmTFAHneIWv2V6CG1wZy7HBG +S4tz3aAhdT7cHcCP009zHIXZ/n9iyJVvttN7jLpTwm+bREx50B1ws9efAvSyB7DH5fitIw6mVskp +EndI2S9G/Tvw/HRwkqWOOAgfZDC2t0v7NqwQjqBSM2OdAzVWxWm9xiNaJ5T2pBL4LTM8oValX9YZ +6e18CL13zSdkzJTaTkZQh+D5wVOAHrut+0dSixv9ovneDiK3PTNZbNTe9ZUGMg1RGUFcPk8G97kr +gCf2o6p6fAbhQ8MTOWIaNr3gKC6UAuQpLmBVrkA9sHSSXvAgZJY/X0VdiLWK2gKgW0VU3jg9CcCo +SmVGFvyqv1ROTVu+OEO3KMqLM6oaJbolXCkvW0pujOotnCr2BXbgd5eAiN1nE28daCSLT7d0geX0 +YJ96Vdc+N9oWaz53rK4YcJUIeSkDiv7BO7M/Gg+kO14fWKGVyasvc0rQLW6aWQ9VGHgtPFGml4vm +u7JwqkwR3v98KzfUetF3NI/n+UL3PIEMS1IK +-----END CERTIFICATE----- + +OpenTrust Root CA G3 +==================== +-----BEGIN CERTIFICATE----- +MIICITCCAaagAwIBAgISESDm+Ez8JLC+BUCs2oMbNGA/MAoGCCqGSM49BAMDMEAxCzAJBgNVBAYT +AkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEczMB4X +DTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9w +ZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAARK7liuTcpm3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5B +ta1doYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4GA1UdDwEB +/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAf +BgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAKBggqhkjOPQQDAwNpADBmAjEAj6jcnboM +BBf6Fek9LykBl7+BFjNAk2z8+e2AcG+qj9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta +3U1fJAuwACEl74+nBCZx4nxp5V2a+EEfOzmTk51V6s2N8fvB +-----END CERTIFICATE----- diff --git a/dist/ssleay32.dll b/dist/ssleay32.dll index 3c1a3ce..4a97c43 100644 Binary files a/dist/ssleay32.dll and b/dist/ssleay32.dll differ diff --git a/filelist.c b/filelist.c index cdecf45..4037d7c 100755 --- a/filelist.c +++ b/filelist.c @@ -3525,13 +3525,19 @@ static int MakeLocalTree(char *Path, FILELIST **Base) Pkt.Size = MakeLongLong(FindBuf.nFileSizeHigh, FindBuf.nFileSizeLow); Pkt.Attr = 0; Pkt.Time = FindBuf.ftLastWriteTime; - FileTimeToSystemTime(&Pkt.Time, &TmpStime); // タイムスタンプのバグ修正 +// FileTimeToSystemTime(&Pkt.Time, &TmpStime); // TmpStime.wSecond = 0; - if(DispTimeSeconds == NO) - TmpStime.wSecond = 0; - TmpStime.wMilliseconds = 0; - SystemTimeToFileTime(&TmpStime, &Pkt.Time); +// SystemTimeToFileTime(&TmpStime, &Pkt.Time); + if(FileTimeToSystemTime(&Pkt.Time, &TmpStime)) + { + if(DispTimeSeconds == NO) + TmpStime.wSecond = 0; + TmpStime.wMilliseconds = 0; + SystemTimeToFileTime(&TmpStime, &Pkt.Time); + } + else + memset(&Pkt.Time, 0, sizeof(FILETIME)); AddFileList(&Pkt, Base); } } diff --git a/ftpproc.c b/ftpproc.c index 800bac1..94037d5 100644 --- a/ftpproc.c +++ b/ftpproc.c @@ -767,18 +767,28 @@ static void DispMirrorFiles(FILELIST *Local, FILELIST *Remote) while(Local != NULL) { FileTimeToLocalFileTime(&Local->Time, &fTime); - FileTimeToSystemTime(&fTime, &sTime); - sprintf(Date, "%04d/%02d/%02d %02d:%02d:%02d.%04d", - sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, sTime.wMilliseconds); + // タイムスタンプのバグ修正 +// FileTimeToSystemTime(&fTime, &sTime); +// sprintf(Date, "%04d/%02d/%02d %02d:%02d:%02d.%04d", +// sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, sTime.wMilliseconds); + if(FileTimeToSystemTime(&fTime, &sTime)) + sprintf(Date, "%04d/%02d/%02d %02d:%02d:%02d.%04d", sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, sTime.wMilliseconds); + else + strcpy(Date, ""); DoPrintf("LOCAL : %s %s [%s] %s", Local->Attr==1?"YES":"NO ", Local->Node==NODE_DIR?"DIR ":"FILE", Date, Local->File); Local = Local->Next; } while(Remote != NULL) { FileTimeToLocalFileTime(&Remote->Time, &fTime); - FileTimeToSystemTime(&fTime, &sTime); - sprintf(Date, "%04d/%02d/%02d %02d:%02d:%02d.%04d", - sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, sTime.wMilliseconds); + // タイムスタンプのバグ修正 +// FileTimeToSystemTime(&fTime, &sTime); +// sprintf(Date, "%04d/%02d/%02d %02d:%02d:%02d.%04d", +// sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, sTime.wMilliseconds); + if(FileTimeToSystemTime(&fTime, &sTime)) + sprintf(Date, "%04d/%02d/%02d %02d:%02d:%02d.%04d", sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, sTime.wMilliseconds); + else + strcpy(Date, ""); DoPrintf("REMOTE : %s %s [%s] %s", Remote->Attr==1?"YES":"NO ", Remote->Node==NODE_DIR?"DIR ":"FILE", Date, Remote->File); Remote = Remote->Next; } @@ -1590,19 +1600,37 @@ void MirrorUploadProc(int Notify) FileTimeToLocalFileTime(&RemotePos->Time, &TmpFtimeR); if((RemotePos->InfoExist & FINFO_TIME) == 0) { - FileTimeToSystemTime(&TmpFtimeL, &TmpStime); - TmpStime.wHour = 0; - TmpStime.wMinute = 0; - TmpStime.wSecond = 0; - TmpStime.wMilliseconds = 0; - SystemTimeToFileTime(&TmpStime, &TmpFtimeL); - - FileTimeToSystemTime(&TmpFtimeR, &TmpStime); - TmpStime.wHour = 0; - TmpStime.wMinute = 0; - TmpStime.wSecond = 0; - TmpStime.wMilliseconds = 0; - SystemTimeToFileTime(&TmpStime, &TmpFtimeR); + // タイムスタンプのバグ修正 +// FileTimeToSystemTime(&TmpFtimeL, &TmpStime); +// TmpStime.wHour = 0; +// TmpStime.wMinute = 0; +// TmpStime.wSecond = 0; +// TmpStime.wMilliseconds = 0; +// SystemTimeToFileTime(&TmpStime, &TmpFtimeL); + if(FileTimeToSystemTime(&TmpFtimeL, &TmpStime)) + { + TmpStime.wHour = 0; + TmpStime.wMinute = 0; + TmpStime.wSecond = 0; + TmpStime.wMilliseconds = 0; + SystemTimeToFileTime(&TmpStime, &TmpFtimeL); + } + + // タイムスタンプのバグ修正 +// FileTimeToSystemTime(&TmpFtimeR, &TmpStime); +// TmpStime.wHour = 0; +// TmpStime.wMinute = 0; +// TmpStime.wSecond = 0; +// TmpStime.wMilliseconds = 0; +// SystemTimeToFileTime(&TmpStime, &TmpFtimeR); + if(FileTimeToSystemTime(&TmpFtimeR, &TmpStime)) + { + TmpStime.wHour = 0; + TmpStime.wMinute = 0; + TmpStime.wSecond = 0; + TmpStime.wMilliseconds = 0; + SystemTimeToFileTime(&TmpStime, &TmpFtimeR); + } } RemotePos->Attr = NO; if(CompareFileTime(&TmpFtimeL, &TmpFtimeR) <= 0) diff --git a/main.c b/main.c index 98ec605..3cbd826 100644 --- a/main.c +++ b/main.c @@ -3596,7 +3596,7 @@ BOOL LoadSSLRootCAFile() for(i = 0; i < 5; i++) Hash[i] = _byteswap_ulong(Hash[i]); // 同梱する"ssl.pem"に合わせてSHA1ハッシュ値を変更すること - if(memcmp(&Hash, &SSLRootCAFileHash, 20) == 0 || memcmp(&Hash, "\x7E\x0D\x21\xE1\x07\x18\x1B\x8F\x59\x31\x89\x74\x27\xCC\xFD\xB3\xC6\xED\xD9\x74", 20) == 0 + if(memcmp(&Hash, &SSLRootCAFileHash, 20) == 0 || memcmp(&Hash, "\xDF\x8E\xE2\x5A\xC7\x01\x03\x1C\x3A\x61\x00\xA2\x53\xCA\xF8\xDC\xA0\xC1\xA6\x3B", 20) == 0 || DialogBox(GetFtpInst(), MAKEINTRESOURCE(updatesslroot_dlg), GetMainHwnd(), ExeEscDialogProc) == YES) { memcpy(&SSLRootCAFileHash, &Hash, 20); diff --git a/misc.c b/misc.c index a6f89ee..606b556 100644 --- a/misc.c +++ b/misc.c @@ -1203,7 +1203,10 @@ void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist, int // /* "yyyy/mm/dd hh:mm" */ /* "yyyy/mm/dd hh:mm:ss" */ FileTimeToLocalFileTime(Time, &fTime); - FileTimeToSystemTime(&fTime, &sTime); + // タイムスタンプのバグ修正 +// FileTimeToSystemTime(&fTime, &sTime); + if(!FileTimeToSystemTime(&fTime, &sTime)) + InfoExist = 0; // タイムスタンプのバグ修正 // if(InfoExist & FINFO_DATE) diff --git a/socketwrapper.c b/socketwrapper.c index 5c9b148..421d916 100644 --- a/socketwrapper.c +++ b/socketwrapper.c @@ -162,14 +162,14 @@ BOOL LoadOpenSSL() // 同梱するOpenSSLのバージョンに合わせてSHA1ハッシュ値を変更すること #if defined(_M_IX86) // ssleay32.dll 1.1.0 - RegisterTrustedModuleSHA1Hash("\x36\xFA\x98\xA1\xBE\x62\xB2\x07\xF0\xB8\x20\xE0\xB2\x86\x41\x68\xE2\x8D\x8B\x0F"); + RegisterTrustedModuleSHA1Hash("\x91\x4D\xEC\xE1\x30\x6C\xCB\x62\x89\xA6\xC1\x55\xC5\x94\x05\xF6\xA1\x58\x60\x7F"); // libeay32.dll 1.1.0 - RegisterTrustedModuleSHA1Hash("\x2C\xD5\x65\x74\x2A\x8D\xE3\x22\x8F\xFE\xA9\x6D\xB5\x9D\x34\xFB\xBB\x23\x73\xFD"); + RegisterTrustedModuleSHA1Hash("\xAF\xE4\xFF\x1D\xC6\xCE\x4F\x76\xE9\x84\x16\x4F\xA3\xC4\x75\x72\xAF\xE0\x83\x07"); #elif defined(_M_AMD64) // ssleay32.dll 1.1.0 - RegisterTrustedModuleSHA1Hash("\x1A\xA5\x43\xC8\x19\x85\x16\xC0\x19\x04\x8D\xD2\xE0\xF3\xF8\x73\x4D\x9E\xA0\x2F"); + RegisterTrustedModuleSHA1Hash("\xD6\x21\xD0\xF5\xDA\x9D\xD5\x3F\x92\xD3\x63\xD5\xDC\x5D\xBB\xE6\x49\xE2\x7E\x72"); // libeay32.dll 1.1.0 - RegisterTrustedModuleSHA1Hash("\xC4\x4E\xD4\x5B\xEF\xA6\xC0\x9F\x6A\x45\xEC\x26\xDE\xEC\x3A\xC0\x24\x00\xF1\x66"); + RegisterTrustedModuleSHA1Hash("\xFA\xFA\xB7\x06\x58\x46\x5A\x5F\x41\x05\x28\x9F\x65\x57\xD2\x4B\xC6\x1B\xE6\x02"); #endif #endif g_hOpenSSL = LoadLibrary("ssleay32.dll");