valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12676 from garethgreenaway/ssh_host_key_fixes

Browse Source 
Add missing ECDSA, ED25519 ssh key file types.
This commit is contained in:
Pedro Algarvio 2014-05-11 15:06:38 +01:00
commit adac7ba7e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/ssh.py
View File

@ -846,13 +846,13 @@ def user_keys(user=None, pubfile=None, prvfile=None):
userKeys.append(pubfile) userKeys.append(pubfile)
else: else:
# Add the default public keys # 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: if prvfile:
userKeys.append(prvfile) userKeys.append(prvfile)
else: else:
# Add the default private keys # Add the default private keys
userKeys += ['id_rsa', 'id_dsa'] userKeys += ['id_rsa', 'id_dsa', 'id_ecdsa', 'id_ed25519']
for key in userKeys: for key in userKeys:
if key.startswith('/'): if key.startswith('/'):