リビジョン | 34bd50bfe3f59ae7c9f8efc875a473cdf43950c5 (tree) |
---|---|
日時 | 2017-02-17 22:14:19 |
作者 | s_kawamoto <s_kawamoto@user...> |
コミッター | s_kawamoto |
Update OpenSSL to 1.1.0e.
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 | ||
242 | 242 | BEGIN |
243 | 243 | DEFPUSHBUTTON "OK",IDOK,133,294,50,14 |
244 | 244 | 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 | |
246 | 246 | CTEXT "FFFTPはfreewareです",-1,7,279,305,8 |
247 | 247 | 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 |
248 | 248 | CTEXT "",ABOUT_JRE,7,96,305,8 |
@@ -2213,8 +2213,8 @@ nodrop_csr CURSOR "nodrop_c.cur" | ||
2213 | 2213 | // |
2214 | 2214 | |
2215 | 2215 | 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 | |
2218 | 2218 | FILEFLAGSMASK 0x3fL |
2219 | 2219 | #ifdef _DEBUG |
2220 | 2220 | FILEFLAGS 0x1L |
@@ -2232,12 +2232,12 @@ BEGIN | ||
2232 | 2232 | VALUE "Comments", "これはフリーソフトウエアです。" |
2233 | 2233 | VALUE "CompanyName", "Sota, FFFTP Project" |
2234 | 2234 | VALUE "FileDescription", "FFFTP" |
2235 | - VALUE "FileVersion", "1, 99, 1, 10" | |
2235 | + VALUE "FileVersion", "1, 99, 1, 11" | |
2236 | 2236 | VALUE "InternalName", "FFFTP" |
2237 | 2237 | 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, ふうせん)." |
2238 | 2238 | VALUE "OriginalFilename", "FFFTP.exe" |
2239 | 2239 | VALUE "ProductName", "FFFTP" |
2240 | - VALUE "ProductVersion", "1, 99, 1, 10" | |
2240 | + VALUE "ProductVersion", "1, 99, 1, 11" | |
2241 | 2241 | END |
2242 | 2242 | END |
2243 | 2243 | BLOCK "VarFileInfo" |
@@ -242,7 +242,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 | ||
242 | 242 | BEGIN |
243 | 243 | DEFPUSHBUTTON "OK",IDOK,132,296,50,14 |
244 | 244 | 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 | |
246 | 246 | CTEXT "FFFTP is freeware",-1,7,281,301,8 |
247 | 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 | 248 | CTEXT "",ABOUT_JRE,7,93,301,8 |
@@ -2253,8 +2253,8 @@ nodrop_csr CURSOR "nodrop_c.cur" | ||
2253 | 2253 | // |
2254 | 2254 | |
2255 | 2255 | 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 | |
2258 | 2258 | FILEFLAGSMASK 0x3fL |
2259 | 2259 | #ifdef _DEBUG |
2260 | 2260 | FILEFLAGS 0x1L |
@@ -2272,12 +2272,12 @@ BEGIN | ||
2272 | 2272 | VALUE "Comments", "This software is Free Software" |
2273 | 2273 | VALUE "CompanyName", "Sota, FFFTP Project" |
2274 | 2274 | VALUE "FileDescription", "FFFTP" |
2275 | - VALUE "FileVersion", "1, 99, 1, 10" | |
2275 | + VALUE "FileVersion", "1, 99, 1, 11" | |
2276 | 2276 | VALUE "InternalName", "FFFTP" |
2277 | 2277 | 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)." |
2278 | 2278 | VALUE "OriginalFilename", "FFFTP.exe" |
2279 | 2279 | VALUE "ProductName", "FFFTP" |
2280 | - VALUE "ProductVersion", "1, 99, 1, 10" | |
2280 | + VALUE "ProductVersion", "1, 99, 1, 11" | |
2281 | 2281 | END |
2282 | 2282 | END |
2283 | 2283 | BLOCK "VarFileInfo" |
@@ -72,16 +72,16 @@ | ||
72 | 72 | //#define PROGRAM_VERSION_NUM 1972 /* バージョン */ |
73 | 73 | // 64ビット対応 |
74 | 74 | #ifdef _WIN64 |
75 | -#define VER_STR "1.99a-20170128 64bit" | |
75 | +#define VER_STR "1.99a-20170217 64bit" | |
76 | 76 | #else |
77 | -#define VER_STR "1.99a-20170128" | |
77 | +#define VER_STR "1.99a-20170217" | |
78 | 78 | #endif |
79 | 79 | #define VER_NUM 1990 /* 設定バージョン */ |
80 | 80 | #define PROGRAM_VERSION_NUM 1990 /* バージョン */ |
81 | 81 | // ソフトウェア自動更新 |
82 | 82 | // リリースバージョンはリリース予定年(10進数4桁)+月(2桁)+日(2桁)+通し番号(0スタート2桁)とする |
83 | 83 | // 2014年7月31日中の30個目のリリースは2014073129 |
84 | -#define RELEASE_VERSION_NUM 2017012800 /* リリースバージョン */ | |
84 | +#define RELEASE_VERSION_NUM 2017021700 /* リリースバージョン */ | |
85 | 85 | |
86 | 86 | |
87 | 87 | // SourceForge.JPによるフォーク |
@@ -2,6 +2,19 @@ | ||
2 | 2 | OpenSSL CHANGES |
3 | 3 | _______________ |
4 | 4 | |
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 | + | |
5 | 18 | Changes between 1.1.0c and 1.1.0d [26 Jan 2017] |
6 | 19 | |
7 | 20 | *) Truncated packet could crash via OOB read |
@@ -5,6 +5,10 @@ | ||
5 | 5 | This file gives a brief overview of the major changes between each OpenSSL |
6 | 6 | release. For more details please read the CHANGES file. |
7 | 7 | |
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 | + | |
8 | 12 | Major changes between OpenSSL 1.1.0c and OpenSSL 1.1.0d [26 Jan 2017] |
9 | 13 | |
10 | 14 | o Truncated packet could crash via OOB read (CVE-2017-3731) |
@@ -1,5 +1,5 @@ | ||
1 | 1 | |
2 | - OpenSSL 1.1.0d 26 Jan 2017 | |
2 | + OpenSSL 1.1.0e 16 Feb 2017 | |
3 | 3 | |
4 | 4 | Copyright (c) 1998-2016 The OpenSSL Project |
5 | 5 | Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson |
@@ -39,11 +39,11 @@ extern "C" { | ||
39 | 39 | * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for |
40 | 40 | * major minor fix final patch/beta) |
41 | 41 | */ |
42 | -# define OPENSSL_VERSION_NUMBER 0x1010004fL | |
42 | +# define OPENSSL_VERSION_NUMBER 0x1010005fL | |
43 | 43 | # 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" | |
45 | 45 | # 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" | |
47 | 47 | # endif |
48 | 48 | |
49 | 49 | /*- |
@@ -264,11 +264,14 @@ extern "C" { | ||
264 | 264 | # define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010 |
265 | 265 | |
266 | 266 | /* 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 | |
268 | 269 | |
269 | 270 | /* Set if extended master secret extension received from peer */ |
270 | 271 | # define TLS1_FLAGS_RECEIVED_EXTMS 0x0200 |
271 | 272 | |
273 | +# define TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE 0x0400 | |
274 | + | |
272 | 275 | # define SSL3_MT_HELLO_REQUEST 0 |
273 | 276 | # define SSL3_MT_CLIENT_HELLO 1 |
274 | 277 | # define SSL3_MT_SERVER_HELLO 2 |
@@ -355,6 +355,7 @@ struct ISSUING_DIST_POINT_st { | ||
355 | 355 | # define EXFLAG_SI 0x20 |
356 | 356 | # define EXFLAG_V1 0x40 |
357 | 357 | # define EXFLAG_INVALID 0x80 |
358 | +/* EXFLAG_SET is set to indicate that some values have been precomputed */ | |
358 | 359 | # define EXFLAG_SET 0x100 |
359 | 360 | # define EXFLAG_CRITICAL 0x200 |
360 | 361 | # define EXFLAG_PROXY 0x400 |
@@ -5,13 +5,13 @@ | ||
5 | 5 | #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" |
6 | 6 | #if defined(_M_IX86) |
7 | 7 | // 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" | |
9 | 9 | // 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" | |
11 | 11 | #elif defined(_M_AMD64) |
12 | 12 | // 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" | |
14 | 14 | // 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" | |
16 | 16 | #endif |
17 | 17 |