Merge pull request puppetlabs#665 from joshcooper/windowsfips_4877

(PA-4877) Use Ruby 3 with Puppet 8 on Windows FIPS
AriaXLi · May 10, 2023 · 5d99782 · 5d99782
2 parents f835b5d + a261f3c
commit 5d99782
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/configs/projects/_shared-agent-settings.rb b/configs/projects/_shared-agent-settings.rb
@@ -157,7 +157,7 @@
   proj.setting(:ldflags, "-L#{proj.libdir} -Wl,-rpath=#{proj.libdir},-z,relro,-z,now")
 end
 
-if ruby_version_x == "3" && !platform.is_aix? && !platform.is_solaris? && !(platform.is_windows? && platform.is_fips?)
+if ruby_version_x == "3" && !platform.is_aix? && !platform.is_solaris?
   proj.setting(:openssl_version, '3.0')
 elsif platform.name =~ /^redhatfips-/
   proj.setting(:openssl_version, '1.1.1-fips')