diff options
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_cryptor.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_cryptor.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c index efd350d..0be30c6 100644 --- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c +++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c @@ -31,6 +31,19 @@ #include "archive.h" #include "archive_cryptor_private.h" +/* + * On systems that do not support any recognized crypto libraries, + * this file will normally define no usable symbols. + * + * But some compilers and linkers choke on empty object files, so + * define a public symbol that will always exist. This could + * be removed someday if this file gains another always-present + * symbol definition. + */ +int __libarchive_cryptor_build_hack(void) { + return 0; +} + #ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto static int @@ -256,7 +269,7 @@ aes_ctr_release(archive_crypto_ctx *ctx) return 0; } -#elif defined(HAVE_LIBNETTLE) +#elif defined(HAVE_LIBNETTLE) && defined(HAVE_NETTLE_AES_H) static int aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len) |