Merge pull request #9108 from joshcooper/log_openssl_version

(PUP-11930) log openssl version
puppetlabs · Sep 27, 2023 · 0554b5d · 0554b5d
2 parents 8004d4c + 95ec780
commit 0554b5d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/puppet/application.rb b/lib/puppet/application.rb
@@ -503,8 +503,12 @@ def log_runtime_environment(extra_info=nil)
     runtime_info = {
       'puppet_version' => Puppet.version,
       'ruby_version'   => RUBY_VERSION,
-      'run_mode'       => self.class.run_mode.name,
+      'run_mode'       => self.class.run_mode.name
     }
+    unless Puppet::Util::Platform.jruby_fips?
+      runtime_info['openssl_version'] = "'#{OpenSSL::OPENSSL_VERSION}'"
+      runtime_info['openssl_fips'] = OpenSSL::OPENSSL_FIPS
+    end
     runtime_info['default_encoding'] = Encoding.default_external
     runtime_info.merge!(extra_info) unless extra_info.nil?