From: Pauli <ppzgs1@gmail.com>
Date: Wed, 2 Jul 2025 06:55:37 +0000 (+1000)
Subject: argon2: update build infrastructure
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1996a28f7f3b7d9a0a75287d8dfdf38cab5c3929;p=thirdparty%2Fopenssl.git

argon2: update build infrastructure

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
---

diff --git a/.gitignore b/.gitignore
index ca77355f681..8856bd31a34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,7 @@ providers/common/include/prov/der_wrap.h
 providers/common/include/prov/der_sm2.h
 providers/common/include/prov/der_ml_dsa.h
 providers/common/include/prov/der_hkdf.h
+providers/implementations/kdfs/argon2.c
 providers/implementations/kdfs/hkdf.c
 providers/implementations/kdfs/kbkdf.c
 providers/implementations/kdfs/krb5kdf.c
diff --git a/build.info b/build.info
index 6e0afb7cf95..e7aad3a4025 100644
--- a/build.info
+++ b/build.info
@@ -48,6 +48,7 @@ DEPEND[]=include/openssl/asn1.h \
          include/openssl/x509_acert.h \
          include/openssl/x509_vfy.h \
          include/crypto/bn_conf.h include/crypto/dso_conf.h \
+         providers/implementations/kdfs/argon2.c \
          providers/implementations/kdfs/hkdf.c \
          providers/implementations/kdfs/kbkdf.c \
          providers/implementations/kdfs/krb5kdf.c \
@@ -104,7 +105,8 @@ GENERATE[include/openssl/x509_vfy.h]=include/openssl/x509_vfy.h.in
 GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
 GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
 
-DEPEND[providers/implementations/kdfs/hkdf.c \
+DEPEND[providers/implementations/kdfs/argon2.c \
+       providers/implementations/kdfs/hkdf.c \
        providers/implementations/kdfs/kbkdf.c \
        providers/implementations/kdfs/krb5kdf.c \
        providers/implementations/kdfs/pbkdf1.c \
@@ -127,6 +129,8 @@ DEPEND[providers/implementations/kdfs/hkdf.c \
        providers/implementations/ciphers/cipher_chacha20_poly1305.c \
        providers/implementations/digests/digestcommon.c \
        include/openssl/core_names.h]=util/perl|OpenSSL/paramnames.pm
+GENERATE[providers/implementations/kdfs/argon2.c]=\
+    providers/implementations/kdfs/argon2.c.in
 GENERATE[providers/implementations/kdfs/hkdf.c]=\
     providers/implementations/kdfs/hkdf.c.in
 GENERATE[providers/implementations/kdfs/kbkdf.c]=\