diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-12-15 19:33:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-15 19:33:18 +0000 |
| commit | 31ce591f9bd34edc8a5a5ee91a4367c741b93b7c (patch) | |
| tree | 89f6f2fce2d02242a38329d80382980abde10f32 /interface-definitions | |
| parent | 6c6fa367118c6196a1fb01df8646269e91ac2a4f (diff) | |
| parent | ef13a6319a21c8030301aeebbeabf5148adb994c (diff) | |
| download | vyos-1x-31ce591f9bd34edc8a5a5ee91a4367c741b93b7c.tar.gz vyos-1x-31ce591f9bd34edc8a5a5ee91a4367c741b93b7c.zip | |
Merge pull request #4896 from c-po/ssh-config-test
ssh: T8090: T8098: add support for config test mode (sshd -t)
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/version/ssh-version.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/service_ssh.xml.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/interface-definitions/include/version/ssh-version.xml.i b/interface-definitions/include/version/ssh-version.xml.i index 0f25caf98..05cf431a7 100644 --- a/interface-definitions/include/version/ssh-version.xml.i +++ b/interface-definitions/include/version/ssh-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/ssh-version.xml.i --> -<syntaxVersion component='ssh' version='2'></syntaxVersion> +<syntaxVersion component='ssh' version='3'></syntaxVersion> <!-- include end --> diff --git a/interface-definitions/service_ssh.xml.in b/interface-definitions/service_ssh.xml.in index c659a7db7..9fd9e32c3 100644 --- a/interface-definitions/service_ssh.xml.in +++ b/interface-definitions/service_ssh.xml.in @@ -36,15 +36,15 @@ </node> </children> </node> - <leafNode name="ciphers"> + <leafNode name="cipher"> <properties> <help>Allowed ciphers</help> <completionHelp> <!-- generated by ssh -Q cipher | tr '\n' ' ' as this will not change dynamically --> - <list>3des-cbc aes128-cbc aes192-cbc aes256-cbc rijndael-cbc@lysator.liu.se aes128-ctr aes192-ctr aes256-ctr aes128-gcm@openssh.com aes256-gcm@openssh.com chacha20-poly1305@openssh.com</list> + <list>3des-cbc aes128-cbc aes192-cbc aes256-cbc aes128-ctr aes192-ctr aes256-ctr aes128-gcm@openssh.com aes256-gcm@openssh.com chacha20-poly1305@openssh.com</list> </completionHelp> <constraint> - <regex>(3des-cbc|aes128-cbc|aes192-cbc|aes256-cbc|rijndael-cbc@lysator.liu.se|aes128-ctr|aes192-ctr|aes256-ctr|aes128-gcm@openssh.com|aes256-gcm@openssh.com|chacha20-poly1305@openssh.com)</regex> + <regex>(3des-cbc|aes128-cbc|aes192-cbc|aes256-cbc|aes128-ctr|aes192-ctr|aes256-ctr|aes128-gcm@openssh.com|aes256-gcm@openssh.com|chacha20-poly1305@openssh.com)</regex> </constraint> <multi/> </properties> |