diff options
| author | Tim Smith <tsmith@chef.io> | 2018-05-15 09:59:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-15 09:59:44 -0700 |
| commit | 39f50093934fd7daab17843e66820c1c56878640 (patch) | |
| tree | d33c79aeb59ffe430596f55334efb1019f3db444 | |
| parent | 6a7aed483f3b4b2eb0e1efcbf9d2417fced8cf84 (diff) | |
| parent | f0a75a8c29ed15a0f5916defedff8d9f464f4066 (diff) | |
| download | ohai-39f50093934fd7daab17843e66820c1c56878640.tar.gz | |
Merge pull request #1186 from coderanger/fips-oops-2
Rework FIPS detection to only use the positive of OpenSSL.fips_mode
| -rw-r--r-- | lib/ohai/plugins/linux/fips.rb | 4 | ||||
| -rw-r--r-- | lib/ohai/plugins/windows/fips.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/ohai/plugins/linux/fips.rb b/lib/ohai/plugins/linux/fips.rb index 410cc9af..17c183e2 100644 --- a/lib/ohai/plugins/linux/fips.rb +++ b/lib/ohai/plugins/linux/fips.rb @@ -31,8 +31,8 @@ Ohai.plugin(:Fips) do # Check for new fips_mode method added in Ruby 2.5. After we drop support # for Ruby 2.4, clean up everything after this and collapse the FIPS plugins. require "openssl" - if defined?(OpenSSL.fips_mode) && !$FIPS_TEST_MODE - fips["kernel"] = { "enabled" => OpenSSL.fips_mode } + if defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode && !$FIPS_TEST_MODE + fips["kernel"] = { "enabled" => true } else begin enabled = File.read("/proc/sys/crypto/fips_enabled").chomp diff --git a/lib/ohai/plugins/windows/fips.rb b/lib/ohai/plugins/windows/fips.rb index 361a9ed0..56e5cdc7 100644 --- a/lib/ohai/plugins/windows/fips.rb +++ b/lib/ohai/plugins/windows/fips.rb @@ -31,8 +31,8 @@ Ohai.plugin(:Fips) do # Check for new fips_mode method added in Ruby 2.5. After we drop support # for Ruby 2.4, clean up everything after this and collapse the FIPS plugins. require "openssl" - if defined?(OpenSSL.fips_mode) && !$FIPS_TEST_MODE - fips["kernel"] = { "enabled" => OpenSSL.fips_mode } + if defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode && !$FIPS_TEST_MODE + fips["kernel"] = { "enabled" => true } else require "win32/registry" # from http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx |