Skip to content

Commit

Permalink
Merge pull request #713 from donoghuc/no-legacy-on-fips
Browse files Browse the repository at this point in the history
(PE-36344) Enable md4 for winrm transport in bolt server for non fips
  • Loading branch information
donoghuc authored Aug 9, 2023
2 parents 2f37b1d + 2b674c9 commit 699b2db
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 9 additions & 0 deletions configs/projects/pe-bolt-server-runtime-main.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
proj.setting(:ruby_version, '3.2.2')
proj.setting(:openssl_version, '3.0')

# We enable legacy algorithms for winrm transport. Currently the winrm transport
# does not work on FIPS, so in order to stay compliant we do not enable legacy algorithms
# on fips builds.
if proj.get_platform.name =~ /^redhatfips/
proj.setting(:use_legacy_openssl_algos, false)
else
proj.setting(:use_legacy_openssl_algos, true)
end

instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server_with_ruby.rb'))
proj.component 'rubygem-prime'
proj.component 'rubygem-rexml'
Expand Down
2 changes: 0 additions & 2 deletions configs/projects/pe-installer-runtime-main.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
ruby_base_version = proj.ruby_version.gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2.0')
proj.setting(:gem_home, File.join(proj.libdir, 'ruby', 'gems', ruby_base_version))
proj.setting(:gem_install, "#{proj.host_gem} install --no-document --local --bindir=#{proj.ruby_bindir}")
# Enable legacy openssl agls for wirnm
proj.setting(:use_legacy_openssl_algos, true)

proj.setting(:artifactory_url, "https://artifactory.delivery.puppetlabs.net/artifactory")
proj.setting(:buildsources_url, "#{proj.artifactory_url}/generic/buildsources")
Expand Down

0 comments on commit 699b2db

Please sign in to comment.