From 82adb3ced76821078f4cd08f73fa8271d225a9a5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 10:37:18 +0200 Subject: Merging upstream version 2:2.7.1. Signed-off-by: Daniel Baumann --- lib/crypto_backend/argon2_generic.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/crypto_backend/argon2_generic.c') diff --git a/lib/crypto_backend/argon2_generic.c b/lib/crypto_backend/argon2_generic.c index eca575b..9b3c039 100644 --- a/lib/crypto_backend/argon2_generic.c +++ b/lib/crypto_backend/argon2_generic.c @@ -21,15 +21,18 @@ #include #include "crypto_backend_internal.h" + +/* Check for HAVE_ARGON2_H is run only if libargon2 code is used */ +#if USE_INTERNAL_ARGON2 || HAVE_ARGON2_H + +#define CONST_CAST(x) (x)(uintptr_t) + #if HAVE_ARGON2_H #include #else #include "argon2/argon2.h" #endif -#define CONST_CAST(x) (x)(uintptr_t) - -#if USE_INTERNAL_ARGON2 || HAVE_ARGON2_H int argon2(const char *type, const char *password, size_t password_length, const char *salt, size_t salt_length, char *key, size_t key_length, -- cgit v1.2.3