diff options
| author | Tim Meusel <tim@bastelfreak.de> | 2020-08-06 21:13:53 +0200 |
|---|---|---|
| committer | Tim Meusel <tim@bastelfreak.de> | 2020-09-06 17:26:46 +0200 |
| commit | 1e31895d63571ec2752a6faf2d9515ea4ce1c816 (patch) | |
| tree | cbc98ead2f0acd9879164cfa04587ef69bff41b6 /lib/puppet | |
| parent | 77f63f04b407dce25f2f5533601075c580a9d727 (diff) | |
| download | puppet-sshkeys_core-1e31895d63571ec2752a6faf2d9515ea4ce1c816.tar.gz puppet-sshkeys_core-1e31895d63571ec2752a6faf2d9515ea4ce1c816.tar.bz2 | |
(MODULES-10765) Implement ssh-ed25519-cert-v01@openssh.com support
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/type/ssh_authorized_key.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/type/ssh_authorized_key.rb b/lib/puppet/type/ssh_authorized_key.rb index 2cc7a33..483fb51 100644 --- a/lib/puppet/type/ssh_authorized_key.rb +++ b/lib/puppet/type/ssh_authorized_key.rb @@ -63,7 +63,8 @@ module Puppet desc 'The encryption type used.' newvalues :'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', :'ssh-rsa-cert-v01@openssh.com' + :'sk-ecdsa-sha2-nistp256@openssh.com', :'sk-ssh-ed25519@openssh.com', :'ssh-rsa-cert-v01@openssh.com', + :'ssh-ed25519-cert-v01@openssh.com' aliasvalue(:dsa, :'ssh-dss') aliasvalue(:ed25519, :'ssh-ed25519') @@ -165,7 +166,7 @@ module Puppet REGEX = %r{^(?:(.+)\s+)?(ssh-dss|ssh-ed25519|ssh-rsa|ecdsa-sha2-nistp256| ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ecdsa-sk|ed25519-sk| sk-ecdsa-sha2-nistp256@openssh.com|sk-ssh-ed25519@openssh.com| - ssh-rsa-cert-v01@openssh.com)\s+([^ ]+)\s*(.*)$}x + ssh-rsa-cert-v01@openssh.com|ssh-ed25519-cert-v01@openssh.com)\s+([^ ]+)\s*(.*)$}x def self.keyline_regex REGEX end |