https://git.ruby-lang.org/ruby.git/commit/?id=5c5974dbd0

From 5c5974dbd00e1e0a827baed5290517208878355d Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Thu, 2 Dec 2021 08:03:28 +0900
Subject: merge revision(s) 44d67128a827c65d1a3867c5d8fd190d10aa1dd2:

	test/openssl/test_cipher: skip AES-CCM tests on OpenSSL <= 1.1.1b

	AES CCM mode in OpenSSL <= 1.1.1b was overly strict in the parameters
	assignment order. This has been relaxed by OpenSSL 1.1.1c.

	https://github.com/openssl/openssl/commit/b48e3be947ddc5da6b5a86db8341081c72b9a4ee

	The test case is failing on Ubuntu 18.04 because it still uses the
	initial 1.1.1 release and has the issue:

	http://rubyci.s3.amazonaws.com/graviton2/ruby-master/log/20210316T120003Z.fail.html.gz
	---
	 test/openssl/test_cipher.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
---
 test/openssl/test_cipher.rb | 2 +-
 version.h                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index 65b36dd180a..3652f9ca74b 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -214,7 +214,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase https://github.com/ruby/ruby/blob/trunk/test/openssl/test_cipher.rb#L214
     assert_raise(OpenSSL::Cipher::CipherError) { cipher.update(ct2) }
   end if has_cipher?("aes-128-ccm") &&
          OpenSSL::Cipher.new("aes-128-ccm").authenticated? &&
-         OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10101000  # version >= v1.1.1
+         OpenSSL::OPENSSL_VERSION_NUMBER >= 0x1010103f # version >= 1.1.1c
 
   def test_aes_gcm
     # GCM spec Appendix B Test Case 4
diff --git a/version.h b/version.h
index 5fbe3a257b4..0b3cf9832ab 100644
--- a/version.h
+++ b/version.h
@@ -12,11 +12,11 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 4
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 158
+#define RUBY_PATCHLEVEL 159
 
 #define RUBY_RELEASE_YEAR 2021
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 2
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/