diff --git a/ext/openssl/windows/x64/bin/libeay32.dll b/ext/openssl/windows/x64/bin/libeay32.dll index 612be0291..96ab836a1 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 3106baa94..5c4b361bf 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 15753bd8e..7798e0811 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/asn1.h b/ext/openssl/windows/x64/include/openssl/asn1.h index 68e791fcd..35a2b2aa0 100644 --- a/ext/openssl/windows/x64/include/openssl/asn1.h +++ b/ext/openssl/windows/x64/include/openssl/asn1.h @@ -1365,6 +1365,7 @@ void ERR_load_ASN1_strings(void); # define ASN1_R_MSTRING_NOT_UNIVERSAL 139 # define ASN1_R_MSTRING_WRONG_TAG 140 # define ASN1_R_NESTED_ASN1_STRING 197 +# define ASN1_R_NESTED_TOO_DEEP 219 # define ASN1_R_NON_HEX_CHARACTERS 141 # define ASN1_R_NOT_ASCII_FORMAT 190 # define ASN1_R_NOT_ENOUGH_DATA 142 diff --git a/ext/openssl/windows/x64/include/openssl/opensslv.h b/ext/openssl/windows/x64/include/openssl/opensslv.h index baee2d086..77f124e2c 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 0x100020efL +# define OPENSSL_VERSION_NUMBER 0x100020ffL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2n-fips 7 Dec 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2o-fips 27 Mar 2018" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2n 7 Dec 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2o 27 Mar 2018" # 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 c96c9b15e..7b678fd94 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 590cd46f1..616204c43 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 011f15381..0aad54cd1 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 fc93f11d9..d76f9d7b4 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 cf32ea047..b9914c77c 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 748f56469..5d6dc83b6 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 89978a480..199bef34f 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 cc0170426..29ab5be7b 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 0c0373168..a0cd8ceb5 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 6b247ea0f..455a98aaa 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 3f5286d69..29b52adee 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 e963490c4..3d8e4a4e3 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 8e907ed2f..9eecfc067 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 9addb2dd1..360420b2f 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 7126451c1..a2669244e 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 dfe113703..926b05d71 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 502f3ade8..7224eca6a 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/asn1.h b/ext/openssl/windows/x86/include/openssl/asn1.h index 68e791fcd..35a2b2aa0 100644 --- a/ext/openssl/windows/x86/include/openssl/asn1.h +++ b/ext/openssl/windows/x86/include/openssl/asn1.h @@ -1365,6 +1365,7 @@ void ERR_load_ASN1_strings(void); # define ASN1_R_MSTRING_NOT_UNIVERSAL 139 # define ASN1_R_MSTRING_WRONG_TAG 140 # define ASN1_R_NESTED_ASN1_STRING 197 +# define ASN1_R_NESTED_TOO_DEEP 219 # define ASN1_R_NON_HEX_CHARACTERS 141 # define ASN1_R_NOT_ASCII_FORMAT 190 # define ASN1_R_NOT_ENOUGH_DATA 142 diff --git a/ext/openssl/windows/x86/include/openssl/opensslv.h b/ext/openssl/windows/x86/include/openssl/opensslv.h index baee2d086..77f124e2c 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 0x100020efL +# define OPENSSL_VERSION_NUMBER 0x100020ffL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2n-fips 7 Dec 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2o-fips 27 Mar 2018" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2n 7 Dec 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2o 27 Mar 2018" # 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 76ef1c2bf..cc4764561 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 3d09d623f..59e0cf374 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 8554da372..307267359 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 e103da608..775612a12 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 ed0f27311..79a37cc65 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 4db2c3b7c..ffa3d39df 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 44dad1746..98ae50619 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 79bca317f..6f9e1c288 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 53060ac2b..9f1acf360 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 f12fe367a..e8612a3ce 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 2d0952375..987bbdff4 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 351f3288c..7872a8323 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 07de9321c..7ffa761ce 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 ae512aa77..18bab9fb8 100644 Binary files a/ext/openssl/windows/x86/lib/ssleay32.lib and b/ext/openssl/windows/x86/lib/ssleay32.lib differ