1 Jul 2011 13:34
[PATCH/puppet 2/2] (#8193) Support new keytypes for sshkey
Stefan Schulte <stefan.schulte <at> taunusstein.net>
2011-07-01 11:34:12 GMT
2011-07-01 11:34:12 GMT
Recent versions of openssh (at least openssh 5.8) support the following
keytypes in in the authorized_keys file: ecdsa-sha2-nistp256,
ecdsa-sha2-nistp384, ecdsa-sha2-nistp521, ssh-dss or ssh-rsa.
Add support for ecdsa-sha2-nistp256, ecdsa-sha2-nistp384 and
ecdsa-sha2-nistp521.
Signed-off-by: Stefan Schulte <stefan.schulte <at> taunusstein.net>
---
Local-branch: ticket/2.7.x/8193
lib/puppet/type/sshkey.rb | 8 ++++----
spec/unit/type/sshkey_spec.rb | 20 +++++++++-----------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/lib/puppet/type/sshkey.rb b/lib/puppet/type/sshkey.rb
index 59a1a12..41b3dde 100755
--- a/lib/puppet/type/sshkey.rb
+++ b/lib/puppet/type/sshkey.rb
<at> <at> -9,10 +9,10 <at> <at> module Puppet
newproperty(:type) do
desc "The encryption type used. Probably ssh-dss or ssh-rsa."
- newvalue("ssh-dss")
- newvalue("ssh-rsa")
- aliasvalue(:dsa, "ssh-dss")
- aliasvalue(:rsa, "ssh-rsa")
+ newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521'
+
+ aliasvalue(:dsa, :'ssh-dss')
+ aliasvalue(:rsa, :'ssh-rsa')
(Continue reading)
RSS Feed