• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubybathyscaphegamephpguicwindows翻訳pythonomegattwitterframeworkbtronarduinovb.net計画中(planning stage)directxpreviewertestゲームエンジンdom

FFFTPのソースコードです。


Commit MetaInfo

Revision175c75a24be78d407364d9ecd0af478f743d4fd0 (tree)
Zeit2017-01-28 20:26:25
Autors_kawamoto <s_kawamoto@user...>
Commiters_kawamoto

Log Message

Update OpenSSL to 1.1.0d.

Ändern Zusammenfassung

Diff

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-20170122",-1,113,11,90,8
245+ CTEXT "FFFTP Ver 1.99a-20170128",-1,113,11,90,8
246246 CTEXT "FFFTP‚Ífreeware‚Å‚·",-1,7,279,305,8
247247 CTEXT "Copyright(C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\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,9
2217- PRODUCTVERSION 1,99,1,9
2216+ FILEVERSION 1,99,1,10
2217+ PRODUCTVERSION 1,99,1,10
22182218 FILEFLAGSMASK 0x3fL
22192219 #ifdef _DEBUG
22202220 FILEFLAGS 0x1L
@@ -2232,12 +2232,12 @@ BEGIN
22322232 VALUE "Comments", "‚±‚ê‚̓tƒŠ[ƒ\ƒtƒgƒEƒGƒA‚Å‚·B"
22332233 VALUE "CompanyName", "Sota, FFFTP Project"
22342234 VALUE "FileDescription", "FFFTP"
2235- VALUE "FileVersion", "1, 99, 1, 9"
2235+ VALUE "FileVersion", "1, 99, 1, 10"
22362236 VALUE "InternalName", "FFFTP"
22372237 VALUE "LegalCopyright", "Copyright (C) 1997-2010 Sota & ‚²‹¦—Í‚¢‚½‚¾‚¢‚½•ûX\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, 9"
2240+ VALUE "ProductVersion", "1, 99, 1, 10"
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-20170122",-1,110,11,90,8
245+ CTEXT "FFFTP Ver 1.99a-20170128",-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,9
2257- PRODUCTVERSION 1,99,1,9
2256+ FILEVERSION 1,99,1,10
2257+ PRODUCTVERSION 1,99,1,10
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, 9"
2275+ VALUE "FileVersion", "1, 99, 1, 10"
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, 9"
2280+ VALUE "ProductVersion", "1, 99, 1, 10"
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-20170122 64bit"
75+#define VER_STR "1.99a-20170128 64bit"
7676 #else
77-#define VER_STR "1.99a-20170122"
77+#define VER_STR "1.99a-20170128"
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 2017012200 /* リリースバージョン */
84+#define RELEASE_VERSION_NUM 2017012800 /* リリースバージョン */
8585
8686
8787 // SourceForge.JPによるフォーク
--- a/contrib/openssl/CHANGES
+++ b/contrib/openssl/CHANGES
@@ -2,6 +2,49 @@
22 OpenSSL CHANGES
33 _______________
44
5+ Changes between 1.1.0c and 1.1.0d [26 Jan 2017]
6+
7+ *) Truncated packet could crash via OOB read
8+
9+ If one side of an SSL/TLS path is running on a 32-bit host and a specific
10+ cipher is being used, then a truncated packet can cause that host to
11+ perform an out-of-bounds read, usually resulting in a crash.
12+
13+ This issue was reported to OpenSSL by Robert Święcki of Google.
14+ (CVE-2017-3731)
15+ [Andy Polyakov]
16+
17+ *) Bad (EC)DHE parameters cause a client crash
18+
19+ If a malicious server supplies bad parameters for a DHE or ECDHE key
20+ exchange then this can result in the client attempting to dereference a
21+ NULL pointer leading to a client crash. This could be exploited in a Denial
22+ of Service attack.
23+
24+ This issue was reported to OpenSSL by Guido Vranken.
25+ (CVE-2017-3730)
26+ [Matt Caswell]
27+
28+ *) BN_mod_exp may produce incorrect results on x86_64
29+
30+ There is a carry propagating bug in the x86_64 Montgomery squaring
31+ procedure. No EC algorithms are affected. Analysis suggests that attacks
32+ against RSA and DSA as a result of this defect would be very difficult to
33+ perform and are not believed likely. Attacks against DH are considered just
34+ feasible (although very difficult) because most of the work necessary to
35+ deduce information about a private key may be performed offline. The amount
36+ of resources required for such an attack would be very significant and
37+ likely only accessible to a limited number of attackers. An attacker would
38+ additionally need online access to an unpatched system using the target
39+ private key in a scenario with persistent DH parameters and a private
40+ key that is shared between multiple clients. For example this can occur by
41+ default in OpenSSL DHE based SSL/TLS ciphersuites. Note: This issue is very
42+ similar to CVE-2015-3193 but must be treated as a separate problem.
43+
44+ This issue was reported to OpenSSL by the OSS-Fuzz project.
45+ (CVE-2017-3732)
46+ [Andy Polyakov]
47+
548 Changes between 1.1.0b and 1.1.0c [10 Nov 2016]
649
750 *) ChaCha20/Poly1305 heap-buffer-overflow
--- a/contrib/openssl/NEWS
+++ b/contrib/openssl/NEWS
@@ -5,6 +5,12 @@
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.0c and OpenSSL 1.1.0d [26 Jan 2017]
9+
10+ o Truncated packet could crash via OOB read (CVE-2017-3731)
11+ o Bad (EC)DHE parameters cause a client crash (CVE-2017-3730)
12+ o BN_mod_exp may produce incorrect results on x86_64 (CVE-2017-3732)
13+
814 Major changes between OpenSSL 1.1.0b and OpenSSL 1.1.0c [10 Nov 2016]
915
1016 o ChaCha20/Poly1305 heap-buffer-overflow (CVE-2016-7054)
--- a/contrib/openssl/README
+++ b/contrib/openssl/README
@@ -1,5 +1,5 @@
11
2- OpenSSL 1.1.0c 10 Nov 2016
2+ OpenSSL 1.1.0d 26 Jan 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/ct.h
+++ b/contrib/openssl/include/openssl/ct.h
@@ -98,6 +98,21 @@ const CTLOG_STORE *CT_POLICY_EVAL_CTX_get0_log_store(const CT_POLICY_EVAL_CTX *c
9898 void CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
9999 CTLOG_STORE *log_store);
100100
101+/*
102+ * Gets the time, in milliseconds since the Unix epoch, that will be used as the
103+ * current time when checking whether an SCT was issued in the future.
104+ * Such SCTs will fail validation, as required by RFC6962.
105+ */
106+uint64_t CT_POLICY_EVAL_CTX_get_time(const CT_POLICY_EVAL_CTX *ctx);
107+
108+/*
109+ * Sets the time to evaluate SCTs against, in milliseconds since the Unix epoch.
110+ * If an SCT's timestamp is after this time, it will be interpreted as having
111+ * been issued in the future. RFC6962 states that "TLS clients MUST reject SCTs
112+ * whose timestamp is in the future", so an SCT will not validate in this case.
113+ */
114+void CT_POLICY_EVAL_CTX_set_time(CT_POLICY_EVAL_CTX *ctx, uint64_t time_in_ms);
115+
101116 /*****************
102117 * SCT functions *
103118 *****************/
@@ -467,7 +482,6 @@ int ERR_load_CT_strings(void);
467482 # define CT_F_CTLOG_NEW 117
468483 # define CT_F_CTLOG_NEW_FROM_BASE64 118
469484 # define CT_F_CTLOG_NEW_FROM_CONF 119
470-# define CT_F_CTLOG_NEW_NULL 120
471485 # define CT_F_CTLOG_STORE_LOAD_CTX_NEW 122
472486 # define CT_F_CTLOG_STORE_LOAD_FILE 123
473487 # define CT_F_CTLOG_STORE_LOAD_LOG 130
@@ -482,6 +496,7 @@ int ERR_load_CT_strings(void);
482496 # define CT_F_O2I_SCT_LIST 111
483497 # define CT_F_O2I_SCT_SIGNATURE 112
484498 # define CT_F_SCT_CTX_NEW 126
499+# define CT_F_SCT_CTX_VERIFY 128
485500 # define CT_F_SCT_NEW 100
486501 # define CT_F_SCT_NEW_FROM_BASE64 127
487502 # define CT_F_SCT_SET0_LOG_ID 101
@@ -491,7 +506,6 @@ int ERR_load_CT_strings(void);
491506 # define CT_F_SCT_SET_LOG_ENTRY_TYPE 102
492507 # define CT_F_SCT_SET_SIGNATURE_NID 103
493508 # define CT_F_SCT_SET_VERSION 104
494-# define CT_F_SCT_CTX_VERIFY 128
495509
496510 /* Reason codes. */
497511 # define CT_R_BASE64_DECODE_ERROR 108
@@ -501,6 +515,7 @@ int ERR_load_CT_strings(void);
501515 # define CT_R_LOG_CONF_MISSING_DESCRIPTION 111
502516 # define CT_R_LOG_CONF_MISSING_KEY 112
503517 # define CT_R_LOG_KEY_INVALID 113
518+# define CT_R_SCT_FUTURE_TIMESTAMP 116
504519 # define CT_R_SCT_INVALID 104
505520 # define CT_R_SCT_INVALID_SIGNATURE 107
506521 # define CT_R_SCT_LIST_INVALID 105
--- a/contrib/openssl/include/openssl/dh.h
+++ b/contrib/openssl/include/openssl/dh.h
@@ -124,6 +124,7 @@ DEPRECATEDIN_0_9_8(DH *DH_generate_parameters(int prime_len, int generator,
124124 int DH_generate_parameters_ex(DH *dh, int prime_len, int generator,
125125 BN_GENCB *cb);
126126
127+int DH_check_params(const DH *dh, int *ret);
127128 int DH_check(const DH *dh, int *codes);
128129 int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *codes);
129130 int DH_generate_key(DH *dh);
--- a/contrib/openssl/include/openssl/dsa.h
+++ b/contrib/openssl/include/openssl/dsa.h
@@ -274,6 +274,7 @@ int ERR_load_DSA_strings(void);
274274 # define DSA_R_NO_PARAMETERS_SET 107
275275 # define DSA_R_PARAMETER_ENCODING_ERROR 105
276276 # define DSA_R_Q_NOT_PRIME 113
277+# define DSA_R_SEED_LEN_SMALL 110
277278
278279 # ifdef __cplusplus
279280 }
--- a/contrib/openssl/include/openssl/engine.h
+++ b/contrib/openssl/include/openssl/engine.h
@@ -334,8 +334,6 @@ ENGINE *ENGINE_by_id(const char *id);
334334 OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
335335 # define ENGINE_load_capi() \
336336 OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
337-# define ENGINE_load_dasync() \
338- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DASYNC, NULL)
339337 # define ENGINE_load_afalg() \
340338 OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
341339 # endif
--- a/contrib/openssl/include/openssl/err.h
+++ b/contrib/openssl/include/openssl/err.h
@@ -89,7 +89,7 @@ typedef struct err_state_st {
8989 # define ERR_LIB_CMS 46
9090 # define ERR_LIB_TS 47
9191 # define ERR_LIB_HMAC 48
92-# define ERR_LIB_JPAKE 49
92+/* # define ERR_LIB_JPAKE 49 */
9393 # define ERR_LIB_CT 50
9494 # define ERR_LIB_ASYNC 51
9595 # define ERR_LIB_KDF 52
@@ -128,7 +128,6 @@ typedef struct err_state_st {
128128 # define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
129129 # define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
130130 # define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
131-# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
132131 # define CTerr(f,r) ERR_PUT_error(ERR_LIB_CT,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
133132 # define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
134133 # define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
@@ -140,6 +139,7 @@ typedef struct err_state_st {
140139 # define ERR_GET_LIB(l) (int)(((l) >> 24L) & 0x0FFL)
141140 # define ERR_GET_FUNC(l) (int)(((l) >> 12L) & 0xFFFL)
142141 # define ERR_GET_REASON(l) (int)( (l) & 0xFFFL)
142+# define ERR_FATAL_ERROR(l) (int)( (l) & ERR_R_FATAL)
143143
144144 /* OS functions */
145145 # define SYS_F_FOPEN 1
--- a/contrib/openssl/include/openssl/evp.h
+++ b/contrib/openssl/include/openssl/evp.h
@@ -1455,11 +1455,14 @@ int ERR_load_EVP_strings(void);
14551455 /* Function codes. */
14561456 # define EVP_F_AESNI_INIT_KEY 165
14571457 # define EVP_F_AES_INIT_KEY 133
1458+# define EVP_F_AES_OCB_CIPHER 169
14581459 # define EVP_F_AES_T4_INIT_KEY 178
1460+# define EVP_F_AES_WRAP_CIPHER 170
14591461 # define EVP_F_ALG_MODULE_INIT 177
14601462 # define EVP_F_CAMELLIA_INIT_KEY 159
14611463 # define EVP_F_CHACHA20_POLY1305_CTRL 182
14621464 # define EVP_F_CMLL_T4_INIT_KEY 179
1465+# define EVP_F_DES_EDE3_WRAP_CIPHER 171
14631466 # define EVP_F_DO_SIGVER_INIT 161
14641467 # define EVP_F_EVP_CIPHERINIT_EX 123
14651468 # define EVP_F_EVP_CIPHER_CTX_COPY 163
@@ -1546,6 +1549,7 @@ int ERR_load_EVP_strings(void);
15461549 # define EVP_R_INPUT_NOT_INITIALIZED 111
15471550 # define EVP_R_INVALID_DIGEST 152
15481551 # define EVP_R_INVALID_FIPS_MODE 168
1552+# define EVP_R_INVALID_KEY 163
15491553 # define EVP_R_INVALID_KEY_LENGTH 130
15501554 # define EVP_R_INVALID_OPERATION 148
15511555 # define EVP_R_KEYGEN_FAILURE 120
@@ -1568,12 +1572,12 @@ int ERR_load_EVP_strings(void);
15681572 # define EVP_R_UNKNOWN_DIGEST 161
15691573 # define EVP_R_UNKNOWN_OPTION 169
15701574 # define EVP_R_UNKNOWN_PBE_ALGORITHM 121
1571-# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135
15721575 # define EVP_R_UNSUPPORTED_ALGORITHM 156
15731576 # define EVP_R_UNSUPPORTED_CIPHER 107
15741577 # define EVP_R_UNSUPPORTED_KEYLENGTH 123
15751578 # define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION 124
15761579 # define EVP_R_UNSUPPORTED_KEY_SIZE 108
1580+# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135
15771581 # define EVP_R_UNSUPPORTED_PRF 125
15781582 # define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM 118
15791583 # define EVP_R_UNSUPPORTED_SALT_TYPE 126
--- 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 0x1010003fL
42+# define OPENSSL_VERSION_NUMBER 0x1010004fL
4343 # ifdef OPENSSL_FIPS
44-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0c-fips 10 Nov 2016"
44+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d-fips 26 Jan 2017"
4545 # else
46-# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0c 10 Nov 2016"
46+# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d 26 Jan 2017"
4747 # endif
4848
4949 /*-
--- a/contrib/openssl/include/openssl/rsa.h
+++ b/contrib/openssl/include/openssl/rsa.h
@@ -468,6 +468,7 @@ int ERR_load_RSA_strings(void);
468468 # define RSA_F_PKEY_RSA_CTRL 143
469469 # define RSA_F_PKEY_RSA_CTRL_STR 144
470470 # define RSA_F_PKEY_RSA_SIGN 142
471+# define RSA_F_PKEY_RSA_VERIFY 149
471472 # define RSA_F_PKEY_RSA_VERIFYRECOVER 141
472473 # define RSA_F_RSA_ALGOR_TO_MD 156
473474 # define RSA_F_RSA_BUILTIN_KEYGEN 129
--- a/contrib/openssl/include/openssl/ssl.h
+++ b/contrib/openssl/include/openssl/ssl.h
@@ -262,6 +262,9 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
262262 const unsigned char *in,
263263 size_t inlen, int *al, void *parse_arg);
264264
265+/* Typedef for verification callback */
266+typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx);
267+
265268 /* Allow initial connection to servers that don't support RI */
266269 # define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004U
267270 /* Removed from OpenSSL 0.9.8q and 1.0.0c */
@@ -1241,7 +1244,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
12411244 # define SSL_CTX_set1_sigalgs_list(ctx, s) \
12421245 SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)s)
12431246 # define SSL_set1_sigalgs(ctx, slist, slistlen) \
1244- SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS,clistlen,(int *)slist)
1247+ SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)slist)
12451248 # define SSL_set1_sigalgs_list(ctx, s) \
12461249 SSL_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)s)
12471250 # define SSL_CTX_set1_client_sigalgs(ctx, slist, slistlen) \
@@ -1342,9 +1345,8 @@ __owur int SSL_set_cipher_list(SSL *s, const char *str);
13421345 void SSL_set_read_ahead(SSL *s, int yes);
13431346 __owur int SSL_get_verify_mode(const SSL *s);
13441347 __owur int SSL_get_verify_depth(const SSL *s);
1345-__owur int (*SSL_get_verify_callback(const SSL *s)) (int, X509_STORE_CTX *);
1346-void SSL_set_verify(SSL *s, int mode,
1347- int (*callback) (int ok, X509_STORE_CTX *ctx));
1348+__owur SSL_verify_cb SSL_get_verify_callback(const SSL *s);
1349+void SSL_set_verify(SSL *s, int mode, SSL_verify_cb callback);
13481350 void SSL_set_verify_depth(SSL *s, int depth);
13491351 void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg);
13501352 # ifndef OPENSSL_NO_RSA
@@ -1443,10 +1445,8 @@ __owur STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
14431445
14441446 __owur int SSL_CTX_get_verify_mode(const SSL_CTX *ctx);
14451447 __owur int SSL_CTX_get_verify_depth(const SSL_CTX *ctx);
1446-__owur int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx)) (int,
1447- X509_STORE_CTX *);
1448-void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
1449- int (*callback) (int, X509_STORE_CTX *));
1448+__owur SSL_verify_cb SSL_CTX_get_verify_callback(const SSL_CTX *ctx);
1449+void SSL_CTX_set_verify(SSL_CTX *ctx, int mode, SSL_verify_cb callback);
14501450 void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth);
14511451 void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,
14521452 int (*cb) (X509_STORE_CTX *, void *),
@@ -1777,6 +1777,8 @@ void SSL_set_tmp_dh_callback(SSL *ssl,
17771777 __owur const COMP_METHOD *SSL_get_current_compression(SSL *s);
17781778 __owur const COMP_METHOD *SSL_get_current_expansion(SSL *s);
17791779 __owur const char *SSL_COMP_get_name(const COMP_METHOD *comp);
1780+__owur const char *SSL_COMP_get0_name(const SSL_COMP *comp);
1781+__owur int SSL_COMP_get_id(const SSL_COMP *comp);
17801782 STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
17811783 __owur STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
17821784 *meths);
--- a/contrib/openssl/include/openssl/ui.h
+++ b/contrib/openssl/include/openssl/ui.h
@@ -339,8 +339,12 @@ int ERR_load_UI_strings(void);
339339 /* Error codes for the UI functions. */
340340
341341 /* Function codes. */
342+# define UI_F_CLOSE_CONSOLE 115
343+# define UI_F_ECHO_CONSOLE 116
342344 # define UI_F_GENERAL_ALLOCATE_BOOLEAN 108
343345 # define UI_F_GENERAL_ALLOCATE_PROMPT 109
346+# define UI_F_NOECHO_CONSOLE 117
347+# define UI_F_OPEN_CONSOLE 114
344348 # define UI_F_UI_CREATE_METHOD 112
345349 # define UI_F_UI_CTRL 111
346350 # define UI_F_UI_DUP_ERROR_STRING 101
@@ -350,6 +354,7 @@ int ERR_load_UI_strings(void);
350354 # define UI_F_UI_DUP_VERIFY_STRING 106
351355 # define UI_F_UI_GET0_RESULT 107
352356 # define UI_F_UI_NEW_METHOD 104
357+# define UI_F_UI_PROCESS 113
353358 # define UI_F_UI_SET_RESULT 105
354359
355360 /* Reason codes. */
@@ -357,9 +362,14 @@ int ERR_load_UI_strings(void);
357362 # define UI_R_INDEX_TOO_LARGE 102
358363 # define UI_R_INDEX_TOO_SMALL 103
359364 # define UI_R_NO_RESULT_BUFFER 105
365+# define UI_R_PROCESSING_ERROR 107
360366 # define UI_R_RESULT_TOO_LARGE 100
361367 # define UI_R_RESULT_TOO_SMALL 101
368+# define UI_R_SYSASSIGN_ERROR 109
369+# define UI_R_SYSDASSGN_ERROR 110
370+# define UI_R_SYSQIOW_ERROR 111
362371 # define UI_R_UNKNOWN_CONTROL_COMMAND 106
372+# define UI_R_UNKNOWN_TTYGET_ERRNO_VALUE 108
363373
364374 # ifdef __cplusplus
365375 }
--- a/contrib/openssl/include/openssl/x509_vfy.h
+++ b/contrib/openssl/include/openssl/x509_vfy.h
@@ -272,6 +272,7 @@ int X509_STORE_set_purpose(X509_STORE *ctx, int purpose);
272272 int X509_STORE_set_trust(X509_STORE *ctx, int trust);
273273 int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm);
274274 X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *ctx);
275+int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags);
275276
276277 void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify_fn verify);
277278 #define X509_STORE_set_verify_func(ctx, func) \
@@ -458,12 +459,17 @@ int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
458459 int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
459460 void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
460461 void X509_VERIFY_PARAM_set_auth_level(X509_VERIFY_PARAM *param, int auth_level);
462+time_t X509_VERIFY_PARAM_get_time(const X509_VERIFY_PARAM *param);
461463 void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t);
462464 int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
463465 ASN1_OBJECT *policy);
464466 int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,
465467 STACK_OF(ASN1_OBJECT) *policies);
466468
469+int X509_VERIFY_PARAM_set_inh_flags(X509_VERIFY_PARAM *param,
470+ uint32_t flags);
471+uint32_t X509_VERIFY_PARAM_get_inh_flags(const X509_VERIFY_PARAM *param);
472+
467473 int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param,
468474 const char *name, size_t namelen);
469475 int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
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 "\x53\xFA\xD4\x49\xA9\x0C\x9C\x7F\xF8\xE2\x5D\x0A\x76\x65\xE6\xA6\x95\x3A\x8B\x24"
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"
99 // ssleay32.dll
10-#define FILEHASH_SSLEAY32_DLL_SHA1 "\x95\x72\x97\x6C\x58\x47\x65\xA5\x58\x26\xCB\xC9\xBF\x14\x1E\x74\xA8\x8B\x25\xCD"
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"
1111 #elif defined(_M_AMD64)
1212 // libeay32.dll
13-#define FILEHASH_LIBEAY32_DLL_SHA1 "\xE9\xD5\x06\xAD\x1F\xA1\x36\x54\xAB\xEB\x6F\x7D\xB8\x1A\xBD\xCB\x02\xB2\xAA\x62"
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"
1414 // ssleay32.dll
15-#define FILEHASH_SSLEAY32_DLL_SHA1 "\xCC\x62\xD5\x15\xAC\xAF\xFE\x85\x95\xD3\x68\x92\x04\x30\xBC\xF9\x4B\xE4\x48\xCB"
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"
1616 #endif
1717
--- a/main.c
+++ b/main.c
@@ -771,7 +771,7 @@ static int InitApp(LPSTR lpszCmdLine, int cmdShow)
771771 DispWindowTitle();
772772 // SourceForge.JPによるフォーク
773773 // SetTaskMsg("FFFTP Ver." VER_STR " Copyright(C) 1997-2010 Sota & cooperators.");
774- SetTaskMsg("FFFTP Ver." VER_STR " Copyright(C) 1997-2010 Sota & cooperators.\r\nCopyright (C) 2011-2016 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen).");
774+ SetTaskMsg("FFFTP Ver." VER_STR " Copyright(C) 1997-2010 Sota & cooperators.\r\nCopyright (C) 2011-2017 FFFTP Project (Hiromichi Matsushima, Suguru Kawamoto, IWAMOTO Kouichi, vitamin0x, unarist, Asami, fortran90, tomo1192, Yuji Tanaka, Moriguchi Hirokazu, Fu-sen).");
775775
776776 if(ForceIni)
777777 SetTaskMsg("%s%s", MSGJPN283, IniPath);