diff options
author | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-10-27 17:39:00 +0300 |
---|---|---|
committer | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-10-27 17:39:00 +0300 |
commit | 03adc194418153f892fcd7381cb710fbc1c90453 (patch) | |
tree | c09a5d46d8b241cd37a07fc25b55f10d452c9b4f | |
parent | fc21c989a5497f25761c5376fae6de69e40f7fc1 (diff) |
Fix openssl conflicts with FIPS
There is a small bug in the upstream Labkit::FIPS. That gem
replaces native SHAx implementation of Digest gem by OpenSSL
version. Somehow, when building in FIPS mode, Digest::SHA1
must be required explicitly.
Changelog: fixed
-rwxr-xr-x | ruby/bin/gitaly-ruby | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ruby/bin/gitaly-ruby b/ruby/bin/gitaly-ruby index dcb2cd2d9..5b5f537a6 100755 --- a/ruby/bin/gitaly-ruby +++ b/ruby/bin/gitaly-ruby @@ -9,9 +9,13 @@ Encoding.default_external = Encoding::UTF_8 require 'fileutils' require 'grpc' +require 'openssl' +# There is a small bug in the upstream Labkit::FIPS. That gem replaces native +# SHAx implementation of Digest gem by OpenSSL version. Somehow, when building +# in FIPS mode, Digest::SHA1 must be required explicitly. +require 'digest/sha1' require 'gitlab-labkit' require 'rugged' -require 'openssl' require_relative '../lib/gitaly_server.rb' require_relative '../lib/gitaly_server/sentry_interceptor.rb' |