FFFTPのソースコードです。
| リビジョン | 000d7055e73b6797d9a738da09ef7c4e17c05c62 (tree) |
|---|---|
| 日時 | 2017-06-18 18:02:16 |
| 作者 | s_kawamoto <s_kawamoto@user...> |
| コミッター | s_kawamoto |
Update OpenSSL to 1.1.0f.
Update PEM file.
FFFTP_Eng_Release/FFFTP.exe (diff) FFFTP_Eng_Release_64/FFFTP.exe (diff) Release/FFFTP.exe (diff) Release_64/FFFTP.exe (diff)
Resource/FFFTP.rc (diff) Resource_eng/ffftp.rc (diff)
common.h (diff) contrib/openssl/CHANGES (diff) contrib/openssl/LICENSE (diff) contrib/openssl/NEWS (diff) contrib/openssl/README (diff) contrib/openssl/include/openssl/asn1.h (diff) contrib/openssl/include/openssl/asn1t.h (diff) contrib/openssl/include/openssl/bio.h (diff) contrib/openssl/include/openssl/conf.h (diff) contrib/openssl/include/openssl/crypto.h (diff) contrib/openssl/include/openssl/dh.h (diff) contrib/openssl/include/openssl/e_os2.h (diff) contrib/openssl/include/openssl/ec.h (diff) contrib/openssl/include/openssl/err.h (diff) contrib/openssl/include/openssl/lhash.h (diff) contrib/openssl/include/openssl/objects.h (diff) contrib/openssl/include/openssl/opensslv.h (diff) contrib/openssl/include/openssl/ssl.h (diff) contrib/openssl/include/openssl/x509.h (diff) contrib/openssl/include/openssl/x509_vfy.h (diff) dist/amd64/libeay32.dll (diff) dist/amd64/ssleay32.dll (diff) dist/libeay32.dll (diff) dist/ssl.pem (diff) dist/ssleay32.dll (diff) filehash.h (diff)| @@ -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-20170325",-1,113,11,90,8 | |
| 245 | + CTEXT "FFFTP Ver 1.99a-20170618",-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,13 | |
| 2217 | - PRODUCTVERSION 1,99,1,13 | |
| 2216 | + FILEVERSION 1,99,1,14 | |
| 2217 | + PRODUCTVERSION 1,99,1,14 | |
| 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, 13" | |
| 2235 | + VALUE "FileVersion", "1, 99, 1, 14" | |
| 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, 13" | |
| 2240 | + VALUE "ProductVersion", "1, 99, 1, 14" | |
| 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-20170325",-1,110,11,90,8 | |
| 245 | + CTEXT "FFFTP Ver 1.99a-20170618",-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,13 | |
| 2257 | - PRODUCTVERSION 1,99,1,13 | |
| 2256 | + FILEVERSION 1,99,1,14 | |
| 2257 | + PRODUCTVERSION 1,99,1,14 | |
| 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, 13" | |
| 2275 | + VALUE "FileVersion", "1, 99, 1, 14" | |
| 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, 13" | |
| 2280 | + VALUE "ProductVersion", "1, 99, 1, 14" | |
| 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-20170325 64bit" | |
| 75 | +#define VER_STR "1.99a-20170618 64bit" | |
| 76 | 76 | #else |
| 77 | -#define VER_STR "1.99a-20170325" | |
| 77 | +#define VER_STR "1.99a-20170618" | |
| 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 2017032500 /* リリースバージョン */ | |
| 84 | +#define RELEASE_VERSION_NUM 2017061800 /* リリースバージョン */ | |
| 85 | 85 | |
| 86 | 86 | |
| 87 | 87 | // SourceForge.JPによるフォーク |
| @@ -2,6 +2,17 @@ | ||
| 2 | 2 | OpenSSL CHANGES |
| 3 | 3 | _______________ |
| 4 | 4 | |
| 5 | + Changes between 1.1.0e and 1.1.0f [25 May 2017] | |
| 6 | + | |
| 7 | + *) Have 'config' recognise 64-bit mingw and choose 'mingw64' as the target | |
| 8 | + platform rather than 'mingw'. | |
| 9 | + [Richard Levitte] | |
| 10 | + | |
| 11 | + *) Remove the VMS-specific reimplementation of gmtime from crypto/o_times.c. | |
| 12 | + VMS C's RTL has a fully up to date gmtime() and gmtime_r() since V7.1, | |
| 13 | + which is the minimum version we support. | |
| 14 | + [Richard Levitte] | |
| 15 | + | |
| 5 | 16 | Changes between 1.1.0d and 1.1.0e [16 Feb 2017] |
| 6 | 17 | |
| 7 | 18 | *) Encrypt-Then-Mac renegotiation crash |
| @@ -173,7 +184,7 @@ | ||
| 173 | 184 | to service a connection. This could lead to a Denial of Service through |
| 174 | 185 | memory exhaustion. However, the excessive message length check still takes |
| 175 | 186 | place, and this would cause the connection to immediately fail. Assuming |
| 176 | - that the application calls SSL_free() on the failed conneciton in a timely | |
| 187 | + that the application calls SSL_free() on the failed connection in a timely | |
| 177 | 188 | manner then the 21Mb of allocated memory will then be immediately freed |
| 178 | 189 | again. Therefore the excessive memory allocation will be transitory in |
| 179 | 190 | nature. This then means that there is only a security impact if: |
| @@ -421,7 +432,7 @@ | ||
| 421 | 432 | *) Add X25519 support. |
| 422 | 433 | Add ASN.1 and EVP_PKEY methods for X25519. This includes support |
| 423 | 434 | for public and private key encoding using the format documented in |
| 424 | - draft-ietf-curdle-pkix-02. The coresponding EVP_PKEY method supports | |
| 435 | + draft-ietf-curdle-pkix-02. The corresponding EVP_PKEY method supports | |
| 425 | 436 | key generation and key derivation. |
| 426 | 437 | |
| 427 | 438 | TLS support complies with draft-ietf-tls-rfc4492bis-08 and uses |
| @@ -926,7 +937,7 @@ | ||
| 926 | 937 | done while fixing the error code for the key-too-small case. |
| 927 | 938 | [Annie Yousar <a.yousar@informatik.hu-berlin.de>] |
| 928 | 939 | |
| 929 | - *) CA.sh has been removmed; use CA.pl instead. | |
| 940 | + *) CA.sh has been removed; use CA.pl instead. | |
| 930 | 941 | [Rich Salz] |
| 931 | 942 | |
| 932 | 943 | *) Removed old DES API. |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | LICENSE ISSUES |
| 3 | 3 | ============== |
| 4 | 4 | |
| 5 | - The OpenSSL toolkit stays under a dual license, i.e. both the conditions of | |
| 5 | + The OpenSSL toolkit stays under a double license, i.e. both the conditions of | |
| 6 | 6 | the OpenSSL License and the original SSLeay license apply to the toolkit. |
| 7 | 7 | See below for the actual license texts. |
| 8 | 8 |
| @@ -10,7 +10,7 @@ | ||
| 10 | 10 | --------------- |
| 11 | 11 | |
| 12 | 12 | /* ==================================================================== |
| 13 | - * Copyright (c) 1998-2016 The OpenSSL Project. All rights reserved. | |
| 13 | + * Copyright (c) 1998-2017 The OpenSSL Project. All rights reserved. | |
| 14 | 14 | * |
| 15 | 15 | * Redistribution and use in source and binary forms, with or without |
| 16 | 16 | * modification, are permitted provided that the following conditions |
| @@ -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.0e and OpenSSL 1.1.0f [25 May 2017] | |
| 9 | + | |
| 10 | + o config now recognises 64-bit mingw and chooses mingw64 instead of mingw | |
| 11 | + | |
| 8 | 12 | Major changes between OpenSSL 1.1.0d and OpenSSL 1.1.0e [16 Feb 2017] |
| 9 | 13 | |
| 10 | 14 | o Encrypt-Then-Mac renegotiation crash (CVE-2017-3733) |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | |
| 2 | - OpenSSL 1.1.0e 16 Feb 2017 | |
| 2 | + OpenSSL 1.1.0f 25 May 2017 | |
| 3 | 3 | |
| 4 | 4 | Copyright (c) 1998-2016 The OpenSSL Project |
| 5 | 5 | Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson |
| @@ -625,8 +625,8 @@ ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t); | ||
| 625 | 625 | ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t, |
| 626 | 626 | int offset_day, long offset_sec); |
| 627 | 627 | int ASN1_TIME_check(const ASN1_TIME *t); |
| 628 | -ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME | |
| 629 | - **out); | |
| 628 | +ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t, | |
| 629 | + ASN1_GENERALIZEDTIME **out); | |
| 630 | 630 | int ASN1_TIME_set_string(ASN1_TIME *s, const char *str); |
| 631 | 631 | |
| 632 | 632 | int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a); |
| @@ -946,6 +946,7 @@ int ERR_load_ASN1_strings(void); | ||
| 946 | 946 | # define ASN1_F_C2I_ASN1_INTEGER 194 |
| 947 | 947 | # define ASN1_F_C2I_ASN1_OBJECT 196 |
| 948 | 948 | # define ASN1_F_C2I_IBUF 226 |
| 949 | +# define ASN1_F_C2I_UINT64_INT 101 | |
| 949 | 950 | # define ASN1_F_COLLECT_DATA 140 |
| 950 | 951 | # define ASN1_F_D2I_ASN1_OBJECT 147 |
| 951 | 952 | # define ASN1_F_D2I_ASN1_UINTEGER 150 |
| @@ -971,6 +972,8 @@ int ERR_load_ASN1_strings(void); | ||
| 971 | 972 | # define ASN1_F_SMIME_READ_ASN1 212 |
| 972 | 973 | # define ASN1_F_SMIME_TEXT 213 |
| 973 | 974 | # define ASN1_F_STBL_MODULE_INIT 223 |
| 975 | +# define ASN1_F_UINT32_C2I 105 | |
| 976 | +# define ASN1_F_UINT64_C2I 112 | |
| 974 | 977 | # define ASN1_F_X509_CRL_ADD0_REVOKED 169 |
| 975 | 978 | # define ASN1_F_X509_INFO_NEW 170 |
| 976 | 979 | # define ASN1_F_X509_NAME_ENCODE 203 |
| @@ -346,17 +346,22 @@ extern "C" { | ||
| 346 | 346 | |
| 347 | 347 | /* OPTIONAL simple type */ |
| 348 | 348 | # define ASN1_OPT(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL, 0, stname, field, type) |
| 349 | +# define ASN1_OPT_EMBED(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED, 0, stname, field, type) | |
| 349 | 350 | |
| 350 | 351 | /* IMPLICIT tagged simple type */ |
| 351 | 352 | # define ASN1_IMP(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, 0) |
| 353 | +# define ASN1_IMP_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_EMBED) | |
| 352 | 354 | |
| 353 | 355 | /* IMPLICIT tagged OPTIONAL simple type */ |
| 354 | 356 | # define ASN1_IMP_OPT(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL) |
| 357 | +# define ASN1_IMP_OPT_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED) | |
| 355 | 358 | |
| 356 | 359 | /* Same as above but EXPLICIT */ |
| 357 | 360 | |
| 358 | 361 | # define ASN1_EXP(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, 0) |
| 362 | +# define ASN1_EXP_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_EMBED) | |
| 359 | 363 | # define ASN1_EXP_OPT(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL) |
| 364 | +# define ASN1_EXP_OPT_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED) | |
| 360 | 365 | |
| 361 | 366 | /* SEQUENCE OF type */ |
| 362 | 367 | # define ASN1_SEQUENCE_OF(stname, field, type) \ |
| @@ -20,11 +20,7 @@ | ||
| 20 | 20 | # include <openssl/crypto.h> |
| 21 | 21 | |
| 22 | 22 | # ifndef OPENSSL_NO_SCTP |
| 23 | -# ifndef OPENSSL_SYS_VMS | |
| 24 | -# include <stdint.h> | |
| 25 | -# else | |
| 26 | -# include <inttypes.h> | |
| 27 | -# endif | |
| 23 | +# include <openssl/e_os2.h> | |
| 28 | 24 | # endif |
| 29 | 25 | |
| 30 | 26 | #ifdef __cplusplus |
| @@ -170,7 +166,7 @@ extern "C" { | ||
| 170 | 166 | /* |
| 171 | 167 | * This is used with memory BIOs: |
| 172 | 168 | * BIO_FLAGS_MEM_RDONLY means we shouldn't free up or change the data in any way; |
| 173 | - * BIO_FLAGS_NONCLEAR_RST means we should't clear data on reset. | |
| 169 | + * BIO_FLAGS_NONCLEAR_RST means we shouldn't clear data on reset. | |
| 174 | 170 | */ |
| 175 | 171 | # define BIO_FLAGS_MEM_RDONLY 0x200 |
| 176 | 172 | # define BIO_FLAGS_NONCLEAR_RST 0x400 |
| @@ -208,6 +208,7 @@ int ERR_load_CONF_strings(void); | ||
| 208 | 208 | # define CONF_R_NO_VALUE 108 |
| 209 | 209 | # define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 |
| 210 | 210 | # define CONF_R_UNKNOWN_MODULE_NAME 113 |
| 211 | +# define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116 | |
| 211 | 212 | # define CONF_R_VARIABLE_HAS_NO_VALUE 104 |
| 212 | 213 | |
| 213 | 214 | # ifdef __cplusplus |
| @@ -174,7 +174,7 @@ typedef void CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad, | ||
| 174 | 174 | typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad, |
| 175 | 175 | int idx, long argl, void *argp); |
| 176 | 176 | typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from, |
| 177 | - void *srcp, int idx, long argl, void *argp); | |
| 177 | + void *from_d, int idx, long argl, void *argp); | |
| 178 | 178 | __owur int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, |
| 179 | 179 | CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, |
| 180 | 180 | CRYPTO_EX_free *free_func); |
| @@ -87,12 +87,29 @@ DECLARE_ASN1_ITEM(DHparams) | ||
| 87 | 87 | */ |
| 88 | 88 | # define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME |
| 89 | 89 | |
| 90 | -# define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ | |
| 91 | - (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x)) | |
| 92 | -# define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \ | |
| 93 | - (unsigned char *)(x)) | |
| 94 | -# define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x) | |
| 95 | -# define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) | |
| 90 | +# define d2i_DHparams_fp(fp,x) \ | |
| 91 | + (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ | |
| 92 | + (char *(*)())d2i_DHparams, \ | |
| 93 | + (fp), \ | |
| 94 | + (unsigned char **)(x)) | |
| 95 | +# define i2d_DHparams_fp(fp,x) \ | |
| 96 | + ASN1_i2d_fp(i2d_DHparams,(fp), (unsigned char *)(x)) | |
| 97 | +# define d2i_DHparams_bio(bp,x) \ | |
| 98 | + ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x) | |
| 99 | +# define i2d_DHparams_bio(bp,x) \ | |
| 100 | + ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) | |
| 101 | + | |
| 102 | +# define d2i_DHxparams_fp(fp,x) \ | |
| 103 | + (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ | |
| 104 | + (char *(*)())d2i_DHxparams, \ | |
| 105 | + (fp), \ | |
| 106 | + (unsigned char **)(x)) | |
| 107 | +# define i2d_DHxparams_fp(fp,x) \ | |
| 108 | + ASN1_i2d_fp(i2d_DHxparams,(fp), (unsigned char *)(x)) | |
| 109 | +# define d2i_DHxparams_bio(bp,x) \ | |
| 110 | + ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x) | |
| 111 | +# define i2d_DHxparams_bio(bp,x) \ | |
| 112 | + ASN1_i2d_bio_of_const(DH, i2d_DHxparams, bp, x) | |
| 96 | 113 | |
| 97 | 114 | DH *DHparams_dup(DH *); |
| 98 | 115 |
| @@ -212,9 +212,9 @@ extern "C" { | ||
| 212 | 212 | # endif |
| 213 | 213 | # endif |
| 214 | 214 | |
| 215 | -# if defined(OPENSSL_SYS_UEFI) && !defined(ssize_t) | |
| 216 | -# define ossl_ssize_t int | |
| 217 | -# define OSSL_SSIZE_MAX INT_MAX | |
| 215 | +# if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t) | |
| 216 | +# define ossl_ssize_t INTN | |
| 217 | +# define OSSL_SSIZE_MAX MAX_INTN | |
| 218 | 218 | # endif |
| 219 | 219 | |
| 220 | 220 | # ifndef ossl_ssize_t |
| @@ -242,7 +242,6 @@ typedef INT32 int32_t; | ||
| 242 | 242 | typedef UINT32 uint32_t; |
| 243 | 243 | typedef INT64 int64_t; |
| 244 | 244 | typedef UINT64 uint64_t; |
| 245 | -# define PRIu64 "%Lu" | |
| 246 | 245 | # elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ |
| 247 | 246 | defined(__osf__) || defined(__sgi) || defined(__hpux) || \ |
| 248 | 247 | defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__) |
| @@ -264,18 +263,6 @@ typedef unsigned __int64 uint64_t; | ||
| 264 | 263 | # include <stdint.h> |
| 265 | 264 | # endif |
| 266 | 265 | |
| 267 | -/* | |
| 268 | - * We need a format operator for some client tools for uint64_t. If inttypes.h | |
| 269 | - * isn't available or did not define it, just go with hard-coded. | |
| 270 | - */ | |
| 271 | -# ifndef PRIu64 | |
| 272 | -# ifdef SIXTY_FOUR_BIT_LONG | |
| 273 | -# define PRIu64 "lu" | |
| 274 | -# else | |
| 275 | -# define PRIu64 "llu" | |
| 276 | -# endif | |
| 277 | -# endif | |
| 278 | - | |
| 279 | 266 | /* ossl_inline: portable inline definition usable in public headers */ |
| 280 | 267 | # if !defined(inline) && !defined(__cplusplus) |
| 281 | 268 | # if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L |
| @@ -573,11 +573,9 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p, | ||
| 573 | 573 | * \param point EC_POINT object |
| 574 | 574 | * \param form point conversion form |
| 575 | 575 | * \param pbuf returns pointer to allocated buffer |
| 576 | - * \param len length of the memory buffer | |
| 577 | 576 | * \param ctx BN_CTX object (optional) |
| 578 | 577 | * \return the length of the encoded octet string or 0 if an error occurred |
| 579 | 578 | */ |
| 580 | - | |
| 581 | 579 | size_t EC_POINT_point2buf(const EC_GROUP *group, const EC_POINT *point, |
| 582 | 580 | point_conversion_form_t form, |
| 583 | 581 | unsigned char **pbuf, BN_CTX *ctx); |
| @@ -863,7 +861,7 @@ int EC_KEY_generate_key(EC_KEY *key); | ||
| 863 | 861 | int EC_KEY_check_key(const EC_KEY *key); |
| 864 | 862 | |
| 865 | 863 | /** Indicates if an EC_KEY can be used for signing. |
| 866 | - * \param key the EC_KEY object | |
| 864 | + * \param eckey the EC_KEY object | |
| 867 | 865 | * \return 1 if can can sign and 0 otherwise. |
| 868 | 866 | */ |
| 869 | 867 | int EC_KEY_can_sign(const EC_KEY *eckey); |
| @@ -882,11 +880,9 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x, | ||
| 882 | 880 | * \param key key to encode |
| 883 | 881 | * \param form point conversion form |
| 884 | 882 | * \param pbuf returns pointer to allocated buffer |
| 885 | - * \param len length of the memory buffer | |
| 886 | 883 | * \param ctx BN_CTX object (optional) |
| 887 | 884 | * \return the length of the encoded octet string or 0 if an error occurred |
| 888 | 885 | */ |
| 889 | - | |
| 890 | 886 | size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form, |
| 891 | 887 | unsigned char **pbuf, BN_CTX *ctx); |
| 892 | 888 |
| @@ -921,11 +917,10 @@ int EC_KEY_oct2priv(EC_KEY *key, const unsigned char *buf, size_t len); | ||
| 921 | 917 | size_t EC_KEY_priv2oct(const EC_KEY *key, unsigned char *buf, size_t len); |
| 922 | 918 | |
| 923 | 919 | /** Encodes an EC_KEY private key to an allocated octet string |
| 924 | - * \param key key to encode | |
| 920 | + * \param eckey key to encode | |
| 925 | 921 | * \param pbuf returns pointer to allocated buffer |
| 926 | 922 | * \return the length of the encoded octet string or 0 if an error occurred |
| 927 | 923 | */ |
| 928 | - | |
| 929 | 924 | size_t EC_KEY_priv2buf(const EC_KEY *eckey, unsigned char **pbuf); |
| 930 | 925 | |
| 931 | 926 | /********************************************************************/ |
| @@ -159,6 +159,7 @@ typedef struct err_state_st { | ||
| 159 | 159 | # define SYS_F_GETSOCKOPT 15 |
| 160 | 160 | # define SYS_F_GETSOCKNAME 16 |
| 161 | 161 | # define SYS_F_GETHOSTBYNAME 17 |
| 162 | +# define SYS_F_FFLUSH 18 | |
| 162 | 163 | |
| 163 | 164 | /* reasons */ |
| 164 | 165 | # define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */ |
| @@ -195,8 +195,21 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out); | ||
| 195 | 195 | LHASH_OF(type) |
| 196 | 196 | |
| 197 | 197 | DEFINE_LHASH_OF(OPENSSL_STRING); |
| 198 | +# ifdef _MSC_VER | |
| 199 | +/* | |
| 200 | + * push and pop this warning: | |
| 201 | + * warning C4090: 'function': different 'const' qualifiers | |
| 202 | + */ | |
| 203 | +# pragma warning (push) | |
| 204 | +# pragma warning (disable: 4090) | |
| 205 | +# endif | |
| 206 | + | |
| 198 | 207 | DEFINE_LHASH_OF(OPENSSL_CSTRING); |
| 199 | 208 | |
| 209 | +# ifdef _MSC_VER | |
| 210 | +# pragma warning (pop) | |
| 211 | +# endif | |
| 212 | + | |
| 200 | 213 | #ifdef __cplusplus |
| 201 | 214 | } |
| 202 | 215 | #endif |
| @@ -992,7 +992,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num, | ||
| 992 | 992 | * const void *a_; |
| 993 | 993 | * const nid_triple const *a = a_; |
| 994 | 994 | * |
| 995 | - * The assignement discards a const because what you really want is: | |
| 995 | + * The assignment discards a const because what you really want is: | |
| 996 | 996 | * |
| 997 | 997 | * const int const * const *a = a_; |
| 998 | 998 | * |
| @@ -1000,7 +1000,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num, | ||
| 1000 | 1000 | * which breaks comparison functions. |
| 1001 | 1001 | * |
| 1002 | 1002 | * Thus we end up having to cast, sadly, or unpack the |
| 1003 | - * declarations. Or, as I finally did in this case, delcare nid_triple | |
| 1003 | + * declarations. Or, as I finally did in this case, declare nid_triple | |
| 1004 | 1004 | * to be a struct, which it should have been in the first place. |
| 1005 | 1005 | * |
| 1006 | 1006 | * Ben, August 2008. |
| @@ -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 0x1010005fL | |
| 42 | +# define OPENSSL_VERSION_NUMBER 0x1010006fL | |
| 43 | 43 | # ifdef OPENSSL_FIPS |
| 44 | -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e-fips 16 Feb 2017" | |
| 44 | +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0f-fips 25 May 2017" | |
| 45 | 45 | # else |
| 46 | -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e 16 Feb 2017" | |
| 46 | +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0f 25 May 2017" | |
| 47 | 47 | # endif |
| 48 | 48 | |
| 49 | 49 | /*- |
| @@ -267,52 +267,28 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); | ||
| 267 | 267 | |
| 268 | 268 | /* Allow initial connection to servers that don't support RI */ |
| 269 | 269 | # define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004U |
| 270 | -/* Removed from OpenSSL 0.9.8q and 1.0.0c */ | |
| 271 | -/* Dead forever, see CVE-2010-4180. */ | |
| 272 | -# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0U | |
| 273 | 270 | # define SSL_OP_TLSEXT_PADDING 0x00000010U |
| 274 | -# define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x0U | |
| 275 | 271 | # define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040U |
| 276 | -/* Ancient SSLeay version, retained for compatibility */ | |
| 277 | -# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x0 | |
| 278 | -# define SSL_OP_TLS_D5_BUG 0x0U | |
| 279 | -/* Removed from OpenSSL 1.1.0 */ | |
| 280 | -# define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0U | |
| 281 | - | |
| 282 | -/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */ | |
| 283 | -# define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 | |
| 284 | -/* Refers to ancient SSLREF and SSLv2, retained for compatibility */ | |
| 285 | -# define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 | |
| 286 | -/* Related to removed SSLv2 */ | |
| 287 | -# define SSL_OP_MICROSOFT_SESS_ID_BUG 0x0 | |
| 288 | -# define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x0 | |
| 289 | 272 | |
| 290 | 273 | /* |
| 291 | 274 | * Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added in |
| 292 | 275 | * OpenSSL 0.9.6d. Usually (depending on the application protocol) the |
| 293 | 276 | * workaround is not needed. Unfortunately some broken SSL/TLS |
| 294 | 277 | * implementations cannot handle it at all, which is why we include it in |
| 295 | - * SSL_OP_ALL. | |
| 278 | + * SSL_OP_ALL. Added in 0.9.6e | |
| 296 | 279 | */ |
| 297 | -/* added in 0.9.6e */ | |
| 298 | 280 | # define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800U |
| 299 | 281 | |
| 300 | -/* | |
| 301 | - * SSL_OP_ALL: various bug workarounds that should be rather harmless. This | |
| 302 | - * used to be 0x000FFFFFL before 0.9.7. | |
| 303 | - */ | |
| 304 | -# define SSL_OP_ALL 0x80000BFFU | |
| 305 | - | |
| 306 | 282 | /* DTLS options */ |
| 307 | -# define SSL_OP_NO_QUERY_MTU 0x00001000U | |
| 283 | +# define SSL_OP_NO_QUERY_MTU 0x00001000U | |
| 308 | 284 | /* Turn on Cookie Exchange (on relevant for servers) */ |
| 309 | -# define SSL_OP_COOKIE_EXCHANGE 0x00002000U | |
| 285 | +# define SSL_OP_COOKIE_EXCHANGE 0x00002000U | |
| 310 | 286 | /* Don't use RFC4507 ticket extension */ |
| 311 | -# define SSL_OP_NO_TICKET 0x00004000U | |
| 287 | +# define SSL_OP_NO_TICKET 0x00004000U | |
| 312 | 288 | # ifndef OPENSSL_NO_DTLS1_METHOD |
| 313 | 289 | /* Use Cisco's "speshul" version of DTLS_BAD_VER |
| 314 | 290 | * (only with deprecated DTLSv1_client_method()) */ |
| 315 | -# define SSL_OP_CISCO_ANYCONNECT 0x00008000U | |
| 291 | +# define SSL_OP_CISCO_ANYCONNECT 0x00008000U | |
| 316 | 292 | # endif |
| 317 | 293 | |
| 318 | 294 | /* As server, disallow session resumption on renegotiation */ |
| @@ -321,12 +297,6 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); | ||
| 321 | 297 | # define SSL_OP_NO_COMPRESSION 0x00020000U |
| 322 | 298 | /* Permit unsafe legacy renegotiation */ |
| 323 | 299 | # define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x00040000U |
| 324 | -/* Does nothing: retained for compatibility */ | |
| 325 | -# define SSL_OP_SINGLE_ECDH_USE 0x0 | |
| 326 | -/* Does nothing: retained for compatibility */ | |
| 327 | -# define SSL_OP_SINGLE_DH_USE 0x0 | |
| 328 | -/* Does nothing: retained for compatibility */ | |
| 329 | -# define SSL_OP_EPHEMERAL_RSA 0x0 | |
| 330 | 300 | /* |
| 331 | 301 | * Set on servers to choose the cipher according to the server's preferences |
| 332 | 302 | */ |
| @@ -339,7 +309,6 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); | ||
| 339 | 309 | */ |
| 340 | 310 | # define SSL_OP_TLS_ROLLBACK_BUG 0x00800000U |
| 341 | 311 | |
| 342 | -# define SSL_OP_NO_SSLv2 0x00000000U | |
| 343 | 312 | # define SSL_OP_NO_SSLv3 0x02000000U |
| 344 | 313 | # define SSL_OP_NO_TLSv1 0x04000000U |
| 345 | 314 | # define SSL_OP_NO_TLSv1_2 0x08000000U |
| @@ -352,12 +321,6 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); | ||
| 352 | 321 | SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2) |
| 353 | 322 | # define SSL_OP_NO_DTLS_MASK (SSL_OP_NO_DTLSv1|SSL_OP_NO_DTLSv1_2) |
| 354 | 323 | |
| 355 | - | |
| 356 | -/* Removed from previous versions */ | |
| 357 | -# define SSL_OP_PKCS1_CHECK_1 0x0 | |
| 358 | -# define SSL_OP_PKCS1_CHECK_2 0x0 | |
| 359 | -# define SSL_OP_NETSCAPE_CA_DN_BUG 0x0 | |
| 360 | -# define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0U | |
| 361 | 324 | /* |
| 362 | 325 | * Make server add server-hello extension from early version of cryptopro |
| 363 | 326 | * draft, when GOST ciphersuite is negotiated. Required for interoperability |
| @@ -366,6 +329,59 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); | ||
| 366 | 329 | # define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000U |
| 367 | 330 | |
| 368 | 331 | /* |
| 332 | + * SSL_OP_ALL: various bug workarounds that should be rather harmless. | |
| 333 | + * This used to be 0x000FFFFFL before 0.9.7. | |
| 334 | + * This used to be 0x80000BFFU before 1.1.1. | |
| 335 | + */ | |
| 336 | +# define SSL_OP_ALL (SSL_OP_CRYPTOPRO_TLSEXT_BUG|\ | |
| 337 | + SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS|\ | |
| 338 | + SSL_OP_LEGACY_SERVER_CONNECT|\ | |
| 339 | + SSL_OP_TLSEXT_PADDING|\ | |
| 340 | + SSL_OP_SAFARI_ECDHE_ECDSA_BUG) | |
| 341 | + | |
| 342 | +/* OBSOLETE OPTIONS: retained for compatibility */ | |
| 343 | + | |
| 344 | +/* Removed from OpenSSL 1.1.0. Was 0x00000001L */ | |
| 345 | +/* Related to removed SSLv2. */ | |
| 346 | +# define SSL_OP_MICROSOFT_SESS_ID_BUG 0x0 | |
| 347 | +/* Removed from OpenSSL 1.1.0. Was 0x00000002L */ | |
| 348 | +/* Related to removed SSLv2. */ | |
| 349 | +# define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x0 | |
| 350 | +/* Removed from OpenSSL 0.9.8q and 1.0.0c. Was 0x00000008L */ | |
| 351 | +/* Dead forever, see CVE-2010-4180 */ | |
| 352 | +# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0 | |
| 353 | +/* Removed from OpenSSL 1.0.1h and 1.0.2. Was 0x00000010L */ | |
| 354 | +/* Refers to ancient SSLREF and SSLv2. */ | |
| 355 | +# define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0 | |
| 356 | +/* Removed from OpenSSL 1.1.0. Was 0x00000020 */ | |
| 357 | +# define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x0 | |
| 358 | +/* Removed from OpenSSL 0.9.7h and 0.9.8b. Was 0x00000040L */ | |
| 359 | +# define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0 | |
| 360 | +/* Removed from OpenSSL 1.1.0. Was 0x00000080 */ | |
| 361 | +/* Ancient SSLeay version. */ | |
| 362 | +# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x0 | |
| 363 | +/* Removed from OpenSSL 1.1.0. Was 0x00000100L */ | |
| 364 | +# define SSL_OP_TLS_D5_BUG 0x0 | |
| 365 | +/* Removed from OpenSSL 1.1.0. Was 0x00000200L */ | |
| 366 | +# define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0 | |
| 367 | +/* Removed from OpenSSL 1.1.0. Was 0x00080000L */ | |
| 368 | +# define SSL_OP_SINGLE_ECDH_USE 0x0 | |
| 369 | +/* Removed from OpenSSL 1.1.0. Was 0x00100000L */ | |
| 370 | +# define SSL_OP_SINGLE_DH_USE 0x0 | |
| 371 | +/* Removed from OpenSSL 1.0.1k and 1.0.2. Was 0x00200000L */ | |
| 372 | +# define SSL_OP_EPHEMERAL_RSA 0x0 | |
| 373 | +/* Removed from OpenSSL 1.1.0. Was 0x01000000L */ | |
| 374 | +# define SSL_OP_NO_SSLv2 0x0 | |
| 375 | +/* Removed from OpenSSL 1.0.1. Was 0x08000000L */ | |
| 376 | +# define SSL_OP_PKCS1_CHECK_1 0x0 | |
| 377 | +/* Removed from OpenSSL 1.0.1. Was 0x10000000L */ | |
| 378 | +# define SSL_OP_PKCS1_CHECK_2 0x0 | |
| 379 | +/* Removed from OpenSSL 1.1.0. Was 0x20000000L */ | |
| 380 | +# define SSL_OP_NETSCAPE_CA_DN_BUG 0x0 | |
| 381 | +/* Removed from OpenSSL 1.1.0. Was 0x40000000L */ | |
| 382 | +# define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0 | |
| 383 | + | |
| 384 | +/* | |
| 369 | 385 | * Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success |
| 370 | 386 | * when just a single record has been written): |
| 371 | 387 | */ |
| @@ -1816,7 +1832,7 @@ void SSL_set_not_resumable_session_callback(SSL *ssl, | ||
| 1816 | 1832 | # endif |
| 1817 | 1833 | |
| 1818 | 1834 | __owur int SSL_session_reused(SSL *s); |
| 1819 | -__owur int SSL_is_server(SSL *s); | |
| 1835 | +__owur int SSL_is_server(const SSL *s); | |
| 1820 | 1836 | |
| 1821 | 1837 | __owur __owur SSL_CONF_CTX *SSL_CONF_CTX_new(void); |
| 1822 | 1838 | int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx); |
| @@ -2346,6 +2362,7 @@ int ERR_load_SSL_strings(void); | ||
| 2346 | 2362 | # define SSL_R_ENCRYPTED_LENGTH_TOO_LONG 150 |
| 2347 | 2363 | # define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST 151 |
| 2348 | 2364 | # define SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN 204 |
| 2365 | +# define SSL_R_EXCEEDS_MAX_FRAGMENT_SIZE 194 | |
| 2349 | 2366 | # define SSL_R_EXCESSIVE_MESSAGE_SIZE 152 |
| 2350 | 2367 | # define SSL_R_EXTRA_DATA_IN_MESSAGE 153 |
| 2351 | 2368 | # define SSL_R_FAILED_TO_INIT_ASYNC 405 |
| @@ -641,7 +641,7 @@ int X509_get_signature_type(const X509 *x); | ||
| 641 | 641 | |
| 642 | 642 | /* |
| 643 | 643 | * This one is only used so that a binary form can output, as in |
| 644 | - * i2d_X509_NAME(X509_get_X509_PUBKEY(x),&buf) | |
| 644 | + * i2d_X509_NAME(X509_get_X509_PUBKEY(x), &buf) | |
| 645 | 645 | */ |
| 646 | 646 | X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x); |
| 647 | 647 | const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x); |
| @@ -272,7 +272,6 @@ int X509_STORE_set_purpose(X509_STORE *ctx, int purpose); | ||
| 272 | 272 | int X509_STORE_set_trust(X509_STORE *ctx, int trust); |
| 273 | 273 | int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm); |
| 274 | 274 | X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *ctx); |
| 275 | -int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags); | |
| 276 | 275 | |
| 277 | 276 | void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify_fn verify); |
| 278 | 277 | #define X509_STORE_set_verify_func(ctx, func) \ |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | ## |
| 2 | 2 | ## Bundle of CA Root Certificates |
| 3 | 3 | ## |
| 4 | -## Certificate data from Mozilla as of: Wed Jan 18 04:12:05 2017 GMT | |
| 4 | +## Certificate data from Mozilla as of: Wed Jun 7 03:12:05 2017 GMT | |
| 5 | 5 | ## |
| 6 | 6 | ## This is a bundle of X.509 certificates of public Certificate Authorities |
| 7 | 7 | ## (CA). These were automatically extracted from Mozilla's root certificates |
| @@ -14,7 +14,7 @@ | ||
| 14 | 14 | ## Just configure this file as the SSLCACertificateFile. |
| 15 | 15 | ## |
| 16 | 16 | ## Conversion done with mk-ca-bundle.pl version 1.27. |
| 17 | -## SHA256: dffa79e6aa993f558e82884abf7bb54bf440ab66ee91d82a27a627f6f2a4ace4 | |
| 17 | +## SHA256: 93753268e1c596aee21893fb1c6975338389132f15c942ed65fc394a904371d7 | |
| 18 | 18 | ## |
| 19 | 19 | |
| 20 | 20 |
| @@ -1220,33 +1220,6 @@ wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD | ||
| 1220 | 1220 | ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey |
| 1221 | 1221 | -----END CERTIFICATE----- |
| 1222 | 1222 | |
| 1223 | -WellsSecure Public Root Certificate Authority | |
| 1224 | -============================================= | |
| 1225 | ------BEGIN CERTIFICATE----- | |
| 1226 | -MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM | |
| 1227 | -F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw | |
| 1228 | -NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN | |
| 1229 | -MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl | |
| 1230 | -bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD | |
| 1231 | -VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G | |
| 1232 | -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1 | |
| 1233 | -iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13 | |
| 1234 | -i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8 | |
| 1235 | -bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB | |
| 1236 | -K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB | |
| 1237 | -AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu | |
| 1238 | -cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm | |
| 1239 | -lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB | |
| 1240 | -i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww | |
| 1241 | -GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg | |
| 1242 | -Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI | |
| 1243 | -K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0 | |
| 1244 | -bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj | |
| 1245 | -qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es | |
| 1246 | -E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ | |
| 1247 | -tylv2G0xffX8oRAHh84vWdw+WNs= | |
| 1248 | ------END CERTIFICATE----- | |
| 1249 | - | |
| 1250 | 1223 | COMODO ECC Certification Authority |
| 1251 | 1224 | ================================== |
| 1252 | 1225 | -----BEGIN CERTIFICATE----- |
| @@ -1308,46 +1281,6 @@ hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY | ||
| 1308 | 1281 | okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0= |
| 1309 | 1282 | -----END CERTIFICATE----- |
| 1310 | 1283 | |
| 1311 | -Microsec e-Szigno Root CA | |
| 1312 | -========================= | |
| 1313 | ------BEGIN CERTIFICATE----- | |
| 1314 | -MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE | |
| 1315 | -BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL | |
| 1316 | -EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0 | |
| 1317 | -MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz | |
| 1318 | -dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT | |
| 1319 | -GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB | |
| 1320 | -AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG | |
| 1321 | -d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N | |
| 1322 | -oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc | |
| 1323 | -QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ | |
| 1324 | -PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb | |
| 1325 | -MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG | |
| 1326 | -IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD | |
| 1327 | -VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3 | |
| 1328 | -LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A | |
| 1329 | -dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn | |
| 1330 | -AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA | |
| 1331 | -4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg | |
| 1332 | -AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA | |
| 1333 | -egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6 | |
| 1334 | -Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO | |
| 1335 | -PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv | |
| 1336 | -c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h | |
| 1337 | -cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw | |
| 1338 | -IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT | |
| 1339 | -WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV | |
| 1340 | -MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER | |
| 1341 | -MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp | |
| 1342 | -Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal | |
| 1343 | -HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT | |
| 1344 | -nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE | |
| 1345 | -aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a | |
| 1346 | -86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK | |
| 1347 | -yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB | |
| 1348 | -S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU= | |
| 1349 | ------END CERTIFICATE----- | |
| 1350 | - | |
| 1351 | 1284 | Certigna |
| 1352 | 1285 | ======== |
| 1353 | 1286 | -----BEGIN CERTIFICATE----- |
| @@ -1514,28 +1447,6 @@ G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m | ||
| 1514 | 1447 | mxE= |
| 1515 | 1448 | -----END CERTIFICATE----- |
| 1516 | 1449 | |
| 1517 | -ApplicationCA - Japanese Government | |
| 1518 | -=================================== | |
| 1519 | ------BEGIN CERTIFICATE----- | |
| 1520 | -MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT | |
| 1521 | -SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw | |
| 1522 | -MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl | |
| 1523 | -cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB | |
| 1524 | -CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4 | |
| 1525 | -fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN | |
| 1526 | -wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE | |
| 1527 | -jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu | |
| 1528 | -nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU | |
| 1529 | -WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV | |
| 1530 | -BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD | |
| 1531 | -vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs | |
| 1532 | -o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g | |
| 1533 | -/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD | |
| 1534 | -io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW | |
| 1535 | -dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL | |
| 1536 | -rosot4LKGAfmt1t06SAZf7IbiVQ= | |
| 1537 | ------END CERTIFICATE----- | |
| 1538 | - | |
| 1539 | 1450 | GeoTrust Primary Certification Authority - G3 |
| 1540 | 1451 | ============================================= |
| 1541 | 1452 | -----BEGIN CERTIFICATE----- |
| @@ -3538,30 +3449,6 @@ lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8 | ||
| 3538 | 3449 | B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU= |
| 3539 | 3450 | -----END CERTIFICATE----- |
| 3540 | 3451 | |
| 3541 | -TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6 | |
| 3542 | -==================================================== | |
| 3543 | ------BEGIN CERTIFICATE----- | |
| 3544 | -MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G | |
| 3545 | -A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls | |
| 3546 | -acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF | |
| 3547 | -bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5 | |
| 3548 | -MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL | |
| 3549 | -BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf | |
| 3550 | -aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm | |
| 3551 | -aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK | |
| 3552 | -AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a | |
| 3553 | -2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED | |
| 3554 | -wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb | |
| 3555 | -HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV | |
| 3556 | -+DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT | |
| 3557 | -9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG | |
| 3558 | -9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R | |
| 3559 | -fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy | |
| 3560 | -o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW | |
| 3561 | -hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1 | |
| 3562 | -O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw== | |
| 3563 | ------END CERTIFICATE----- | |
| 3564 | - | |
| 3565 | 3452 | Certinomis - Root CA |
| 3566 | 3453 | ==================== |
| 3567 | 3454 | -----BEGIN CERTIFICATE----- |
| @@ -4041,3 +3928,28 @@ TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt | ||
| 4041 | 3928 | 7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I |
| 4042 | 3929 | iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr |
| 4043 | 3930 | -----END CERTIFICATE----- |
| 3931 | + | |
| 3932 | +TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1 | |
| 3933 | +============================================= | |
| 3934 | +-----BEGIN CERTIFICATE----- | |
| 3935 | +MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT | |
| 3936 | +D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr | |
| 3937 | +IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g | |
| 3938 | +TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp | |
| 3939 | +ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD | |
| 3940 | +VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt | |
| 3941 | +c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth | |
| 3942 | +bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11 | |
| 3943 | +IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A | |
| 3944 | +MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8 | |
| 3945 | +6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc | |
| 3946 | +wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0 | |
| 3947 | +3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9 | |
| 3948 | +WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU | |
| 3949 | +ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ | |
| 3950 | +KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh | |
| 3951 | +AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc | |
| 3952 | +lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R | |
| 3953 | +e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j | |
| 3954 | +q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM= | |
| 3955 | +-----END CERTIFICATE----- |
| @@ -2,16 +2,16 @@ | ||
| 2 | 2 | // 同梱するファイルに合わせてハッシュ値を変更すること |
| 3 | 3 | |
| 4 | 4 | // ssl.pem |
| 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" | |
| 5 | +#define FILEHASH_SSL_PEM_SHA1 "\x76\xC9\x41\x51\xF0\x20\x5A\x93\x3F\x5E\xBD\x67\x13\xBD\x72\x8E\xB3\x82\x37\x62" | |
| 6 | 6 | #if defined(_M_IX86) |
| 7 | 7 | // libeay32.dll |
| 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" | |
| 8 | +#define FILEHASH_LIBEAY32_DLL_SHA1 "\x8A\xA1\x22\x87\x9D\x06\xCE\x61\x2A\x0D\x12\xCE\xCD\x05\x6F\x44\x04\xEB\x08\x8F" | |
| 9 | 9 | // ssleay32.dll |
| 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" | |
| 10 | +#define FILEHASH_SSLEAY32_DLL_SHA1 "\x83\x84\x23\x50\xDB\x61\xA3\xBC\xCA\xA0\xF0\xA7\xE4\x33\x87\xBB\x47\xCC\xE0\x05" | |
| 11 | 11 | #elif defined(_M_AMD64) |
| 12 | 12 | // libeay32.dll |
| 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" | |
| 13 | +#define FILEHASH_LIBEAY32_DLL_SHA1 "\xDA\x6A\xF5\x14\x91\xE1\x6C\x23\xB8\xB9\xA9\x2D\x55\x84\xF5\x9E\xE3\x1B\xE9\x78" | |
| 14 | 14 | // ssleay32.dll |
| 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" | |
| 15 | +#define FILEHASH_SSLEAY32_DLL_SHA1 "\x8C\x6E\x78\x40\x04\x46\x10\x9B\x02\x95\xE1\xAC\xA2\x02\x47\x37\xF9\xDE\x32\x6A" | |
| 16 | 16 | #endif |
| 17 | 17 |
Fork