From 8f62b4a0736b9598601ca471124cb12e4c1805a0 Mon Sep 17 00:00:00 2001 From: kares Date: Mon, 22 Apr 2024 08:38:58 +0200 Subject: [PATCH] [chore] update OpenSSL version to latest 2.x released --- src/main/java/org/jruby/ext/openssl/OpenSSL.java | 2 +- src/test/ruby/test_openssl.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jruby/ext/openssl/OpenSSL.java b/src/main/java/org/jruby/ext/openssl/OpenSSL.java index 5ce1b3e1..4247d943 100644 --- a/src/main/java/org/jruby/ext/openssl/OpenSSL.java +++ b/src/main/java/org/jruby/ext/openssl/OpenSSL.java @@ -89,7 +89,7 @@ public static void createOpenSSL(final Ruby runtime) { runtime.getLoadService().require("jopenssl/version"); - final byte[] version = { '2','.','2','.','1' }; + final byte[] version = { '2','.','2','.','3' }; _OpenSSL.setConstant("VERSION", StringHelper.newString(runtime, version)); diff --git a/src/test/ruby/test_openssl.rb b/src/test/ruby/test_openssl.rb index 8999499f..9b4cf8a2 100644 --- a/src/test/ruby/test_openssl.rb +++ b/src/test/ruby/test_openssl.rb @@ -13,7 +13,8 @@ def test_gem_version end if ENV['BC_VERSION'] def test_version - assert_equal '2.2.1', OpenSSL::VERSION + assert_equal String, OpenSSL::VERSION.class + assert /\d\.\d\.\d/ =~ OpenSSL::VERSION, OpenSSL::VERSION assert OpenSSL::OPENSSL_VERSION.index('OpenSSL') if defined? JRUBY_VERSION @@ -24,7 +25,6 @@ def test_version # MRI 2.3 openssl/utils.rb does this (and we shall pass) : assert defined?(OpenSSL::OPENSSL_LIBRARY_VERSION) assert /\AOpenSSL +0\./ !~ OpenSSL::OPENSSL_LIBRARY_VERSION - #puts "OpenSSL::OPENSSL_LIBRARY_VERSION = #{OpenSSL::OPENSSL_LIBRARY_VERSION.inspect}" end def test_debug