diff options
| author | Gordon Messmer <gordon@dragonsdawn.net> | 2016-03-31 13:11:25 -0700 |
|---|---|---|
| committer | Gordon Messmer <gordon@dragonsdawn.net> | 2016-03-31 13:11:25 -0700 |
| commit | 30a2bae0a92e8ba75fc10cc6eba4a6dddcecd2b6 (patch) | |
| tree | 3fb3ace57e4329b4c2b4966451f52054007a79f6 /src/lib/Bcfg2/Server/Plugins/SSHbase.py | |
| parent | f9c60b4c04086a3f653eaa0b5be9d5398a7f27ae (diff) | |
| download | bcfg2-30a2bae0a92e8ba75fc10cc6eba4a6dddcecd2b6.tar.gz bcfg2-30a2bae0a92e8ba75fc10cc6eba4a6dddcecd2b6.tar.bz2 bcfg2-30a2bae0a92e8ba75fc10cc6eba4a6dddcecd2b6.zip | |
Generate ed25519 keys.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/SSHbase.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSHbase.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py index 7f20e72eb..33088df3a 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,7 @@ 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): |