diff options
| author | Tim Smith <tsmith@chef.io> | 2020-08-07 21:17:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 21:17:16 -0700 |
| commit | 29029126ddbb9d823552e95215e719d153071bee (patch) | |
| tree | a6687a1c24bb66059048cc6f16a326448c42930c /lib | |
| parent | fe4ef169d73daf68ccfd152530ecd359eaa0ee6b (diff) | |
| parent | ab6180be02712512a3a8309e75424dc56520b936 (diff) | |
| download | ohai-29029126ddbb9d823552e95215e719d153071bee.tar.gz | |
Merge pull request #1489 from chef/fix_fips
Simplify FIPS plugin and use system fips status
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ohai/plugins/fips.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/ohai/plugins/fips.rb b/lib/ohai/plugins/fips.rb index 4c63be88..ae42f4e6 100644 --- a/lib/ohai/plugins/fips.rb +++ b/lib/ohai/plugins/fips.rb @@ -29,10 +29,6 @@ Ohai.plugin(:Fips) do fips Mash.new require "openssl" unless defined?(OpenSSL) - if defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode && !$FIPS_TEST_MODE - fips["kernel"] = { "enabled" => true } - else - fips["kernel"] = { "enabled" => false } - end + fips["kernel"] = { "enabled" => OpenSSL::OPENSSL_FIPS } end end |