Skip to content

Commit d157ba1

Browse files
committed
Remove the pending logics by the pend_on_openssl_issue_21493.
Because we will add a workaround to avoid this issue.
1 parent 74a4198 commit d157ba1

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

test/openssl/test_pkey.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ def test_hmac_sign_verify
8282
end
8383

8484
def test_ed25519
85-
pend_on_openssl_issue_21493
86-
8785
# Test vector from RFC 8032 Section 7.1 TEST 2
8886
priv_pem = <<~EOF
8987
-----BEGIN PRIVATE KEY-----
@@ -148,8 +146,6 @@ def test_ed25519
148146
end
149147

150148
def test_x25519
151-
pend_on_openssl_issue_21493
152-
153149
# Test vector from RFC 7748 Section 6.1
154150
alice_pem = <<~EOF
155151
-----BEGIN PRIVATE KEY-----
@@ -202,8 +198,6 @@ def raw_initialize
202198
end
203199

204200
def test_compare?
205-
pend_on_openssl_issue_21493
206-
207201
key1 = Fixtures.pkey("rsa1024")
208202
key2 = Fixtures.pkey("rsa1024")
209203
key3 = Fixtures.pkey("rsa2048")

test/openssl/utils.rb

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -144,22 +144,6 @@ def libressl?(major = nil, minor = nil, fix = nil)
144144
return false unless version
145145
!major || (version.map(&:to_i) <=> [major, minor, fix]) >= 0
146146
end
147-
148-
# OpenSSL 3: x25519 a decode from and then encode to a pem file corrupts the
149-
# key if fips+base provider is used
150-
# This issue happens in OpenSSL between 3.0,0 and 3.0.10 or between 3.1.0 and
151-
# 3.1.2.
152-
# https://github.com/openssl/openssl/issues/21493
153-
# https://github.com/openssl/openssl/pull/21519
154-
def pend_on_openssl_issue_21493
155-
if OpenSSL.fips_mode &&
156-
(
157-
(openssl?(3, 0, 0, 0) && !openssl?(3, 0, 0, 11)) ||
158-
(openssl?(3, 1, 0, 0) && !openssl?(3, 1, 0, 3))
159-
)
160-
pend('See <https://github.com/openssl/openssl/issues/21493>')
161-
end
162-
end
163147
end
164148

165149
class OpenSSL::TestCase < Test::Unit::TestCase

0 commit comments

Comments
 (0)