From: Richard Levitte <levitte@openssl.org>
Date: Mon, 20 Mar 2023 07:09:40 +0000 (+0100)
Subject: providers/implementations/kdfs/argon2.c: Don't use UINT64_C
X-Git-Tag: openssl-3.2.0-alpha1~1124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b738c1ac945a3f1a985df79ff8c37a23d2f2fe0;p=thirdparty%2Fopenssl.git

providers/implementations/kdfs/argon2.c: Don't use UINT64_C

With less than C99 compilers, this macro isn't guaranteed to exist, and
the value passed to it is 32 bits, so explicitly ending it with 'UL' is
correct in all cases.  We simply leave it to the compiler to extend it
appropriately for uint64_t.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20547)
---

diff --git a/providers/implementations/kdfs/argon2.c b/providers/implementations/kdfs/argon2.c
index 768dcfe1bff..60c8fff1b87 100644
--- a/providers/implementations/kdfs/argon2.c
+++ b/providers/implementations/kdfs/argon2.c
@@ -307,7 +307,7 @@ static ossl_inline uint64_t rotr64(const uint64_t w, const unsigned int c)
 
 static ossl_inline uint64_t mul_lower(uint64_t x, uint64_t y)
 {
-    const uint64_t m = UINT64_C(0xFFFFFFFF);
+    const uint64_t m = 0xFFFFFFFFUL;
     return (x & m) * (y & m);
 }