From 7bdbc521002d781ed407991f0ea856facc649f32 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 5 Sep 2024 20:06:37 +0200 Subject: [PATCH] Fix test_provider.rb in FIPS. --- Rakefile | 1 + test/openssl/test_provider.rb | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index b88b5df8e..deb574ef8 100644 --- a/Rakefile +++ b/Rakefile @@ -33,6 +33,7 @@ Rake::TestTask.new(:test_fips_internal) do |t| 'test/openssl/test_pkey_dsa.rb', 'test/openssl/test_pkey_ec.rb', 'test/openssl/test_pkey_rsa.rb', + 'test/openssl/test_provider.rb', ] t.warning = true end diff --git a/test/openssl/test_provider.rb b/test/openssl/test_provider.rb index b0ffae9ce..6f85c00c9 100644 --- a/test/openssl/test_provider.rb +++ b/test/openssl/test_provider.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true require_relative 'utils' -if defined?(OpenSSL) && defined?(OpenSSL::Provider) && !OpenSSL.fips_mode +if defined?(OpenSSL) && defined?(OpenSSL::Provider) class OpenSSL::TestProvider < OpenSSL::TestCase def test_openssl_provider_name_inspect @@ -12,14 +12,22 @@ def test_openssl_provider_name_inspect end def test_openssl_provider_names + # We expect the following providers are loaded in the cases: + # * Non-FIPS: default + # * FIPS: fips, base + # Use the null provider to test the added provider. + # See provider(7) - OPENSSL PROVIDERS to see the list of providers, and + # OSSL_PROVIDER-null(7) to check the details of the null provider. with_openssl <<-'end;' - base_provider = OpenSSL::Provider.load("base") - assert_equal(2, OpenSSL::Provider.provider_names.size) - assert_includes(OpenSSL::Provider.provider_names, "base") + num = OpenSSL::Provider.provider_names.size - assert_equal(true, base_provider.unload) - assert_equal(1, OpenSSL::Provider.provider_names.size) - assert_not_includes(OpenSSL::Provider.provider_names, "base") + added_provider = OpenSSL::Provider.load("null") + assert_equal(num + 1, OpenSSL::Provider.provider_names.size) + assert_includes(OpenSSL::Provider.provider_names, "null") + + assert_equal(true, added_provider.unload) + assert_equal(num, OpenSSL::Provider.provider_names.size) + assert_not_includes(OpenSSL::Provider.provider_names, "null") end; end @@ -33,6 +41,9 @@ def test_unloaded_openssl_provider end def test_openssl_legacy_provider + # The legacy provider is not supported on FIPS. + omit_on_fips + with_openssl(<<-'end;') begin OpenSSL::Provider.load("legacy")