From 35e22827a9b74321e5ad13c5b9c9b7cff1fb0b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Sep 2020 08:27:43 +0200 Subject: [PATCH] shared/libcrypt-util: do not refuse passwords if some other hash is unsupported --- src/shared/libcrypt-util.c | 8 ++++++-- src/test/test-libcrypt-util.c | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/shared/libcrypt-util.c b/src/shared/libcrypt-util.c index 66f345ee5f..c5d98671bd 100644 --- a/src/shared/libcrypt-util.c +++ b/src/shared/libcrypt-util.c @@ -182,8 +182,12 @@ int test_password_one(const char *hashed_password, const char *password) { errno = 0; k = crypt_ra(password, hashed_password, &cd_data, &cd_size); - if (!k) - return errno_or_else(EINVAL); + if (!k) { + if (errno == ENOMEM) + return -ENOMEM; + /* Unknown or unavailable hashing method or string too short */ + return 0; + } return streq(k, hashed_password); } diff --git a/src/test/test-libcrypt-util.c b/src/test/test-libcrypt-util.c index 90abfa7b81..1c570784f4 100644 --- a/src/test/test-libcrypt-util.c +++ b/src/test/test-libcrypt-util.c @@ -40,10 +40,18 @@ static void test_hash_password_full(void) { hashed, "$y$j9T$SAayASazWZIQeJd9AS02m/$"), i) == true); + assert_se(test_password_many(STRV_MAKE("$W$j9T$dlCXwkX0GC5L6B8Gf.4PN/$VCyEH", /* no such method exists... */ + hashed, + "$y$j9T$SAayASazWZIQeJd9AS02m/$"), + i) == true); assert_se(test_password_many(STRV_MAKE("$y$j9T$dlCXwkX0GC5L6B8Gf.4PN/$VCyEH", hashed, "$y$j9T$SAayASazWZIQeJd9AS02m/$"), "") == false); + assert_se(test_password_many(STRV_MAKE("$W$j9T$dlCXwkX0GC5L6B8Gf.4PN/$VCyEH", /* no such method exists... */ + hashed, + "$y$j9T$SAayASazWZIQeJd9AS02m/$"), + "") == false); } }