diff mbox series

[04/10] meson: consistenlty spell 'CommonCrypto'

Message ID 20241230-pks-meson-sha1-unsafe-v1-4-efb276e171f5@pks.im (mailing list archive)
State Accepted
Commit 8214e27d275915079ddf7c294c379515e34e8efb
Headers show
Series Fix segfaults when using the unsafe SHA1 backend | expand

Commit Message

Patrick Steinhardt Dec. 30, 2024, 2:24 p.m. UTC 
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>
---
 meson.build       | 2 +-
 meson_options.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index 0064eb64f546a6349a8694ce251bd352febda6fe..9da58dafe0f1023cc72f4ea3eff5515c9d479099 100644
--- a/meson.build
+++ b/meson.build
@@ -1367,7 +1367,7 @@  if sha1_backend == 'sha1dc'
     'sha1dc/sha1.c',
     'sha1dc/ubc_check.c',
   ]
-elif sha1_backend == 'common-crypto'
+elif sha1_backend == 'CommonCrypto'
   libgit_c_args += '-DCOMMON_DIGEST_FOR_OPENSSL'
   libgit_c_args += '-DSHA1_APPLE'
   # Apple CommonCrypto requires chunking
diff --git a/meson_options.txt b/meson_options.txt
index 4be7eab39939178ae2ffde1ff9e78f83a1b482b2..a7f308d217f29ef301848e63623a49207ef83125 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -49,7 +49,7 @@  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',
+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('sha256_backend', type: 'combo', choices: ['openssl', 'nettle', 'gcrypt', 'block'], value: 'block',
   description: 'The backend used for hashing objects with the SHA256 object format')