From 33b591dfac98a9b37b7889187b8aa043e0080a8b Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 3 Aug 2023 14:49:04 -0700
Subject: [PATCH] Also check if hash format is valid for yescrypt

---
 useradmin/md5-lib.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/useradmin/md5-lib.pl b/useradmin/md5-lib.pl
index b469cfa0d..dab213764 100755
--- a/useradmin/md5-lib.pl
+++ b/useradmin/md5-lib.pl
@@ -242,7 +242,7 @@ return &unix_crypt_supports_yescrypt() ? undef : 'Crypt::NaCl::Sodium';
 sub encrypt_yescrypt
 {
 my ($passwd, $salt) = @_;
-$salt ||= &substitute_pattern('$y$j9T$[A-Z]{4}.[a-zA-Z0-9]{16}.$[a-zA-Z0-9]{14}.[a-zA-Z0-9]{7}/[a-zA-Z0-9]{15}/[a-zA-Z0-9]{4}');
+$salt = &substitute_pattern('$y$j9T$[A-Z]{4}.[a-zA-Z0-9]{16}.$[a-zA-Z0-9]{14}.[a-zA-Z0-9]{7}/[a-zA-Z0-9]{15}/[a-zA-Z0-9]{4}') if (!$salt || $salt !~ /^\$y\$/);
 return crypt($passwd, $salt);
 }