Include argon2id in crypto_pwhash_primitive()

Fixes jedisct1#1331
enclave-alistair · Dec 11, 2023 · 98b3f1c · 98b3f1c
1 parent b72d3d1
commit 98b3f1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/libsodium/include/sodium/crypto_pwhash.h b/src/libsodium/include/sodium/crypto_pwhash.h
@@ -135,7 +135,7 @@ int crypto_pwhash_str_needs_rehash(const char *str,
                                    unsigned long long opslimit, size_t memlimit)
             __attribute__ ((warn_unused_result)) __attribute__ ((nonnull));
 
-#define crypto_pwhash_PRIMITIVE "argon2i"
+#define crypto_pwhash_PRIMITIVE "argon2id,argon2i"
 SODIUM_EXPORT
 const char *crypto_pwhash_primitive(void)
             __attribute__ ((warn_unused_result));

diff --git a/test/default/pwhash_argon2id.c b/test/default/pwhash_argon2id.c
@@ -432,7 +432,7 @@ main(void)
     assert(crypto_pwhash_memlimit_moderate() > 0U);
     assert(crypto_pwhash_opslimit_sensitive() > 0U);
     assert(crypto_pwhash_memlimit_sensitive() > 0U);
-    assert(strcmp(crypto_pwhash_primitive(), "argon2i") == 0);
+    assert(strcmp(crypto_pwhash_primitive(), "argon2id,argon2i") == 0);
 
     assert(crypto_pwhash_bytes_min() == crypto_pwhash_BYTES_MIN);
     assert(crypto_pwhash_bytes_max() == crypto_pwhash_BYTES_MAX);