cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for SSH ed25519 keys 

This works with both host and user keys.

(cherry picked from commit 763c65b84f)
This commit is contained in:
Franz Pletz 2014-04-16 18:41:48 +02:00 committed by Joey Hess
parent ba058d77a7
commit d3e6b42156
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Propellor/Property/Ssh.hs
View File

@ -122,6 +122,7 @@ fromKeyType :: SshKeyType -> String
fromKeyType SshRsa = "rsa" fromKeyType SshRsa = "rsa"
fromKeyType SshDsa = "dsa" fromKeyType SshDsa = "dsa"
fromKeyType SshEcdsa = "ecdsa" fromKeyType SshEcdsa = "ecdsa"
fromKeyType SshEd25519 = "ed25519"
-- | Puts some host's ssh public key into the known_hosts file for a user. -- | Puts some host's ssh public key into the known_hosts file for a user.
knownHost :: [Host] -> HostName -> UserName -> Property knownHost :: [Host] -> HostName -> UserName -> Property

2
Propellor/Types.hs
View File

@ -150,5 +150,5 @@ data PrivDataField
type GpgKeyId = String type GpgKeyId = String
data SshKeyType = SshRsa | SshDsa | SshEcdsa data SshKeyType = SshRsa | SshDsa | SshEcdsa | SshEd25519
deriving (Read, Show, Ord, Eq) deriving (Read, Show, Ord, Eq)