diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2016-05-12 07:14:55 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2016-05-12 07:14:55 -0500 |
| commit | eedb5daedaba19d664c238f27469b523c29f2d22 (patch) | |
| tree | 4cfa78badfee680a8e335a33db8e4e73daa2a4fe | |
| parent | 9c5e4199d1118fbf5e6f144a70604fcde1016446 (diff) | |
| parent | 8c302420c2dad59cb11fc9d2824b0f4b642b947f (diff) | |
| download | bcfg2-eedb5daedaba19d664c238f27469b523c29f2d22.tar.gz bcfg2-eedb5daedaba19d664c238f27469b523c29f2d22.tar.bz2 bcfg2-eedb5daedaba19d664c238f27469b523c29f2d22.zip | |
Merge branch 'ed25519' of https://github.com/gordonmessmer/bcfg2
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSHbase.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py index 7f20e72eb..08acc4d8d 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py +++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py @@ -121,6 +121,10 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, private key for (hostname) ssh_host_(ec)(dr)sa_key.pub.H_(hostname) -> the v2 ssh host public key for (hostname) + ssh_host_ed25519_key.H_(hostname) -> the v2 ssh host + private key for (hostname) + ssh_host_ed25519_key.pub.H_(hostname) -> the v2 ssh host + public key for (hostname) ssh_known_hosts -> the current known hosts file. this is regenerated each time a new key is generated. @@ -128,10 +132,12 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, __author__ = 'bcfg-dev@mcs.anl.gov' keypatterns = ["ssh_host_dsa_key", "ssh_host_ecdsa_key", + "ssh_host_ed25519_key", "ssh_host_rsa_key", "ssh_host_key", "ssh_host_dsa_key.pub", "ssh_host_ecdsa_key.pub", + "ssh_host_ed25519_key.pub", "ssh_host_rsa_key.pub", "ssh_host_key.pub"] @@ -421,7 +427,8 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, def GenerateHostKeyPair(self, client, filename): """Generate new host key pair for client.""" - match = re.search(r'(ssh_host_(?:((?:ecd|d|r)sa)_)?key)', filename) + match = re.search(r'(ssh_host_(?:((?:ecd|d|r)sa|ed25519)_)?key)', + filename) if match: hostkey = "%s.H_%s" % (match.group(1), client) if match.group(2): |