@@ -89,21 +89,26 @@ public static void createOpenSSL(final Ruby runtime) {
89
89
90
90
runtime .getLoadService ().require ("jopenssl/version" );
91
91
92
- final byte [] version = { '2' ,'.' ,'2' ,'.' ,'3' };
92
+ final byte [] version = { '2' ,'.' ,'2' ,'.' ,'3' }; // C OpenSSL gem version
93
93
94
94
_OpenSSL .setConstant ("VERSION" , StringHelper .newString (runtime , version ));
95
95
96
96
final RubyModule JOpenSSL = runtime .getModule ("JOpenSSL" );
97
97
final RubyString jVERSION = JOpenSSL .getConstantAt ("VERSION" ).asString ();
98
98
99
99
final byte [] JRuby_OpenSSL_ = { 'J' ,'R' ,'u' ,'b' ,'y' ,'-' ,'O' ,'p' ,'e' ,'n' ,'S' ,'S' ,'L' ,' ' };
100
- final int OPENSSL_VERSION_NUMBER = 999999999 ; // NOTE: smt more useful?
101
-
102
100
ByteList OPENSSL_VERSION = new ByteList ( jVERSION .getByteList ().getRealSize () + JRuby_OpenSSL_ .length );
103
101
OPENSSL_VERSION .setEncoding ( jVERSION .getEncoding () );
104
102
OPENSSL_VERSION .append ( JRuby_OpenSSL_ );
105
103
OPENSSL_VERSION .append ( jVERSION .getByteList () );
106
104
105
+ // < 3.0.0 until we have decent (full) compatibility
106
+ final byte OPENSSL_VERSION_MAJOR = 2 ;
107
+ final byte OPENSSL_VERSION_MINOR = 9 ;
108
+ final byte OPENSSL_VERSION_PATCH = 9 ;
109
+ final byte OPENSSL_VERSION_PRE_RELEASE = 0 ;
110
+ final int OPENSSL_VERSION_NUMBER = OPENSSL_VERSION_MAJOR << 28 | OPENSSL_VERSION_MINOR << 20 | OPENSSL_VERSION_PATCH << 4 | OPENSSL_VERSION_PRE_RELEASE ;
111
+
107
112
final RubyString VERSION ;
108
113
_OpenSSL .setConstant ("OPENSSL_VERSION" , VERSION = runtime .newString (OPENSSL_VERSION ));
109
114
_OpenSSL .setConstant ("OPENSSL_VERSION_NUMBER" , runtime .newFixnum (OPENSSL_VERSION_NUMBER ));
0 commit comments