diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2020-05-07 09:25:16 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2020-05-07 10:03:50 -0400 |
| commit | 83fbfb9d92c6bbd5391d15648f1c95f3c80c01d2 (patch) | |
| tree | fa09c79bb4da8e95335c5e38f70f503c1d3a3748 | |
| parent | 5258d04855d2442b8be1b68588a7d85e34cd922a (diff) | |
| download | chef-83fbfb9d92c6bbd5391d15648f1c95f3c80c01d2.tar.gz | |
Use OpenSSL 1.1.1g and disable FIPS
Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| -rw-r--r-- | omnibus/omnibus.rb | 5 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb index e839174138..72bfcafbb8 100644 --- a/omnibus/omnibus.rb +++ b/omnibus/omnibus.rb @@ -55,4 +55,7 @@ fetcher_read_timeout 120 # local_software_dirs ['/path/to/local/software'] fatal_transitive_dependency_licensing_warnings true -fips_mode (ENV["OMNIBUS_FIPS_MODE"] || "").casecmp("true") >= 0 + +# OpenSSL 1.1.1 does not support FIPS +#fips_mode (ENV["OMNIBUS_FIPS_MODE"] || "").casecmp("true") >= 0 +fips_mode false diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 6f871a48a2..530ab9cc86 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -16,7 +16,7 @@ override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "nokogiri", version: "1.10.9" -override "openssl", version: "1.0.2u" +override "openssl", version: "1.1.1g" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.6.6" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" |