Skip to content

Commit

Permalink
Add patch for Ruby 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
samuel40791765 committed Dec 9, 2024
1 parent 17a0ddf commit 53f4657
Show file tree
Hide file tree
Showing 2 changed files with 663 additions and 3 deletions.
14 changes: 11 additions & 3 deletions tests/ci/integration/ruby_patch/ruby_3_1/aws-lc-ruby-temp.patch
Original file line number Diff line number Diff line change
Expand Up @@ -213,18 +213,26 @@ index 24a215a..8f4eb39 100644
key = ENV.keys.first
assert_not_nil(key) # make sure we have at least one ENV var.
diff --git a/test/openssl/test_fips.rb b/test/openssl/test_fips.rb
index 8cd474f..22ebd4d 100644
index 8cd474f..d811590 100644
--- a/test/openssl/test_fips.rb
+++ b/test/openssl/test_fips.rb
@@ -5,6 +5,8 @@
@@ -5,12 +5,15 @@

class OpenSSL::TestFIPS < OpenSSL::TestCase
def test_fips_mode_is_reentrant
+ return if aws_lc? and OpenSSL.fips_mode # AWS-LC FIPS mode is decided at compile time.
+ return if aws_lc? # AWS-LC's FIPS mode is decided at compile time.
+
OpenSSL.fips_mode = false
OpenSSL.fips_mode = false
end

def test_fips_mode_get
- return unless OpenSSL::OPENSSL_FIPS
+ return unless OpenSSL::OPENSSL_FIPS and !aws_lc? # AWS-LC's FIPS mode is decided at compile time.
+
assert_separately([{ "OSSL_MDEBUG" => nil }, "-ropenssl"], <<~"end;")
require #{__FILE__.dump}

diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
index ec67674..be21f47 100644
--- a/test/openssl/test_pkcs12.rb
Expand Down
Loading

0 comments on commit 53f4657

Please sign in to comment.