@@ -67,13 +67,14 @@ public static void createOpenSSL(final Ruby runtime) {
67
67
final String warn = SafePropertyAccessor .getProperty ("jruby.openssl.warn" );
68
68
if ( warn != null ) OpenSSL .warn = Boolean .parseBoolean (warn );
69
69
70
+ Config .createConfig (runtime , _OpenSSL );
71
+ ExtConfig .create (runtime , _OpenSSL );
70
72
PKey .createPKey (runtime , _OpenSSL );
71
73
BN .createBN (runtime , _OpenSSL );
72
74
Digest .createDigest (runtime , _OpenSSL );
73
75
Cipher .createCipher (runtime , _OpenSSL );
74
76
Random .createRandom (runtime , _OpenSSL );
75
77
HMAC .createHMAC (runtime , _OpenSSL );
76
- Config .createConfig (runtime , _OpenSSL );
77
78
ASN1 .createASN1 (runtime , _OpenSSL );
78
79
X509 .createX509 (runtime , _OpenSSL );
79
80
NetscapeSPKI .createNetscapeSPKI (runtime , _OpenSSL );
@@ -96,8 +97,6 @@ public static void createOpenSSL(final Ruby runtime) {
96
97
// OpenSSL::FIPS: false
97
98
98
99
final byte [] version = { '1' ,'.' ,'1' ,'.' ,'0' };
99
- final boolean ruby18 = runtime .getInstanceConfig ().getCompatVersion () == CompatVersion .RUBY1_8 ;
100
- if ( ruby18 ) version [2 ] = '0' ; // 1.0.0 compatible on 1.8
101
100
102
101
_OpenSSL .setConstant ("VERSION" , StringHelper .newString (runtime , version ));
103
102
@@ -115,11 +114,9 @@ public static void createOpenSSL(final Ruby runtime) {
115
114
final RubyString VERSION ;
116
115
_OpenSSL .setConstant ("OPENSSL_VERSION" , VERSION = runtime .newString (OPENSSL_VERSION ));
117
116
_OpenSSL .setConstant ("OPENSSL_VERSION_NUMBER" , runtime .newFixnum (OPENSSL_VERSION_NUMBER ));
118
- if ( ! ruby18 ) {
119
- // MRI 2.3 tests do: /\AOpenSSL +0\./ !~ OpenSSL::OPENSSL_LIBRARY_VERSION
120
- _OpenSSL .setConstant ("OPENSSL_LIBRARY_VERSION" , VERSION );
121
- _OpenSSL .setConstant ("OPENSSL_FIPS" , runtime .getFalse ());
122
- }
117
+ // MRI 2.3 tests do: /\AOpenSSL +0\./ !~ OpenSSL::OPENSSL_LIBRARY_VERSION
118
+ _OpenSSL .setConstant ("OPENSSL_LIBRARY_VERSION" , VERSION );
119
+ _OpenSSL .setConstant ("OPENSSL_FIPS" , runtime .getFalse ());
123
120
}
124
121
125
122
static RubyClass _OpenSSLError (final Ruby runtime ) {
0 commit comments