@@ -89,21 +89,26 @@ public static void createOpenSSL(final Ruby runtime) {
8989
9090 runtime .getLoadService ().require ("jopenssl/version" );
9191
92- final byte [] version = { '2' ,'.' ,'2' ,'.' ,'3' };
92+ final byte [] version = { '2' ,'.' ,'2' ,'.' ,'3' }; // C OpenSSL gem version
9393
9494 _OpenSSL .setConstant ("VERSION" , StringHelper .newString (runtime , version ));
9595
9696 final RubyModule JOpenSSL = runtime .getModule ("JOpenSSL" );
9797 final RubyString jVERSION = JOpenSSL .getConstantAt ("VERSION" ).asString ();
9898
9999 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-
102100 ByteList OPENSSL_VERSION = new ByteList ( jVERSION .getByteList ().getRealSize () + JRuby_OpenSSL_ .length );
103101 OPENSSL_VERSION .setEncoding ( jVERSION .getEncoding () );
104102 OPENSSL_VERSION .append ( JRuby_OpenSSL_ );
105103 OPENSSL_VERSION .append ( jVERSION .getByteList () );
106104
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+
107112 final RubyString VERSION ;
108113 _OpenSSL .setConstant ("OPENSSL_VERSION" , VERSION = runtime .newString (OPENSSL_VERSION ));
109114 _OpenSSL .setConstant ("OPENSSL_VERSION_NUMBER" , runtime .newFixnum (OPENSSL_VERSION_NUMBER ));
0 commit comments