diff --git a/ext/openssl/win32/bin/libeay32.dll b/ext/openssl/win32/bin/libeay32.dll index fa30c78c..2682c76c 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 91968b43..fbbe4beb 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 3d510929..1a2cff17 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 39ab7937..d258ef87 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 96a44649..094034ea 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 88faad65..645dd079 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 7bbb0221..982c7748 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 459d60f4..10742400 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 88e297db..de0a98e6 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 fa83944a..b888918e 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 3a08a00b..ca3bca1f 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 2e5f2382..9e90aca4 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 9b8669a3..df17c13b 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 dbd796a4..b91941d8 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 38adbb70..e9965344 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 bc9a00da..aa684fe4 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 4c119fda..6a0f5204 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 bf98666c..d8f26e83 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 bffc8e56..63246b1e 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 9c8802eb..3e080b60 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 0c6862a1..318fa815 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 ed923268..27cf1c14 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 65554139..ff683520 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 39ab7937..d258ef87 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 5baaca88..15abada7 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 88faad65..645dd079 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 ecaccdf5..b3dba819 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 9f155965..b84d1dec 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 2a75074e..db204253 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 64647986..08354e57 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 4ef0044e..ac5fa4b8 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 dba5eb1e..98d766e5 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 c1858860..846001de 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 1aa56f94..45dc1271 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 cdad0f9e..79425656 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 a07d3d8a..ddcfddff 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 9af9f495..edcafe91 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 c68e2b20..b1825673 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 e4a8e3e6..3ddf2c35 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 d404c9b4..d2c34884 100644 Binary files a/ext/openssl/win64/lib/ssleay32.lib and b/ext/openssl/win64/lib/ssleay32.lib differ