• R/O
  • HTTP
  • SSH
  • HTTPS

ffftp: コミット

FFFTPのソースコードです。


コミットメタ情報

リビジョン34bd50bfe3f59ae7c9f8efc875a473cdf43950c5 (tree)
日時2017-02-17 22:14:19
作者s_kawamoto <s_kawamoto@user...>
コミッターs_kawamoto

ログメッセージ

Update OpenSSL to 1.1.0e.

変更サマリ

差分

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
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
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243243 DEFPUSHBUTTON "OK",IDOK,133,294,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99a-20170128",-1,113,11,90,8
245+ CTEXT "FFFTP Ver 1.99a-20170217",-1,113,11,90,8
246246 CTEXT "FFFTPはfreewareです",-1,7,279,305,8
247247 CTEXT "Copyright(C) 1997-2010 Sota & ご協力いただいた方々\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
248248 CTEXT "",ABOUT_JRE,7,96,305,8
@@ -2213,8 +2213,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22132213 //
22142214
22152215 VS_VERSION_INFO VERSIONINFO
2216- FILEVERSION 1,99,1,10
2217- PRODUCTVERSION 1,99,1,10
2216+ FILEVERSION 1,99,1,11
2217+ PRODUCTVERSION 1,99,1,11
22182218 FILEFLAGSMASK 0x3fL
22192219 #ifdef _DEBUG
22202220 FILEFLAGS 0x1L
@@ -2232,12 +2232,12 @@ BEGIN
22322232 VALUE "Comments", "これはフリーソフトウエアです。"
22332233 VALUE "CompanyName", "Sota, FFFTP Project"
22342234 VALUE "FileDescription", "FFFTP"
2235- VALUE "FileVersion", "1, 99, 1, 10"
2235+ VALUE "FileVersion", "1, 99, 1, 11"
22362236 VALUE "InternalName", "FFFTP"
22372237 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ご協力いただいた方々\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, うなー, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, ふうせん)."
22382238 VALUE "OriginalFilename", "FFFTP.exe"
22392239 VALUE "ProductName", "FFFTP"
2240- VALUE "ProductVersion", "1, 99, 1, 10"
2240+ VALUE "ProductVersion", "1, 99, 1, 11"
22412241 END
22422242 END
22432243 BLOCK "VarFileInfo"
--- a/Resource_eng/ffftp.rc
+++ b/Resource_eng/ffftp.rc
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0
242242 BEGIN
243243 DEFPUSHBUTTON "OK",IDOK,132,296,50,14
244244 ICON ffftp,-1,7,4,20,20
245- CTEXT "FFFTP Ver 1.99a-20170128",-1,110,11,90,8
245+ CTEXT "FFFTP Ver 1.99a-20170217",-1,110,11,90,8
246246 CTEXT "FFFTP is freeware",-1,7,281,301,8
247247 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
248248 CTEXT "",ABOUT_JRE,7,93,301,8
@@ -2253,8 +2253,8 @@ nodrop_csr CURSOR "nodrop_c.cur"
22532253 //
22542254
22552255 VS_VERSION_INFO VERSIONINFO
2256- FILEVERSION 1,99,1,10
2257- PRODUCTVERSION 1,99,1,10
2256+ FILEVERSION 1,99,1,11
2257+ PRODUCTVERSION 1,99,1,11
22582258 FILEFLAGSMASK 0x3fL
22592259 #ifdef _DEBUG
22602260 FILEFLAGS 0x1L
@@ -2272,12 +2272,12 @@ BEGIN
22722272 VALUE "Comments", "This software is Free Software"
22732273 VALUE "CompanyName", "Sota, FFFTP Project"
22742274 VALUE "FileDescription", "FFFTP"
2275- VALUE "FileVersion", "1, 99, 1, 10"
2275+ VALUE "FileVersion", "1, 99, 1, 11"
22762276 VALUE "InternalName", "FFFTP"
22772277 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)."
22782278 VALUE "OriginalFilename", "FFFTP.exe"
22792279 VALUE "ProductName", "FFFTP"
2280- VALUE "ProductVersion", "1, 99, 1, 10"
2280+ VALUE "ProductVersion", "1, 99, 1, 11"
22812281 END
22822282 END
22832283 BLOCK "VarFileInfo"
--- a/common.h
+++ b/common.h
@@ -72,16 +72,16 @@
7272 //#define PROGRAM_VERSION_NUM 1972 /* バージョン */
7373 // 64ビット対応
7474 #ifdef _WIN64
75-#define VER_STR "1.99a-20170128 64bit"
75+#define VER_STR "1.99a-20170217 64bit"
7676 #else
77-#define VER_STR "1.99a-20170128"
77+#define VER_STR "1.99a-20170217"
7878 #endif
7979 #define VER_NUM 1990 /* 設定バージョン */
8080 #define PROGRAM_VERSION_NUM 1990 /* バージョン */
8181 // ソフトウェア自動更新
8282 // リリースバージョンはリリース予定年(10進数4桁)+月(2桁)+日(2桁)+通し番号(0スタート2桁)とする
8383 // 2014年7月31日中の30個目のリリースは2014073129
84-#define RELEASE_VERSION_NUM 2017012800 /* リリースバージョン */
84+#define RELEASE_VERSION_NUM 2017021700 /* リリースバージョン */
8585
8686
8787 // SourceForge.JPによるフォーク
--- a/contrib/openssl/CHANGES
+++ b/contrib/openssl/CHANGES
@@ -2,6 +2,19 @@
22 OpenSSL CHANGES
33 _______________
44
5+ Changes between 1.1.0d and 1.1.0e [16 Feb 2017]
6+
7+ *) Encrypt-Then-Mac renegotiation crash
8+
9+ During a renegotiation handshake if the Encrypt-Then-Mac extension is
10+ negotiated where it was not in the original handshake (or vice-versa) then
11+ this can cause OpenSSL to crash (dependant on ciphersuite). Both clients
12+ and servers are affected.
13+
14+ This issue was reported to OpenSSL by Joe Orton (Red Hat).
15+ (CVE-2017-3733)
16+ [Matt Caswell]
17+
518 Changes between 1.1.0c and 1.1.0d [26 Jan 2017]
619
720 *) Truncated packet could crash via OOB read
--- a/contrib/openssl/NEWS
+++ b/contrib/openssl/NEWS
@@ -5,6 +5,10 @@
55 This file gives a brief overview of the major changes between each OpenSSL
66 release. For more details please read the CHANGES file.
77
8+ Major changes between OpenSSL 1.1.0d and OpenSSL 1.1.0e [16 Feb 2017]
9+
10+ o Encrypt-Then-Mac renegotiation crash (CVE-2017-3733)
11+
812 Major changes between OpenSSL 1.1.0c and OpenSSL 1.1.0d [26 Jan 2017]
913
1014 o Truncated packet could crash via OOB read (CVE-2017-3731)
--- a/contrib/openssl/README
+++ b/contrib/openssl/README
@@ -1,5 +1,5 @@
11
2- OpenSSL 1.1.0d 26 Jan 2017
2+ OpenSSL 1.1.0e 16 Feb 2017
33
44 Copyright (c) 1998-2016 The OpenSSL Project
55 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
--- a/contrib/openssl/include/openssl/opensslv.h
+++ b/contrib/openssl/include/openssl/opensslv.h
@@ -39,11 +39,11 @@ extern "C" {
3939 * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
4040 * major minor fix final patch/beta)
4141 */
42-# define OPENSSL_VERSION_NUMBER 0x1010004fL
42+# define OPENSSL_VERSION_NUMBER 0x1010005fL
4343 # ifdef OPENSSL_FIPS
44-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d-fips 26 Jan 2017"
44+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e-fips 16 Feb 2017"
4545 # else
46-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d 26 Jan 2017"
46+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e 16 Feb 2017"
4747 # endif
4848
4949 /*-
--- a/contrib/openssl/include/openssl/ssl3.h
+++ b/contrib/openssl/include/openssl/ssl3.h
@@ -264,11 +264,14 @@ extern "C" {
264264 # define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010
265265
266266 /* Set if we encrypt then mac instead of usual mac then encrypt */
267-# define TLS1_FLAGS_ENCRYPT_THEN_MAC 0x0100
267+# define TLS1_FLAGS_ENCRYPT_THEN_MAC_READ 0x0100
268+# define TLS1_FLAGS_ENCRYPT_THEN_MAC TLS1_FLAGS_ENCRYPT_THEN_MAC_READ
268269
269270 /* Set if extended master secret extension received from peer */
270271 # define TLS1_FLAGS_RECEIVED_EXTMS 0x0200
271272
273+# define TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE 0x0400
274+
272275 # define SSL3_MT_HELLO_REQUEST 0
273276 # define SSL3_MT_CLIENT_HELLO 1
274277 # define SSL3_MT_SERVER_HELLO 2
--- a/contrib/openssl/include/openssl/x509v3.h
+++ b/contrib/openssl/include/openssl/x509v3.h
@@ -355,6 +355,7 @@ struct ISSUING_DIST_POINT_st {
355355 # define EXFLAG_SI 0x20
356356 # define EXFLAG_V1 0x40
357357 # define EXFLAG_INVALID 0x80
358+/* EXFLAG_SET is set to indicate that some values have been precomputed */
358359 # define EXFLAG_SET 0x100
359360 # define EXFLAG_CRITICAL 0x200
360361 # define EXFLAG_PROXY 0x400
Binary files a/dist/amd64/libeay32.dll and b/dist/amd64/libeay32.dll differ
Binary files a/dist/amd64/ssleay32.dll and b/dist/amd64/ssleay32.dll differ
Binary files a/dist/libeay32.dll and b/dist/libeay32.dll differ
Binary files a/dist/ssleay32.dll and b/dist/ssleay32.dll differ
--- a/filehash.h
+++ b/filehash.h
@@ -5,13 +5,13 @@
55 #define FILEHASH_SSL_PEM_SHA1 "\x66\xFC\xD7\x16\xFE\x1A\xBB\x86\x1B\xFD\x8B\x10\x86\x55\x16\x4B\x92\xD5\x74\x89"
66 #if defined(_M_IX86)
77 // libeay32.dll
8-#define FILEHASH_LIBEAY32_DLL_SHA1 "\xB7\xDF\x62\x64\x89\xB8\x9F\x72\x2E\x95\x14\xD8\xDC\xEB\x96\xED\x65\x91\x3A\x04"
8+#define FILEHASH_LIBEAY32_DLL_SHA1 "\xF7\x11\xB9\x22\xAF\xE3\x4C\x9C\xE9\x50\x4C\x65\xFF\x02\x4C\xFD\xFA\xA8\x95\x74"
99 // ssleay32.dll
10-#define FILEHASH_SSLEAY32_DLL_SHA1 "\x17\x8E\x4E\x55\x08\x11\xF4\x74\x5A\x75\xD0\x11\x69\x3A\x39\x81\x0D\x85\x9D\x06"
10+#define FILEHASH_SSLEAY32_DLL_SHA1 "\x67\x27\x81\xF4\x5A\x72\x9F\xAC\x3F\xB4\x7F\xEF\x52\xBD\x05\xA9\x61\x1F\xE6\x24"
1111 #elif defined(_M_AMD64)
1212 // libeay32.dll
13-#define FILEHASH_LIBEAY32_DLL_SHA1 "\x1D\xE9\x3B\x1C\x1D\x36\x61\xF4\xE2\xC3\x11\xD7\xCF\xB1\x15\x34\x9C\xCC\xCE\xE6"
13+#define FILEHASH_LIBEAY32_DLL_SHA1 "\x7A\x1B\xBC\x0E\xBD\xB6\xB0\xA6\x46\x5D\x20\xC5\x91\xBD\x78\xC0\x87\xAE\x98\x8C"
1414 // ssleay32.dll
15-#define FILEHASH_SSLEAY32_DLL_SHA1 "\x81\x18\xFC\xB3\x6D\x06\x77\x86\x3D\xC2\x61\xFE\x6E\x03\x59\x07\xA4\xD2\xBD\xD8"
15+#define FILEHASH_SSLEAY32_DLL_SHA1 "\x3A\x80\x0B\x6A\xC8\x6F\xC6\x10\xDC\xD5\x5D\x80\xA3\x44\xFF\x3E\x1A\x1A\xB7\x18"
1616 #endif
1717
旧リポジトリブラウザで表示