Skip to content

(PE-37599) Openssl-1.1.1-fips fix for client-tools-runtime-2021.7.x project for Redhatfips #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2024
Merged

(PE-37599) Openssl-1.1.1-fips fix for client-tools-runtime-2021.7.x project for Redhatfips #803

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions configs/projects/_shared-client-tools-runtime.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@

platform = proj.get_platform

# We need to explicitly define 1.1.1k here to avoid
# build dep conflicts between openssl-1.1.1 needed by curl
# and krb5-devel
if proj.settings[:openssl_version]
# already defined in the project
elsif platform.name =~ /^redhatfips-8/
proj.setting(:openssl_version, '1.1.1k')
elsif platform.name =~ /^redhatfips-*/
proj.setting(:openssl_version, '1.1.1-fips')
else
proj.setting(:openssl_version, '1.1.1')
end
Expand Down Expand Up @@ -106,14 +103,7 @@

# Common deps
proj.component "runtime-client-tools"

if platform.name =~ /^redhatfips-7/ && proj.openssl_version == '1.1.1'
proj.component "openssl-1.1.1-fips"
elsif platform.name =~ /^redhatfips-8/ && proj.openssl_version == '1.1.1k'
proj.component "openssl-1.1.1-fips"
elsif proj.settings[:openssl_version]
proj.component "openssl-#{proj.openssl_version}"
end
proj.component "openssl-#{proj.openssl_version}"
proj.component "curl"
proj.component "puppet-ca-bundle"
proj.component "libicu"
Expand Down