let the ssh_authorized_key type recognize the new ssh-ed25519 key type.

This commit is contained in:
jasper 2013-12-06 21:07:03 +00:00
parent 370983672b
commit 5e32ab6ea3
2 changed files with 20 additions and 2 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.40 2013/12/04 09:23:39 jasper Exp $
# $OpenBSD: Makefile,v 1.41 2013/12/06 21:07:03 jasper Exp $
VERSION= 3.3.2
REVISION= 4
REVISION= 5
RUN_DEPENDS+= archivers/gtar \
devel/ruby-rgen,${MODRUBY_FLAVOR}

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-lib_puppet_type_ssh_authorized_key_rb,v 1.1 2013/12/06 21:07:03 jasper Exp $
Recognize ssh-ed25519 as a valid SSH key type.
--- lib/puppet/type/ssh_authorized_key.rb.orig Fri Dec 6 22:00:34 2013
+++ lib/puppet/type/ssh_authorized_key.rb Fri Dec 6 22:01:35 2013
@@ -20,9 +20,10 @@ module Puppet
newproperty(:type) do
desc "The encryption type used: ssh-dss or ssh-rsa."
- newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521'
+ newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521', :'ssh-ed25519'
aliasvalue(:dsa, :'ssh-dss')
+ aliasvalue(:ed25519, :'ssh-ed25519')
aliasvalue(:rsa, :'ssh-rsa')
end