diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-17 01:35:14 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-17 01:35:14 +0100 |
| commit | 3902b083e7bfe3824fc070ea2081c74f19236509 (patch) | |
| tree | f9afd6a4d445964fdba280b638ab077d9db220ec /meson_options.txt | |
| parent | Merge branch 'ps/more-sign-compare' (diff) | |
| parent | meson: provide a summary of configured backends (diff) | |
| download | git-3902b083e7bfe3824fc070ea2081c74f19236509.tar.xz git-3902b083e7bfe3824fc070ea2081c74f19236509.zip | |
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'
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt index f50bb40cdf..89b01bad04 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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, |