auth: Add support for ARGON2 scheme

diff --git a/src/auth/password-scheme-sodium.c b/src/auth/password-scheme-sodium.c
index c315561ee2f521f675d71ebd7da3775fdbba2665..1d7c8f0c1396a8366cef22741c408d4306944ab9 100644 (file)
--- 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 15c9165f8e37547e666059ab73d3bc1cc224497f..f4a7828485d07eaff6352b0ba8ed0378be8d0ab5 100644 (file)
--- 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
 }