mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: consistenlty spell 'CommonCrypto'

Browse Source 
The 'CommonCrypto' backend can be specified as HTTPS and SHA1 backends,
but the value that one needs to use is inconsistent across those two
build options. Unify it to 'CommonCrypto'.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-12-30 15:24:04 +01:00
committed by Junio C Hamano
parent cade724b52
commit 8214e27d27
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -1367,7 +1367,7 @@ if sha1_backend == 'sha1dc'
'sha1dc/sha1.c', 'sha1dc/sha1.c',
'sha1dc/ubc_check.c', 'sha1dc/ubc_check.c',
] ]
elif sha1_backend == 'common-crypto' elif sha1_backend == 'CommonCrypto'
libgit_c_args += '-DCOMMON_DIGEST_FOR_OPENSSL' libgit_c_args += '-DCOMMON_DIGEST_FOR_OPENSSL'
libgit_c_args += '-DSHA1_APPLE' libgit_c_args += '-DSHA1_APPLE'
# Apple CommonCrypto requires chunking # Apple CommonCrypto requires chunking

2
meson_options.txt
View File

@ -49,7 +49,7 @@ option('regex', type: 'feature', value: 'auto',
# Backends. # Backends.
option('https_backend', type: 'combo', value: 'auto', choices: ['auto', 'openssl', 'CommonCrypto', 'none'], option('https_backend', type: 'combo', value: 'auto', choices: ['auto', 'openssl', 'CommonCrypto', 'none'],
description: 'The HTTPS backend to use when connecting to remotes.') description: 'The HTTPS backend to use when connecting to remotes.')
option('sha1_backend', type: 'combo', choices: ['openssl', 'block', 'sha1dc', 'common-crypto'], value: 'sha1dc', option('sha1_backend', type: 'combo', choices: ['openssl', 'block', 'sha1dc', 'CommonCrypto'], value: 'sha1dc',
description: 'The backend used for hashing objects with the SHA1 object format') description: 'The backend used for hashing objects with the SHA1 object format')
option('sha256_backend', type: 'combo', choices: ['openssl', 'nettle', 'gcrypt', 'block'], value: 'block', 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')