From f593510375bb028deb1667b8d250058122bba934 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 28 May 2024 06:42:23 -0700 Subject: [PATCH] Tweaking openssl to match chef-18 Signed-off-by: John --- config/software/openssl.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index b68775a00..cb5d870fc 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -354,9 +354,10 @@ # add OPENSSL_FIPS to the environment _if_ fips is active fips_env=fips_mode? ? env.merge({"OPENSSL_FIPS" => "1"}) : env - command "#{ENV["OMNIBUS_TOOLCHAIN_INSTALL_DIR"]}/embedded/bin/gem install openssl-#{openssl_gem_version}.gem --no-document -- --with-openssl-dir=#{install_dir}/embedded", env: fips_env + gem_path = ENV["OMNIBUS_TOOLCHAIN_INSTALL_DIR"] || '/opt/chef' + command "#{gem_path}/embedded/bin/gem install openssl-#{openssl_gem_version}.gem --no-document -- --with-openssl-dir=#{install_dir}/embedded", env: fips_env - command "#{ENV["OMNIBUS_TOOLCHAIN_INSTALL_DIR"]}/embedded/bin/gem info openssl" + command "#{gem_path}/embedded/bin/gem info openssl" command "#{install_dir}/embedded/bin/openssl list -provider-path providers -provider fips -providers" end