1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/openssl] Remove the pending logics by the pend_on_openssl_issue_21493.

Browse Source 
Because we will add a workaround to avoid this issue.

https://github.com/ruby/openssl/commit/d157ba1d3b
This commit is contained in:
Jun Aruga 2023-08-22 20:31:16 +02:00 committed by Hiroshi SHIBATA
parent 80f35d96ae
commit 69d9fda9f5
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/openssl/test_pkey.rb
View File

@ -82,8 +82,6 @@ class OpenSSL::TestPKey < OpenSSL::PKeyTestCase
end
def test_ed25519
pend_on_openssl_issue_21493
# Test vector from RFC 8032 Section 7.1 TEST 2
priv_pem = <<~EOF
-----BEGIN PRIVATE KEY-----
@ -148,8 +146,6 @@ class OpenSSL::TestPKey < OpenSSL::PKeyTestCase
end
def test_x25519
pend_on_openssl_issue_21493
# Test vector from RFC 7748 Section 6.1
alice_pem = <<~EOF
-----BEGIN PRIVATE KEY-----
@ -202,8 +198,6 @@ class OpenSSL::TestPKey < OpenSSL::PKeyTestCase
end
def test_compare?
pend_on_openssl_issue_21493
key1 = Fixtures.pkey("rsa1024")
key2 = Fixtures.pkey("rsa1024")
key3 = Fixtures.pkey("rsa2048")

16
test/openssl/utils.rb
View File

@ -144,22 +144,6 @@ module OpenSSL::TestUtils
return false unless version
!major || (version.map(&:to_i) <=> [major, minor, fix]) >= 0
end
# OpenSSL 3: x25519 a decode from and then encode to a pem file corrupts the
# key if fips+base provider is used
# This issue happens in OpenSSL between 3.0,0 and 3.0.10 or between 3.1.0 and
# 3.1.2.
# https://github.com/openssl/openssl/issues/21493
# https://github.com/openssl/openssl/pull/21519
def pend_on_openssl_issue_21493
if OpenSSL.fips_mode &&
(
(openssl?(3, 0, 0, 0) && !openssl?(3, 0, 0, 11)) ||
(openssl?(3, 1, 0, 0) && !openssl?(3, 1, 0, 3))
)
pend('See <https://github.com/openssl/openssl/issues/21493>')
end
end
end
class OpenSSL::TestCase < Test::Unit::TestCase