summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-03-02 17:13:30 +0100
committerGitHub <noreply@github.com>2023-03-02 17:13:30 +0100
commit1ab8a32a7cd390a7d470b25e82b411632a3b42a8 (patch)
treeb2d4aa3f892798620555ee1a9fa9f9f9aeb0372f
parent62047982debe7bbfa1328d4229578486e70e34b2 (diff)
parent19ad6dc524bcf963d2c0725a36329cb1176533b4 (diff)
downloadvyos-1x-1ab8a32a7cd390a7d470b25e82b411632a3b42a8.tar.gz
vyos-1x-1ab8a32a7cd390a7d470b25e82b411632a3b42a8.zip
Merge pull request #1863 from sarthurdev/T5039
login: T5039: Support hashing rounds in `encrypted-password` values
-rw-r--r--interface-definitions/system-login.xml.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in
index e71a647ef..b00741ffe 100644
--- a/interface-definitions/system-login.xml.in
+++ b/interface-definitions/system-login.xml.in
@@ -29,8 +29,8 @@
<regex>(\*|\!)</regex>
<regex>[a-zA-Z0-9\.\/]{13}</regex>
<regex>\$1\$[a-zA-Z0-9\./]*\$[a-zA-Z0-9\./]{22}</regex>
- <regex>\$5\$[a-zA-Z0-9\./]*\$[a-zA-Z0-9\./]{43}</regex>
- <regex>\$6\$[a-zA-Z0-9\./]*\$[a-zA-Z0-9\./]{86}</regex>
+ <regex>\$5\$(rounds=[0-9]+\$)?[a-zA-Z0-9\./]*\$[a-zA-Z0-9\./]{43}</regex>
+ <regex>\$6\$(rounds=[0-9]+\$)?[a-zA-Z0-9\./]*\$[a-zA-Z0-9\./]{86}</regex>
</constraint>
<constraintErrorMessage>Invalid encrypted password for $VAR(../../@).</constraintErrorMessage>
</properties>