Skip to content

Commit 49bc338

Browse files
committed
let's report OpenSSL VERSION as 2.2.1
1 parent b662bf5 commit 49bc338

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

src/main/java/org/jruby/ext/openssl/OpenSSL.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static void createOpenSSL(final Ruby runtime) {
8888

8989
runtime.getLoadService().require("jopenssl/version");
9090

91-
final byte[] version = { '2','.','2','.','0' };
91+
final byte[] version = { '2','.','2','.','1' };
9292

9393
_OpenSSL.setConstant("VERSION", StringHelper.newString(runtime, version));
9494

src/test/ruby/test_openssl.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,18 @@ def test_gem_version
1313
end if ENV['BC_VERSION']
1414

1515
def test_version
16-
assert_equal '2.2.0', OpenSSL::VERSION
16+
assert_equal '2.2.1', OpenSSL::VERSION
1717

1818
assert OpenSSL::OPENSSL_VERSION.index('OpenSSL')
1919
if defined? JRUBY_VERSION
2020
assert_equal 0, OpenSSL::OPENSSL_VERSION.index('JRuby-OpenSSL ')
2121
end
2222
assert OpenSSL::OPENSSL_VERSION_NUMBER
2323

24-
if RUBY_VERSION > '2.0'
25-
# MRI 2.3 openssl/utils.rb does this (and we shall pass) :
26-
assert defined?(OpenSSL::OPENSSL_LIBRARY_VERSION)
27-
assert /\AOpenSSL +0\./ !~ OpenSSL::OPENSSL_LIBRARY_VERSION
28-
#puts "OpenSSL::OPENSSL_LIBRARY_VERSION = #{OpenSSL::OPENSSL_LIBRARY_VERSION.inspect}"
29-
end
24+
# MRI 2.3 openssl/utils.rb does this (and we shall pass) :
25+
assert defined?(OpenSSL::OPENSSL_LIBRARY_VERSION)
26+
assert /\AOpenSSL +0\./ !~ OpenSSL::OPENSSL_LIBRARY_VERSION
27+
#puts "OpenSSL::OPENSSL_LIBRARY_VERSION = #{OpenSSL::OPENSSL_LIBRARY_VERSION.inspect}"
3028
end
3129

3230
def test_debug

0 commit comments

Comments
 (0)