mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Merge branch 'ps/meson-weak-sha1-build'
meson-based build now supports the unsafe-sha1 build knob. * ps/meson-weak-sha1-build: meson: provide a summary of configured backends meson: wire up unsafe SHA1 backend meson: add missing dots for build options meson: simplify conditions for HTTPS and SHA1 dependencies meson: require SecurityFramework when it's used as SHA1 backend meson: deduplicate access to SHA1/SHA256 backend options meson: consistenlty spell 'CommonCrypto'
This commit is contained in:
@@ -49,10 +49,12 @@ option('regex', type: 'feature', value: 'auto',
|
||||
# Backends.
|
||||
option('https_backend', type: 'combo', value: 'auto', choices: ['auto', 'openssl', 'CommonCrypto', 'none'],
|
||||
description: 'The HTTPS backend to use when connecting to remotes.')
|
||||
option('sha1_backend', type: 'combo', choices: ['openssl', 'block', 'sha1dc', 'common-crypto'], value: 'sha1dc',
|
||||
description: 'The backend used for hashing objects with the SHA1 object format')
|
||||
option('sha1_backend', type: 'combo', choices: ['openssl', 'block', 'sha1dc', 'CommonCrypto'], value: 'sha1dc',
|
||||
description: 'The backend used for hashing objects with the SHA1 object format.')
|
||||
option('sha1_unsafe_backend', type: 'combo', choices: ['openssl', 'block', 'CommonCrypto', 'none'], value: 'none',
|
||||
description: 'The backend used for hashing data with the SHA1 object format in case no cryptographic security is needed.')
|
||||
option('sha256_backend', type: 'combo', choices: ['openssl', 'nettle', 'gcrypt', 'block'], value: 'block',
|
||||
description: 'The backend used for hashing objects with the SHA256 object format')
|
||||
description: 'The backend used for hashing objects with the SHA256 object format.')
|
||||
|
||||
# Build tweaks.
|
||||
option('macos_use_homebrew_gettext', type: 'boolean', value: true,
|
||||
|
||||
Reference in New Issue
Block a user