From c8b89597f41287ec878867be10124b5635cbeffc Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Sat, 10 May 2014 16:06:53 -0700 Subject: [PATCH] Add missing ECDSA, ED25519 ssh key file types. --- salt/modules/ssh.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/modules/ssh.py b/salt/modules/ssh.py index a076c20876..496f62978f 100644 --- a/salt/modules/ssh.py +++ b/salt/modules/ssh.py @@ -846,13 +846,13 @@ def user_keys(user=None, pubfile=None, prvfile=None): userKeys.append(pubfile) else: # Add the default public keys - userKeys += ['id_rsa.pub', 'id_dsa.pub'] + userKeys += ['id_rsa.pub', 'id_dsa.pub', 'id_ecdsa.pub', 'id_ed25519.pub'] if prvfile: userKeys.append(prvfile) else: # Add the default private keys - userKeys += ['id_rsa', 'id_dsa'] + userKeys += ['id_rsa', 'id_dsa', 'id_ecdsa', 'id_ed25519'] for key in userKeys: if key.startswith('/'):