diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/services/packages/maven/metadata/append_package_file_service.rb | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/services/packages/maven/metadata/append_package_file_service.rb')
-rw-r--r-- | app/services/packages/maven/metadata/append_package_file_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/packages/maven/metadata/append_package_file_service.rb b/app/services/packages/maven/metadata/append_package_file_service.rb index e991576ebc6..c778620ea8e 100644 --- a/app/services/packages/maven/metadata/append_package_file_service.rb +++ b/app/services/packages/maven/metadata/append_package_file_service.rb @@ -36,7 +36,7 @@ module Packages sha256: file_sha256 ) - append_metadata_file(content: file_md5, file_name: MD5_FILE_NAME) + append_metadata_file(content: file_md5, file_name: MD5_FILE_NAME) unless Gitlab::FIPS.enabled? append_metadata_file(content: file_sha1, file_name: SHA1_FILE_NAME) append_metadata_file(content: file_sha256, file_name: SHA256_FILE_NAME) append_metadata_file(content: file_sha512, file_name: SHA512_FILE_NAME) @@ -70,6 +70,8 @@ module Packages end def digest_from(content, type) + return if type == :md5 && Gitlab::FIPS.enabled? + digest_class = case type when :md5 Digest::MD5 |