summaryrefslogtreecommitdiff
path: root/chef-config
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2016-01-22 08:15:24 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2016-01-25 09:53:44 -0800
commit74f32edd28ab18508440061e2b16020f03812589 (patch)
treea76c1f68bb7644824812dcb2872e5e7c78c83961 /chef-config
parent64c2dd07e01fae18aac742dd01dee5c8c996954f (diff)
downloadchef-74f32edd28ab18508440061e2b16020f03812589.tar.gz
Rename openssl-fips to fips and add messages
Diffstat (limited to 'chef-config')
-rw-r--r--chef-config/lib/chef-config/config.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index 7bf5d05572..f352d754c6 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -452,12 +452,12 @@ module ChefConfig
default :recipe_url, nil
# Set to true if Chef is to set OpenSSL to run in FIPS mode
- default :openssl_fips, false
+ default :fips, false
# Initialize openssl
def self.init_openssl
- if openssl_fips
- ChefConfig.logger.warn "The `openssl_fips` is still a work in progress. This feature is incomplete."
+ if fips
+ ChefConfig.logger.warn "The `fips` feature is still a work in progress. This feature is incomplete."
OpenSSL.fips_mode = true
require 'digest'
require 'digest/sha1'
@@ -471,7 +471,7 @@ module ChefConfig
# the 'mixlib-authorization' project for more detail). Currently, versions
# 1.0, 1.1, and 1.3 are available.
default :authentication_protocol_version do
- if openssl_fips
+ if fips
"1.3"
else
"1.1"