diff --git a/ext/openssl/win32/bin/libeay32.dll b/ext/openssl/win32/bin/libeay32.dll index fa30c78c3..2682c76cd 100644 Binary files a/ext/openssl/win32/bin/libeay32.dll and b/ext/openssl/win32/bin/libeay32.dll differ diff --git a/ext/openssl/win32/bin/openssl.exe b/ext/openssl/win32/bin/openssl.exe index 91968b43d..fbbe4beb7 100644 Binary files a/ext/openssl/win32/bin/openssl.exe and b/ext/openssl/win32/bin/openssl.exe differ diff --git a/ext/openssl/win32/bin/ssleay32.dll b/ext/openssl/win32/bin/ssleay32.dll index 3d5109293..1a2cff17d 100644 Binary files a/ext/openssl/win32/bin/ssleay32.dll and b/ext/openssl/win32/bin/ssleay32.dll differ diff --git a/ext/openssl/win32/include/openssl/evp.h b/ext/openssl/win32/include/openssl/evp.h index 39ab7937d..d258ef870 100644 --- a/ext/openssl/win32/include/openssl/evp.h +++ b/ext/openssl/win32/include/openssl/evp.h @@ -1370,6 +1370,7 @@ void EVP_add_alg_module(void); * The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. */ + void ERR_load_EVP_strings(void); /* Error codes for the EVP functions. */ @@ -1489,6 +1490,7 @@ void ERR_load_EVP_strings(void); # define EVP_R_INPUT_NOT_INITIALIZED 111 # define EVP_R_INVALID_DIGEST 152 # define EVP_R_INVALID_FIPS_MODE 168 +# define EVP_R_INVALID_KEY 171 # define EVP_R_INVALID_KEY_LENGTH 130 # define EVP_R_INVALID_OPERATION 148 # define EVP_R_IV_TOO_LARGE 102 @@ -1528,7 +1530,7 @@ void ERR_load_EVP_strings(void); # define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109 # define EVP_R_WRONG_PUBLIC_KEY_TYPE 110 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif #endif diff --git a/ext/openssl/win32/include/openssl/opensslconf.h b/ext/openssl/win32/include/openssl/opensslconf.h index 96a44649a..094034ea7 100644 --- a/ext/openssl/win32/include/openssl/opensslconf.h +++ b/ext/openssl/win32/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\\Andrew\\Desktop\\openssl-win32/lib/engines" -#define OPENSSLDIR "C:\\Users\\Andrew\\Desktop\\openssl-win32/ssl" +#define ENGINESDIR "C:\\Users\\Synergy\\Desktop\\openssl-w32/lib/engines" +#define OPENSSLDIR "C:\\Users\\Synergy\\Desktop\\openssl-w32/ssl" #endif #endif diff --git a/ext/openssl/win32/include/openssl/opensslv.h b/ext/openssl/win32/include/openssl/opensslv.h index 88faad652..645dd0793 100644 --- a/ext/openssl/win32/include/openssl/opensslv.h +++ b/ext/openssl/win32/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 0x100020afL +# define OPENSSL_VERSION_NUMBER 0x100020bfL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j-fips 26 Sep 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k-fips 26 Jan 2017" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j 26 Sep 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k 26 Jan 2017" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/ext/openssl/win32/lib/engines/4758cca.dll b/ext/openssl/win32/lib/engines/4758cca.dll index 7bbb02215..982c77482 100644 Binary files a/ext/openssl/win32/lib/engines/4758cca.dll and b/ext/openssl/win32/lib/engines/4758cca.dll differ diff --git a/ext/openssl/win32/lib/engines/aep.dll b/ext/openssl/win32/lib/engines/aep.dll index 459d60f4b..107424002 100644 Binary files a/ext/openssl/win32/lib/engines/aep.dll and b/ext/openssl/win32/lib/engines/aep.dll differ diff --git a/ext/openssl/win32/lib/engines/atalla.dll b/ext/openssl/win32/lib/engines/atalla.dll index 88e297db5..de0a98e6f 100644 Binary files a/ext/openssl/win32/lib/engines/atalla.dll and b/ext/openssl/win32/lib/engines/atalla.dll differ diff --git a/ext/openssl/win32/lib/engines/capi.dll b/ext/openssl/win32/lib/engines/capi.dll index fa83944ab..b888918ec 100644 Binary files a/ext/openssl/win32/lib/engines/capi.dll and b/ext/openssl/win32/lib/engines/capi.dll differ diff --git a/ext/openssl/win32/lib/engines/chil.dll b/ext/openssl/win32/lib/engines/chil.dll index 3a08a00b4..ca3bca1fe 100644 Binary files a/ext/openssl/win32/lib/engines/chil.dll and b/ext/openssl/win32/lib/engines/chil.dll differ diff --git a/ext/openssl/win32/lib/engines/cswift.dll b/ext/openssl/win32/lib/engines/cswift.dll index 2e5f23821..9e90aca44 100644 Binary files a/ext/openssl/win32/lib/engines/cswift.dll and b/ext/openssl/win32/lib/engines/cswift.dll differ diff --git a/ext/openssl/win32/lib/engines/gmp.dll b/ext/openssl/win32/lib/engines/gmp.dll index 9b8669a3d..df17c13b9 100644 Binary files a/ext/openssl/win32/lib/engines/gmp.dll and b/ext/openssl/win32/lib/engines/gmp.dll differ diff --git a/ext/openssl/win32/lib/engines/gost.dll b/ext/openssl/win32/lib/engines/gost.dll index dbd796a4e..b91941d8f 100644 Binary files a/ext/openssl/win32/lib/engines/gost.dll and b/ext/openssl/win32/lib/engines/gost.dll differ diff --git a/ext/openssl/win32/lib/engines/nuron.dll b/ext/openssl/win32/lib/engines/nuron.dll index 38adbb70f..e9965344e 100644 Binary files a/ext/openssl/win32/lib/engines/nuron.dll and b/ext/openssl/win32/lib/engines/nuron.dll differ diff --git a/ext/openssl/win32/lib/engines/padlock.dll b/ext/openssl/win32/lib/engines/padlock.dll index bc9a00daa..aa684fe44 100644 Binary files a/ext/openssl/win32/lib/engines/padlock.dll and b/ext/openssl/win32/lib/engines/padlock.dll differ diff --git a/ext/openssl/win32/lib/engines/sureware.dll b/ext/openssl/win32/lib/engines/sureware.dll index 4c119fda3..6a0f52048 100644 Binary files a/ext/openssl/win32/lib/engines/sureware.dll and b/ext/openssl/win32/lib/engines/sureware.dll differ diff --git a/ext/openssl/win32/lib/engines/ubsec.dll b/ext/openssl/win32/lib/engines/ubsec.dll index bf98666c5..d8f26e839 100644 Binary files a/ext/openssl/win32/lib/engines/ubsec.dll and b/ext/openssl/win32/lib/engines/ubsec.dll differ diff --git a/ext/openssl/win32/lib/libeay32.lib b/ext/openssl/win32/lib/libeay32.lib index bffc8e56c..63246b1ea 100644 Binary files a/ext/openssl/win32/lib/libeay32.lib and b/ext/openssl/win32/lib/libeay32.lib differ diff --git a/ext/openssl/win32/lib/ssleay32.lib b/ext/openssl/win32/lib/ssleay32.lib index 9c8802eba..3e080b604 100644 Binary files a/ext/openssl/win32/lib/ssleay32.lib and b/ext/openssl/win32/lib/ssleay32.lib differ diff --git a/ext/openssl/win64/bin/libeay32.dll b/ext/openssl/win64/bin/libeay32.dll index 0c6862a1f..318fa815b 100644 Binary files a/ext/openssl/win64/bin/libeay32.dll and b/ext/openssl/win64/bin/libeay32.dll differ diff --git a/ext/openssl/win64/bin/openssl.exe b/ext/openssl/win64/bin/openssl.exe index ed923268c..27cf1c14d 100644 Binary files a/ext/openssl/win64/bin/openssl.exe and b/ext/openssl/win64/bin/openssl.exe differ diff --git a/ext/openssl/win64/bin/ssleay32.dll b/ext/openssl/win64/bin/ssleay32.dll index 655541398..ff6835200 100644 Binary files a/ext/openssl/win64/bin/ssleay32.dll and b/ext/openssl/win64/bin/ssleay32.dll differ diff --git a/ext/openssl/win64/include/openssl/evp.h b/ext/openssl/win64/include/openssl/evp.h index 39ab7937d..d258ef870 100644 --- a/ext/openssl/win64/include/openssl/evp.h +++ b/ext/openssl/win64/include/openssl/evp.h @@ -1370,6 +1370,7 @@ void EVP_add_alg_module(void); * The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. */ + void ERR_load_EVP_strings(void); /* Error codes for the EVP functions. */ @@ -1489,6 +1490,7 @@ void ERR_load_EVP_strings(void); # define EVP_R_INPUT_NOT_INITIALIZED 111 # define EVP_R_INVALID_DIGEST 152 # define EVP_R_INVALID_FIPS_MODE 168 +# define EVP_R_INVALID_KEY 171 # define EVP_R_INVALID_KEY_LENGTH 130 # define EVP_R_INVALID_OPERATION 148 # define EVP_R_IV_TOO_LARGE 102 @@ -1528,7 +1530,7 @@ void ERR_load_EVP_strings(void); # define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109 # define EVP_R_WRONG_PUBLIC_KEY_TYPE 110 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif #endif diff --git a/ext/openssl/win64/include/openssl/opensslconf.h b/ext/openssl/win64/include/openssl/opensslconf.h index 5baaca886..15abada73 100644 --- a/ext/openssl/win64/include/openssl/opensslconf.h +++ b/ext/openssl/win64/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\\Andrew\\Desktop\\openssl-win64/lib/engines" -#define OPENSSLDIR "C:\\Users\\Andrew\\Desktop\\openssl-win64/ssl" +#define ENGINESDIR "C:\\Users\\Synergy\\Desktop\\openssl-w64/lib/engines" +#define OPENSSLDIR "C:\\Users\\Synergy\\Desktop\\openssl-w64/ssl" #endif #endif diff --git a/ext/openssl/win64/include/openssl/opensslv.h b/ext/openssl/win64/include/openssl/opensslv.h index 88faad652..645dd0793 100644 --- a/ext/openssl/win64/include/openssl/opensslv.h +++ b/ext/openssl/win64/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 0x100020afL +# define OPENSSL_VERSION_NUMBER 0x100020bfL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j-fips 26 Sep 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k-fips 26 Jan 2017" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2j 26 Sep 2016" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k 26 Jan 2017" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT diff --git a/ext/openssl/win64/lib/engines/4758cca.dll b/ext/openssl/win64/lib/engines/4758cca.dll index ecaccdf53..b3dba8198 100644 Binary files a/ext/openssl/win64/lib/engines/4758cca.dll and b/ext/openssl/win64/lib/engines/4758cca.dll differ diff --git a/ext/openssl/win64/lib/engines/aep.dll b/ext/openssl/win64/lib/engines/aep.dll index 9f155965a..b84d1dec3 100644 Binary files a/ext/openssl/win64/lib/engines/aep.dll and b/ext/openssl/win64/lib/engines/aep.dll differ diff --git a/ext/openssl/win64/lib/engines/atalla.dll b/ext/openssl/win64/lib/engines/atalla.dll index 2a75074e2..db2042531 100644 Binary files a/ext/openssl/win64/lib/engines/atalla.dll and b/ext/openssl/win64/lib/engines/atalla.dll differ diff --git a/ext/openssl/win64/lib/engines/capi.dll b/ext/openssl/win64/lib/engines/capi.dll index 646479861..08354e57b 100644 Binary files a/ext/openssl/win64/lib/engines/capi.dll and b/ext/openssl/win64/lib/engines/capi.dll differ diff --git a/ext/openssl/win64/lib/engines/chil.dll b/ext/openssl/win64/lib/engines/chil.dll index 4ef0044eb..ac5fa4b80 100644 Binary files a/ext/openssl/win64/lib/engines/chil.dll and b/ext/openssl/win64/lib/engines/chil.dll differ diff --git a/ext/openssl/win64/lib/engines/cswift.dll b/ext/openssl/win64/lib/engines/cswift.dll index dba5eb1e8..98d766e52 100644 Binary files a/ext/openssl/win64/lib/engines/cswift.dll and b/ext/openssl/win64/lib/engines/cswift.dll differ diff --git a/ext/openssl/win64/lib/engines/gmp.dll b/ext/openssl/win64/lib/engines/gmp.dll index c18588604..846001de7 100644 Binary files a/ext/openssl/win64/lib/engines/gmp.dll and b/ext/openssl/win64/lib/engines/gmp.dll differ diff --git a/ext/openssl/win64/lib/engines/gost.dll b/ext/openssl/win64/lib/engines/gost.dll index 1aa56f945..45dc12710 100644 Binary files a/ext/openssl/win64/lib/engines/gost.dll and b/ext/openssl/win64/lib/engines/gost.dll differ diff --git a/ext/openssl/win64/lib/engines/nuron.dll b/ext/openssl/win64/lib/engines/nuron.dll index cdad0f9ed..794256561 100644 Binary files a/ext/openssl/win64/lib/engines/nuron.dll and b/ext/openssl/win64/lib/engines/nuron.dll differ diff --git a/ext/openssl/win64/lib/engines/padlock.dll b/ext/openssl/win64/lib/engines/padlock.dll index a07d3d8a6..ddcfddffd 100644 Binary files a/ext/openssl/win64/lib/engines/padlock.dll and b/ext/openssl/win64/lib/engines/padlock.dll differ diff --git a/ext/openssl/win64/lib/engines/sureware.dll b/ext/openssl/win64/lib/engines/sureware.dll index 9af9f495f..edcafe91a 100644 Binary files a/ext/openssl/win64/lib/engines/sureware.dll and b/ext/openssl/win64/lib/engines/sureware.dll differ diff --git a/ext/openssl/win64/lib/engines/ubsec.dll b/ext/openssl/win64/lib/engines/ubsec.dll index c68e2b20e..b18256734 100644 Binary files a/ext/openssl/win64/lib/engines/ubsec.dll and b/ext/openssl/win64/lib/engines/ubsec.dll differ diff --git a/ext/openssl/win64/lib/libeay32.lib b/ext/openssl/win64/lib/libeay32.lib index e4a8e3e60..3ddf2c355 100644 Binary files a/ext/openssl/win64/lib/libeay32.lib and b/ext/openssl/win64/lib/libeay32.lib differ diff --git a/ext/openssl/win64/lib/ssleay32.lib b/ext/openssl/win64/lib/ssleay32.lib index d404c9b42..d2c34884e 100644 Binary files a/ext/openssl/win64/lib/ssleay32.lib and b/ext/openssl/win64/lib/ssleay32.lib differ