Update PEM file.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 0ca88ec..45dee45 100644 (file)
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 651e10a..32739b0 100644 (file)
Binary files a/FFFTP_Eng_Release_64/FFFTP.exe and b/FFFTP_Eng_Release_64/FFFTP.exe differ

diff --git a/OleDragDrop.c b/OleDragDrop.c
index d634f3e..536e208 100644 (file)
--- a/OleDragDrop.c
+++ b/OleDragDrop.c
@@ -12,6 +12,9 @@
        Include Files\r
 **************************************************************************/\r
 \r
+// UTF-8対応\r
+#include <winsock2.h>\r
+\r
 #define _INC_OLE\r
 #include <windows.h>\r
 #undef _INC_OLE\r
@@ -19,6 +22,9 @@
 #include <oleidl.h>\r
 #include <objidl.h>\r
 \r
+// UTF-8対応\r
+#include "common.h"\r
+\r
 #include "OleDragDrop.h"\r
 \r
 \r

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index b6878f3..873e957 100644 (file)
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 563d4e7..7eb6ddf 100644 (file)
Binary files a/Release_64/FFFTP.exe and b/Release_64/FFFTP.exe differ

diff --git a/common.h b/common.h
index 1e20a54..b7c34f0 100644 (file)
--- a/common.h
+++ b/common.h
@@ -81,7 +81,7 @@
 // ソフトウェア自動更新\r
 // リリースバージョンはリリース予定年（10進数4桁）+月（2桁）+日（2桁）+通し番号（0スタート2桁）とする\r
 // 2014年7月31日中の30個目のリリースは2014073129\r
-#define RELEASE_VERSION_NUM            2015081001      /* リリースバージョン */\r
+#define RELEASE_VERSION_NUM            2015091201      /* リリースバージョン */\r
 \r
 \r
 // SourceForge.JPによるフォーク\r

diff --git a/dist/ssl.pem b/dist/ssl.pem
index 440e52d..1ff34f9 100644 (file)
--- 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 22 03:12:04 2015
+## Certificate data from Mozilla as of: Wed Sep  2 18:30:34 2015
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

diff --git a/filelist.c b/filelist.c
index 97da430..2fc00a1 100755 (executable)
--- a/filelist.c
+++ b/filelist.c
@@ -966,7 +966,6 @@ static LRESULT FileListCommonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
                                        }\r
                                        \r
                                        /* ファイル名の配列を作成する */\r
-                                       // TODO: GlobalAllocが返すのはメモリポインタではなくハンドルだが実際は同じ値\r
                                        FileNameList = (char **)GlobalAlloc(GPTR,sizeof(char *) * filenum);\r
                                        if(FileNameList == NULL){\r
                                                abort();\r

diff --git a/main.c b/main.c
index 0cd893a..534aa0b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -3585,7 +3585,7 @@ BOOL LoadSSLRootCAFile()
                                for(i = 0; i < 5; i++)\r
                                        Hash[i] = _byteswap_ulong(Hash[i]);\r
                                // 同梱する"ssl.pem"に合わせてSHA1ハッシュ値を変更すること\r
-                               if(memcmp(&Hash, &SSLRootCAFileHash, 20) == 0 || memcmp(&Hash, "\x0E\xFA\xF6\x00\xCB\xBE\x99\x35\x4C\xED\x7F\x87\xC8\x33\x1B\x03\x38\x65\xB7\xBD", 20) == 0\r
+                               if(memcmp(&Hash, &SSLRootCAFileHash, 20) == 0 || memcmp(&Hash, "\xEC\xF8\xB8\xF6\xB3\x1E\xDF\x0E\x37\x6B\x7E\x3B\x3A\x95\xF2\xD4\xE7\xB4\x1C\x2D", 20) == 0\r
                                        || DialogBox(GetFtpInst(), MAKEINTRESOURCE(updatesslroot_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)\r
                                {\r
                                        memcpy(&SSLRootCAFileHash, &Hash, 20);\r