From 6e3239d8fbe33f96352d24a563a0c7595d29dca9 Mon Sep 17 00:00:00 2001
From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Tue, 22 Nov 2022 09:47:06 +0000
Subject: [PATCH] auth: Add support for ARGON2 scheme

---
 src/auth/password-scheme-sodium.c | 7 +++++++
 src/auth/test-libpassword.c       | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/auth/password-scheme-sodium.c b/src/auth/password-scheme-sodium.c
index c315561ee2..1d7c8f0c13 100644
--- a/src/auth/password-scheme-sodium.c
+++ b/src/auth/password-scheme-sodium.c
@@ -89,6 +89,13 @@ static const struct password_scheme sodium_schemes[] = {
 		.password_verify = verify_argon2,
 		.password_generate = generate_argon2id,
 	},
+	{
+		.name = "ARGON2",
+		.default_encoding = PW_ENCODING_NONE,
+		.raw_password_len = 0,
+		.password_verify = verify_argon2,
+		.password_generate = generate_argon2id,
+	},
 #endif
 };
 
diff --git a/src/auth/test-libpassword.c b/src/auth/test-libpassword.c
index 15c9165f8e..f4a7828485 100644
--- a/src/auth/test-libpassword.c
+++ b/src/auth/test-libpassword.c
@@ -14,6 +14,7 @@ static struct {
 	{ "MD5", "DES-CRYPT" },
 	{ "MD5-CRYPT", "DES-CRYPT" },
 	{ "ARGON2ID", "ARGON2I" },
+	{ "ARGON2", "ARGON2I" },
 };
 
 /* some algorithms are detected as something other, because they are compatible
@@ -120,6 +121,7 @@ static void test_password_schemes(void)
 	test_password_scheme("ARGON2I", "{ARGON2I}$argon2i$v=19$m=32768,t=4,p=1$f2iuP4aUeNMrgu34fhOkkg$1XSZZMWlIs0zmE+snlUIcLADO3GXbA2O/hsQmmc317k", "test");
 #ifdef crypto_pwhash_ALG_ARGON2ID13
 	test_password_scheme("ARGON2ID", "{ARGON2ID}$argon2id$v=19$m=65536,t=3,p=1$vBb99oJ12p3WAdYlaMHz1A$jtFOtbo/sYV9OSlTxDo/nVNq3uArHd5GJSEx0ty85Cc", "test");
+	test_password_scheme("ARGON2", "{ARGON2}$argon2id$v=19$m=65536,t=3,p=1$vBb99oJ12p3WAdYlaMHz1A$jtFOtbo/sYV9OSlTxDo/nVNq3uArHd5GJSEx0ty85Cc", "test");
 #endif
 #endif
 }
-- 
2.47.3