diff --git a/ext/openssl/windows/x64/bin/libeay32.dll b/ext/openssl/windows/x64/bin/libeay32.dll index 612be029..96ab836a 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 3106baa9..5c4b361b 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 15753bd8..7798e081 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 68e791fc..35a2b2aa 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 baee2d08..77f124e2 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 c96c9b15..7b678fd9 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 590cd46f..616204c4 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 011f1538..0aad54cd 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 fc93f11d..d76f9d7b 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 cf32ea04..b9914c77 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 748f5646..5d6dc83b 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 89978a48..199bef34 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 cc017042..29ab5be7 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 0c037316..a0cd8ceb 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 6b247ea0..455a98aa 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 3f5286d6..29b52ade 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 e963490c..3d8e4a4e 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 8e907ed2..9eecfc06 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 9addb2dd..360420b2 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 7126451c..a2669244 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 dfe11370..926b05d7 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 502f3ade..7224eca6 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 68e791fc..35a2b2aa 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 baee2d08..77f124e2 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 76ef1c2b..cc476456 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 3d09d623..59e0cf37 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 8554da37..30726735 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 e103da60..775612a1 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 ed0f2731..79a37cc6 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 4db2c3b7..ffa3d39d 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 44dad174..98ae5061 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 79bca317..6f9e1c28 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 53060ac2..9f1acf36 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 f12fe367..e8612a3c 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 2d095237..987bbdff 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 351f3288..7872a832 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 07de9321..7ffa761c 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 ae512aa7..18bab9fb 100644 Binary files a/ext/openssl/windows/x86/lib/ssleay32.lib and b/ext/openssl/windows/x86/lib/ssleay32.lib differ