summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-09-14 15:44:46 -0700
committerKartik Null Cating-Subramanian <ksubramanian@chef.io>2015-12-17 17:42:21 -0500
commitec0297d741a08116b10ec425a83248acdb7cb102 (patch)
tree2940af1a6dcc8b3b7b12981bf37a9870709b57fa
parent994122529ad650f67daaebe50b6a47688665f96f (diff)
downloadchef-ec0297d741a08116b10ec425a83248acdb7cb102.tar.gz
Try out ruby fips stuff on windows
-rw-r--r--config/projects/chef-fips.rb7
-rw-r--r--config/software/openssl-customization.rb1
2 files changed, 8 insertions, 0 deletions
diff --git a/config/projects/chef-fips.rb b/config/projects/chef-fips.rb
index 6461a79ae5..24b2169ecb 100644
--- a/config/projects/chef-fips.rb
+++ b/config/projects/chef-fips.rb
@@ -34,6 +34,13 @@ else
install_dir "#{default_root}/#{name}"
end
+# Global FIPS override flag.
+override :fips, enabled: true
+override :'ruby-windows', version: "2.0.0-p647"
+
+override :chef, version: "jdm/1.3-fips"
+override :ohai, version: "master"
+
msi_upgrade_code = "819F5DB3-B818-4358-BB2B-54B8171D0A26"
project_location_dir = "chef-fips"
diff --git a/config/software/openssl-customization.rb b/config/software/openssl-customization.rb
index bda1bcc38c..f0ef483886 100644
--- a/config/software/openssl-customization.rb
+++ b/config/software/openssl-customization.rb
@@ -65,6 +65,7 @@ build do
f.rewind
f.write("\nrequire 'ssl_env_hack'\n")
f.write(unpatched_openssl_rb)
+ f.write("\nOpenSSL.fips_mode = true\n")
end
end
end