Skip to content
Snippets Groups Projects
Commit e594f5f50595 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Set FIPS_MODE for gitaly and git during FIPS build

Set the FIPS_MODE environment variable when building
gitaly and git during a FIPS enabled package build.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6851



Signed-off-by: default avatarBalasankar "Balu" C <balasankar@gitlab.com>
parent 1d2cb95ded3e
No related branches found
No related tags found
2 merge requests!76heptapod#711: 0.34 is the new stable,!73Sync up to upstream Omnibus GitLab 15.1
......@@ -67,7 +67,11 @@
"GIT_APPEND_BUILD_OPTIONS += CFLAGS=\"#{git_cflags}\""
]
build_options << "GIT_APPEND_BUILD_OPTIONS += OPENSSLDIR=#{install_dir}/embedded" unless Build::Check.use_system_ssl?
if Build::Check.use_system_ssl?
env['FIPS_MODE'] = '1'
else
build_options << "GIT_APPEND_BUILD_OPTIONS += OPENSSLDIR=#{install_dir}/embedded"
end
block do
File.open(File.join(project_dir, 'config.mak'), 'a') do |file|
......
......@@ -52,6 +52,7 @@
if Build::Check.use_system_ssl?
env['CMAKE_FLAGS'] = OpenSSLHelper.cmake_flags
env['PKG_CONFIG_PATH'] = OpenSSLHelper.pkg_config_dirs
env['FIPS_MODE'] = '1'
end
bundle "config set --local frozen 'true'"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment