From: Ryan Tandy <ryan@nardis.ca>
Date: Tue, 7 Apr 2020 18:18:22 +0000 (-0700)
Subject: ITS#9206 Use argon2id default values explicitly
X-Git-Tag: OPENLDAP_REL_ENG_2_4_50~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59bed7e646093545222953db902e288343d77d58;p=thirdparty%2Fopenldap.git

ITS#9206 Use argon2id default values explicitly
---

diff --git a/contrib/slapd-modules/passwd/argon2/pw-argon2.c b/contrib/slapd-modules/passwd/argon2/pw-argon2.c
index 4bb8f217ea..5004fdcf6c 100644
--- a/contrib/slapd-modules/passwd/argon2/pw-argon2.c
+++ b/contrib/slapd-modules/passwd/argon2/pw-argon2.c
@@ -39,12 +39,12 @@
 #include <sodium.h>
 
 /*
- * Or libsodium moderate settings
+ * Or libsodium interactive settings
  */
-#define SLAPD_ARGON2_ITERATIONS crypto_pwhash_OPSLIMIT_INTERACTIVE
-#define SLAPD_ARGON2_MEMORY (crypto_pwhash_MEMLIMIT_INTERACTIVE / 1024)
+#define SLAPD_ARGON2_ITERATIONS crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE
+#define SLAPD_ARGON2_MEMORY (crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE / 1024)
 #define SLAPD_ARGON2_PARALLELISM 1
-#define SLAPD_ARGON2_SALT_LENGTH crypto_pwhash_SALTBYTES
+#define SLAPD_ARGON2_SALT_LENGTH crypto_pwhash_argon2id_SALTBYTES
 #define SLAPD_ARGON2_HASH_LENGTH 32
 
 #endif