Commit: 57a941fcde3c9a0befe7b55352a9d9889dd6453e - OFUKU (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 57a941fcde3c9a0befe7b55352a9d9889dd6453e (tree)
• Zeit: 2014-08-21 23:58:28
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Update PEM file.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: dist/ssl.pem
• modified: main.c

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/dist/ssl.pem
+++ b/dist/ssl.pem
@@ -1,18 +1,21 @@
 ##
-## ca-bundle.crt -- Bundle of CA Root Certificates
+## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Tue Jul 15 08:33:20 2014
+## Certificate data from Mozilla downloaded on: Wed Aug 20 03:12:04 2014
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
 ## file (certdata.txt).  This file can be found in the mozilla source tree:
-## http://mxr.mozilla.org/mozilla-release/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
 ##
 ## It contains the certificates in PEM format and therefore
 ## can be directly used with curl / libcurl / php_curl, or with
 ## an Apache+mod_ssl webserver for SSL client authentication.
 ## Just configure this file as the SSLCACertificateFile.
 ##
+## Conversion done with mk-ca-bundle.pl verison 1.22.
+## SHA1: bf2c15b3019e696660321d2227d942936dc50aa7
+##
 
 
 GTE CyberTrust Global Root

--- a/main.c
+++ b/main.c
@@ -3562,7 +3562,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, "\xCB\x19\xC1\x7F\xDA\x9E\x9F\x4A\xC0\xF1\x27\x29\xC6\x68\x2D\xB1\x5D\x9B\x5F\xFD", 20) == 0
+				if(memcmp(&Hash, &SSLRootCAFileHash, 20) == 0 || memcmp(&Hash, "\xFD\x0A\x69\x0D\x83\x9E\x7C\xCE\xF1\xDE\x64\x1C\x28\xA2\x86\xC4\x39\xB9\xA4\x37", 20) == 0
 					|| DialogBox(GetFtpInst(), MAKEINTRESOURCE(updatesslroot_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)
 				{
 					memcpy(&SSLRootCAFileHash, &Hash, 20);