diff options
| author | nagachika <nagachika@ruby-lang.org> | 2021-12-02 08:03:28 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-12-02 08:03:28 +0900 |
| commit | 5c5974dbd00e1e0a827baed5290517208878355d (patch) | |
| tree | ca8b29e1b3c3e6510dc11ad04dd11d3726a22456 | |
| parent | 8cfddb68702a1320953c520c77b81176e3269ec7 (diff) | |
| download | ruby-5c5974dbd00e1e0a827baed5290517208878355d.tar.gz | |
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(-)
| -rw-r--r-- | test/openssl/test_cipher.rb | 2 | ||||
| -rw-r--r-- | 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 65b36dd180..3652f9ca74 100644 --- a/test/openssl/test_cipher.rb +++ b/test/openssl/test_cipher.rb @@ -214,7 +214,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase 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 @@ -12,11 +12,11 @@ # 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" |