summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-11-18 19:28:35 +0100
committerGitHub <noreply@github.com>2022-11-18 19:28:35 +0100
commit95abda42a4ef4a949b897a4aa5eaf52e6c2842a8 (patch)
treec455158850ff939315a41260f088a34ab9047e0c
parent97056cad18664bea06310d59e8a769add077f6d0 (diff)
parent6458f99cc31bb8965648cf78149d2ac4088e0892 (diff)
downloadvyos-1x-95abda42a4ef4a949b897a4aa5eaf52e6c2842a8.tar.gz
vyos-1x-95abda42a4ef4a949b897a4aa5eaf52e6c2842a8.zip
Merge pull request #1664 from sever-sever/T4826
T4826: Fix login pubkey key type ed25519-sk ecdsa-sk
-rw-r--r--interface-definitions/system-login.xml.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in
index 027d3f587..e71a647ef 100644
--- a/interface-definitions/system-login.xml.in
+++ b/interface-definitions/system-login.xml.in
@@ -129,7 +129,7 @@
<properties>
<help>SSH public key type</help>
<completionHelp>
- <list>ssh-dss ssh-rsa ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 ecdsa-sk ed25519-sk</list>
+ <list>ssh-dss ssh-rsa ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 sk-ecdsa-sha2-nistp256@openssh.com sk-ssh-ed25519@openssh.com</list>
</completionHelp>
<valueHelp>
<format>ssh-dss</format>
@@ -156,15 +156,15 @@
<description>Edwards-curve DSA with elliptic curve 25519</description>
</valueHelp>
<valueHelp>
- <format>ecdsa-sk</format>
+ <format>sk-ecdsa-sha2-nistp256@openssh.com</format>
<description>Elliptic Curve DSA security key</description>
</valueHelp>
<valueHelp>
- <format>ed25519-sk</format>
+ <format>sk-ssh-ed25519@openssh.com</format>
<description>Elliptic curve 25519 security key</description>
</valueHelp>
<constraint>
- <regex>(ssh-dss|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ssh-ed25519|ecdsa-sk|ed25519-sk)</regex>
+ <regex>(ssh-dss|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ssh-ed25519|sk-ecdsa-sha2-nistp256@openssh.com|sk-ssh-ed25519@openssh.com)</regex>
</constraint>
</properties>
</leafNode>