diff --git a/ext/openssl/windows/x64/bin/libeay32.dll b/ext/openssl/windows/x64/bin/libeay32.dll index 318fa815..92c3edac 100644 Binary files a/ext/openssl/windows/x64/bin/libeay32.dll and b/ext/openssl/windows/x64/bin/libeay32.dll differ diff --git a/ext/openssl/windows/x64/bin/openssl.exe b/ext/openssl/windows/x64/bin/openssl.exe index 27cf1c14..9cdf68c4 100644 Binary files a/ext/openssl/windows/x64/bin/openssl.exe and b/ext/openssl/windows/x64/bin/openssl.exe differ diff --git a/ext/openssl/windows/x64/bin/ssleay32.dll b/ext/openssl/windows/x64/bin/ssleay32.dll index ff683520..3b172b57 100644 Binary files a/ext/openssl/windows/x64/bin/ssleay32.dll and b/ext/openssl/windows/x64/bin/ssleay32.dll differ diff --git a/ext/openssl/windows/x64/include/openssl/conf.h b/ext/openssl/windows/x64/include/openssl/conf.h index 8d926d5d..fe491130 100644 --- a/ext/openssl/windows/x64/include/openssl/conf.h +++ b/ext/openssl/windows/x64/include/openssl/conf.h @@ -259,6 +259,7 @@ void ERR_load_CONF_strings(void); # define CONF_R_NO_VALUE 108 # define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 # define CONF_R_UNKNOWN_MODULE_NAME 113 +# define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116 # define CONF_R_VARIABLE_HAS_NO_VALUE 104 #ifdef __cplusplus diff --git a/ext/openssl/windows/x64/include/openssl/dh.h b/ext/openssl/windows/x64/include/openssl/dh.h index a5bd9016..a228c7a7 100644 --- a/ext/openssl/windows/x64/include/openssl/dh.h +++ b/ext/openssl/windows/x64/include/openssl/dh.h @@ -182,12 +182,29 @@ struct dh_st { */ # define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME -# define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ - (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x)) -# define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \ - (unsigned char *)(x)) -# define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x) -# define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) +# define d2i_DHparams_fp(fp,x) \ + (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ + (char *(*)())d2i_DHparams, \ + (fp), \ + (unsigned char **)(x)) +# define i2d_DHparams_fp(fp,x) \ + ASN1_i2d_fp(i2d_DHparams,(fp), (unsigned char *)(x)) +# define d2i_DHparams_bio(bp,x) \ + ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x) +# define i2d_DHparams_bio(bp,x) \ + ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) + +# define d2i_DHxparams_fp(fp,x) \ + (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ + (char *(*)())d2i_DHxparams, \ + (fp), \ + (unsigned char **)(x)) +# define i2d_DHxparams_fp(fp,x) \ + ASN1_i2d_fp(i2d_DHxparams,(fp), (unsigned char *)(x)) +# define d2i_DHxparams_bio(bp,x) \ + ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x) +# define i2d_DHxparams_bio(bp,x) \ + ASN1_i2d_bio_of_const(DH, i2d_DHxparams, bp, x) DH *DHparams_dup(DH *); diff --git a/ext/openssl/windows/x64/include/openssl/err.h b/ext/openssl/windows/x64/include/openssl/err.h index 585aa8ba..f4236562 100644 --- a/ext/openssl/windows/x64/include/openssl/err.h +++ b/ext/openssl/windows/x64/include/openssl/err.h @@ -258,6 +258,7 @@ typedef struct err_state_st { # define SYS_F_WSASTARTUP 9/* Winsock stuff */ # define SYS_F_OPENDIR 10 # define SYS_F_FREAD 11 +# define SYS_F_FFLUSH 18 /* reasons */ # define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */ diff --git a/ext/openssl/windows/x64/include/openssl/opensslconf.h b/ext/openssl/windows/x64/include/openssl/opensslconf.h index 15abada7..d01afc20 100644 --- a/ext/openssl/windows/x64/include/openssl/opensslconf.h +++ b/ext/openssl/windows/x64/include/openssl/opensslconf.h @@ -118,8 +118,8 @@ extern "C" { #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define ENGINESDIR "C:\\Users\\Synergy\\Desktop\\openssl-w64/lib/engines" -#define OPENSSLDIR "C:\\Users\\Synergy\\Desktop\\openssl-w64/ssl" +#define ENGINESDIR "C:\\OpenSSL/lib/engines" +#define OPENSSLDIR "C:\\OpenSSL/ssl" #endif #endif diff --git a/ext/openssl/windows/x64/include/openssl/opensslv.h b/ext/openssl/windows/x64/include/openssl/opensslv.h index 645dd079..825a330a 100644 --- a/ext/openssl/windows/x64/include/openssl/opensslv.h +++ b/ext/openssl/windows/x64/include/openssl/opensslv.h @@ -30,11 +30,11 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x100020bfL +# define OPENSSL_VERSION_NUMBER 0x100020cfL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k-fips 26 Jan 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2l-fips 25 May 2017" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k 26 Jan 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2l 25 May 2017" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/ext/openssl/windows/x64/lib/engines/4758cca.dll b/ext/openssl/windows/x64/lib/engines/4758cca.dll index b3dba819..0df3784a 100644 Binary files a/ext/openssl/windows/x64/lib/engines/4758cca.dll and b/ext/openssl/windows/x64/lib/engines/4758cca.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/aep.dll b/ext/openssl/windows/x64/lib/engines/aep.dll index b84d1dec..95757767 100644 Binary files a/ext/openssl/windows/x64/lib/engines/aep.dll and b/ext/openssl/windows/x64/lib/engines/aep.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/atalla.dll b/ext/openssl/windows/x64/lib/engines/atalla.dll index db204253..98899cdf 100644 Binary files a/ext/openssl/windows/x64/lib/engines/atalla.dll and b/ext/openssl/windows/x64/lib/engines/atalla.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/capi.dll b/ext/openssl/windows/x64/lib/engines/capi.dll index 08354e57..f618149d 100644 Binary files a/ext/openssl/windows/x64/lib/engines/capi.dll and b/ext/openssl/windows/x64/lib/engines/capi.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/chil.dll b/ext/openssl/windows/x64/lib/engines/chil.dll index ac5fa4b8..0731de35 100644 Binary files a/ext/openssl/windows/x64/lib/engines/chil.dll and b/ext/openssl/windows/x64/lib/engines/chil.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/cswift.dll b/ext/openssl/windows/x64/lib/engines/cswift.dll index 98d766e5..e37bc735 100644 Binary files a/ext/openssl/windows/x64/lib/engines/cswift.dll and b/ext/openssl/windows/x64/lib/engines/cswift.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/gmp.dll b/ext/openssl/windows/x64/lib/engines/gmp.dll index 846001de..fa090ef2 100644 Binary files a/ext/openssl/windows/x64/lib/engines/gmp.dll and b/ext/openssl/windows/x64/lib/engines/gmp.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/gost.dll b/ext/openssl/windows/x64/lib/engines/gost.dll index 45dc1271..867f97a2 100644 Binary files a/ext/openssl/windows/x64/lib/engines/gost.dll and b/ext/openssl/windows/x64/lib/engines/gost.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/nuron.dll b/ext/openssl/windows/x64/lib/engines/nuron.dll index 79425656..187c2853 100644 Binary files a/ext/openssl/windows/x64/lib/engines/nuron.dll and b/ext/openssl/windows/x64/lib/engines/nuron.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/padlock.dll b/ext/openssl/windows/x64/lib/engines/padlock.dll index ddcfddff..0adfb57c 100644 Binary files a/ext/openssl/windows/x64/lib/engines/padlock.dll and b/ext/openssl/windows/x64/lib/engines/padlock.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/sureware.dll b/ext/openssl/windows/x64/lib/engines/sureware.dll index edcafe91..f66ce688 100644 Binary files a/ext/openssl/windows/x64/lib/engines/sureware.dll and b/ext/openssl/windows/x64/lib/engines/sureware.dll differ diff --git a/ext/openssl/windows/x64/lib/engines/ubsec.dll b/ext/openssl/windows/x64/lib/engines/ubsec.dll index b1825673..095462c9 100644 Binary files a/ext/openssl/windows/x64/lib/engines/ubsec.dll and b/ext/openssl/windows/x64/lib/engines/ubsec.dll differ diff --git a/ext/openssl/windows/x64/lib/libeay32.lib b/ext/openssl/windows/x64/lib/libeay32.lib index 3ddf2c35..c786d549 100644 Binary files a/ext/openssl/windows/x64/lib/libeay32.lib and b/ext/openssl/windows/x64/lib/libeay32.lib differ diff --git a/ext/openssl/windows/x64/lib/ssleay32.lib b/ext/openssl/windows/x64/lib/ssleay32.lib index d2c34884..f93da7e0 100644 Binary files a/ext/openssl/windows/x64/lib/ssleay32.lib and b/ext/openssl/windows/x64/lib/ssleay32.lib differ diff --git a/ext/openssl/windows/x86/bin/libeay32.dll b/ext/openssl/windows/x86/bin/libeay32.dll index 2682c76c..7f89690d 100644 Binary files a/ext/openssl/windows/x86/bin/libeay32.dll and b/ext/openssl/windows/x86/bin/libeay32.dll differ diff --git a/ext/openssl/windows/x86/bin/openssl.exe b/ext/openssl/windows/x86/bin/openssl.exe index fbbe4beb..e99c4ec4 100644 Binary files a/ext/openssl/windows/x86/bin/openssl.exe and b/ext/openssl/windows/x86/bin/openssl.exe differ diff --git a/ext/openssl/windows/x86/bin/ssleay32.dll b/ext/openssl/windows/x86/bin/ssleay32.dll index 1a2cff17..5b86b877 100644 Binary files a/ext/openssl/windows/x86/bin/ssleay32.dll and b/ext/openssl/windows/x86/bin/ssleay32.dll differ diff --git a/ext/openssl/windows/x86/include/openssl/conf.h b/ext/openssl/windows/x86/include/openssl/conf.h index 8d926d5d..fe491130 100644 --- a/ext/openssl/windows/x86/include/openssl/conf.h +++ b/ext/openssl/windows/x86/include/openssl/conf.h @@ -259,6 +259,7 @@ void ERR_load_CONF_strings(void); # define CONF_R_NO_VALUE 108 # define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 # define CONF_R_UNKNOWN_MODULE_NAME 113 +# define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116 # define CONF_R_VARIABLE_HAS_NO_VALUE 104 #ifdef __cplusplus diff --git a/ext/openssl/windows/x86/include/openssl/dh.h b/ext/openssl/windows/x86/include/openssl/dh.h index a5bd9016..a228c7a7 100644 --- a/ext/openssl/windows/x86/include/openssl/dh.h +++ b/ext/openssl/windows/x86/include/openssl/dh.h @@ -182,12 +182,29 @@ struct dh_st { */ # define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME -# define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ - (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x)) -# define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \ - (unsigned char *)(x)) -# define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x) -# define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) +# define d2i_DHparams_fp(fp,x) \ + (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ + (char *(*)())d2i_DHparams, \ + (fp), \ + (unsigned char **)(x)) +# define i2d_DHparams_fp(fp,x) \ + ASN1_i2d_fp(i2d_DHparams,(fp), (unsigned char *)(x)) +# define d2i_DHparams_bio(bp,x) \ + ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x) +# define i2d_DHparams_bio(bp,x) \ + ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) + +# define d2i_DHxparams_fp(fp,x) \ + (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ + (char *(*)())d2i_DHxparams, \ + (fp), \ + (unsigned char **)(x)) +# define i2d_DHxparams_fp(fp,x) \ + ASN1_i2d_fp(i2d_DHxparams,(fp), (unsigned char *)(x)) +# define d2i_DHxparams_bio(bp,x) \ + ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x) +# define i2d_DHxparams_bio(bp,x) \ + ASN1_i2d_bio_of_const(DH, i2d_DHxparams, bp, x) DH *DHparams_dup(DH *); diff --git a/ext/openssl/windows/x86/include/openssl/err.h b/ext/openssl/windows/x86/include/openssl/err.h index 585aa8ba..f4236562 100644 --- a/ext/openssl/windows/x86/include/openssl/err.h +++ b/ext/openssl/windows/x86/include/openssl/err.h @@ -258,6 +258,7 @@ typedef struct err_state_st { # define SYS_F_WSASTARTUP 9/* Winsock stuff */ # define SYS_F_OPENDIR 10 # define SYS_F_FREAD 11 +# define SYS_F_FFLUSH 18 /* reasons */ # define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */ diff --git a/ext/openssl/windows/x86/include/openssl/opensslconf.h b/ext/openssl/windows/x86/include/openssl/opensslconf.h index 094034ea..c2648e63 100644 --- a/ext/openssl/windows/x86/include/openssl/opensslconf.h +++ b/ext/openssl/windows/x86/include/openssl/opensslconf.h @@ -118,8 +118,8 @@ extern "C" { #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) -#define ENGINESDIR "C:\\Users\\Synergy\\Desktop\\openssl-w32/lib/engines" -#define OPENSSLDIR "C:\\Users\\Synergy\\Desktop\\openssl-w32/ssl" +#define ENGINESDIR "C:\\OpenSSL/lib/engines" +#define OPENSSLDIR "C:\\OpenSSL/ssl" #endif #endif diff --git a/ext/openssl/windows/x86/include/openssl/opensslv.h b/ext/openssl/windows/x86/include/openssl/opensslv.h index 645dd079..825a330a 100644 --- a/ext/openssl/windows/x86/include/openssl/opensslv.h +++ b/ext/openssl/windows/x86/include/openssl/opensslv.h @@ -30,11 +30,11 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x100020bfL +# define OPENSSL_VERSION_NUMBER 0x100020cfL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k-fips 26 Jan 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2l-fips 25 May 2017" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k 26 Jan 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2l 25 May 2017" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/ext/openssl/windows/x86/lib/engines/4758cca.dll b/ext/openssl/windows/x86/lib/engines/4758cca.dll index 982c7748..1540ccdf 100644 Binary files a/ext/openssl/windows/x86/lib/engines/4758cca.dll and b/ext/openssl/windows/x86/lib/engines/4758cca.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/aep.dll b/ext/openssl/windows/x86/lib/engines/aep.dll index 10742400..85b31c76 100644 Binary files a/ext/openssl/windows/x86/lib/engines/aep.dll and b/ext/openssl/windows/x86/lib/engines/aep.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/atalla.dll b/ext/openssl/windows/x86/lib/engines/atalla.dll index de0a98e6..6511cffc 100644 Binary files a/ext/openssl/windows/x86/lib/engines/atalla.dll and b/ext/openssl/windows/x86/lib/engines/atalla.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/capi.dll b/ext/openssl/windows/x86/lib/engines/capi.dll index b888918e..d60138b1 100644 Binary files a/ext/openssl/windows/x86/lib/engines/capi.dll and b/ext/openssl/windows/x86/lib/engines/capi.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/chil.dll b/ext/openssl/windows/x86/lib/engines/chil.dll index ca3bca1f..5449c966 100644 Binary files a/ext/openssl/windows/x86/lib/engines/chil.dll and b/ext/openssl/windows/x86/lib/engines/chil.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/cswift.dll b/ext/openssl/windows/x86/lib/engines/cswift.dll index 9e90aca4..030e0bd5 100644 Binary files a/ext/openssl/windows/x86/lib/engines/cswift.dll and b/ext/openssl/windows/x86/lib/engines/cswift.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/gmp.dll b/ext/openssl/windows/x86/lib/engines/gmp.dll index df17c13b..9992b7b1 100644 Binary files a/ext/openssl/windows/x86/lib/engines/gmp.dll and b/ext/openssl/windows/x86/lib/engines/gmp.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/gost.dll b/ext/openssl/windows/x86/lib/engines/gost.dll index b91941d8..0e6ffaa6 100644 Binary files a/ext/openssl/windows/x86/lib/engines/gost.dll and b/ext/openssl/windows/x86/lib/engines/gost.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/nuron.dll b/ext/openssl/windows/x86/lib/engines/nuron.dll index e9965344..e63d35be 100644 Binary files a/ext/openssl/windows/x86/lib/engines/nuron.dll and b/ext/openssl/windows/x86/lib/engines/nuron.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/padlock.dll b/ext/openssl/windows/x86/lib/engines/padlock.dll index aa684fe4..54aacd24 100644 Binary files a/ext/openssl/windows/x86/lib/engines/padlock.dll and b/ext/openssl/windows/x86/lib/engines/padlock.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/sureware.dll b/ext/openssl/windows/x86/lib/engines/sureware.dll index 6a0f5204..f55625a2 100644 Binary files a/ext/openssl/windows/x86/lib/engines/sureware.dll and b/ext/openssl/windows/x86/lib/engines/sureware.dll differ diff --git a/ext/openssl/windows/x86/lib/engines/ubsec.dll b/ext/openssl/windows/x86/lib/engines/ubsec.dll index d8f26e83..18e59573 100644 Binary files a/ext/openssl/windows/x86/lib/engines/ubsec.dll and b/ext/openssl/windows/x86/lib/engines/ubsec.dll differ diff --git a/ext/openssl/windows/x86/lib/libeay32.lib b/ext/openssl/windows/x86/lib/libeay32.lib index 63246b1e..adb0edd5 100644 Binary files a/ext/openssl/windows/x86/lib/libeay32.lib and b/ext/openssl/windows/x86/lib/libeay32.lib differ diff --git a/ext/openssl/windows/x86/lib/ssleay32.lib b/ext/openssl/windows/x86/lib/ssleay32.lib index 3e080b60..3128e77c 100644 Binary files a/ext/openssl/windows/x86/lib/ssleay32.lib and b/ext/openssl/windows/x86/lib/ssleay32.lib differ