Handle variable-length MD5 salts

diff --git a/miniserv.pl b/miniserv.pl
index 53c037d..89e0bf5 100755 (executable)
--- a/miniserv.pl
+++ b/miniserv.pl
@@ -4617,7 +4617,7 @@ sub encrypt_md5
 {
 local ($passwd, $salt) = @_;
 local $magic = '$1$';
-if ($salt =~ /^\$1\$(.{8})/) {
+if ($salt =~ /^\$1\$([^\$]+)/) {
        # Extract actual salt from already encrypted password
        $salt = $1;
        }

diff --git a/useradmin/md5-lib.pl b/useradmin/md5-lib.pl
index b788a7b..b0c36b8 100644 (file)
--- a/useradmin/md5-lib.pl
+++ b/useradmin/md5-lib.pl
@@ -26,7 +26,7 @@ sub encrypt_md5
 local $passwd = $_[0];
 local $magic = '$1$';
 local $salt = $_[1] || substr(time(), -8);
-if ($salt =~ /^\$1\$(.{8})/) {
+if ($salt =~ /^\$1\$([^\$]+)/) {
        # Extract actual salt from already encrypted password
        $salt = $1;
        }