diff options
| author | Toon Claes <toon@gitlab.com> | 2022-10-27 19:45:58 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-10-27 19:45:58 +0300 |
| commit | 5043bd9e8f56f677627e4aa0069e3c5eea5825fc (patch) | |
| tree | eb782db44d532fa484240d4b72f2fb116cca4f4a | |
| parent | fda34b01a0fc42e053310bc3d6d88ad7e6cfb82a (diff) | |
| parent | 03adc194418153f892fcd7381cb710fbc1c90453 (diff) | |
Merge branch 'qmnguyen0711/fix-fips-problem' into 'master'
Fix gitaly-ruby problem with fips
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4984
Merged-by: Toon Claes <toon@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Co-authored-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
| -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' |