Skip to content

Commit 8214e27

Browse files
pks-tgitster
authored andcommitted
meson: consistenlty spell 'CommonCrypto'
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cade724 commit 8214e27

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ if sha1_backend == 'sha1dc'
13671367
'sha1dc/sha1.c',
13681368
'sha1dc/ubc_check.c',
13691369
]
1370-
elif sha1_backend == 'common-crypto'
1370+
elif sha1_backend == 'CommonCrypto'
13711371
libgit_c_args += '-DCOMMON_DIGEST_FOR_OPENSSL'
13721372
libgit_c_args += '-DSHA1_APPLE'
13731373
# Apple CommonCrypto requires chunking

meson_options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ option('regex', type: 'feature', value: 'auto',
4949
# Backends.
5050
option('https_backend', type: 'combo', value: 'auto', choices: ['auto', 'openssl', 'CommonCrypto', 'none'],
5151
description: 'The HTTPS backend to use when connecting to remotes.')
52-
option('sha1_backend', type: 'combo', choices: ['openssl', 'block', 'sha1dc', 'common-crypto'], value: 'sha1dc',
52+
option('sha1_backend', type: 'combo', choices: ['openssl', 'block', 'sha1dc', 'CommonCrypto'], value: 'sha1dc',
5353
description: 'The backend used for hashing objects with the SHA1 object format')
5454
option('sha256_backend', type: 'combo', choices: ['openssl', 'nettle', 'gcrypt', 'block'], value: 'block',
5555
description: 'The backend used for hashing objects with the SHA256 object format')

0 commit comments

Comments
 (0)