diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2013-10-02 11:00:38 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2013-10-02 11:00:38 +0200 |
| commit | ad33bb186f1fa5750b363be66348b4fa6fbfdd4a (patch) | |
| tree | b830184c36c2d02eee23e898febb1e5a62740333 | |
| parent | c70238250e25843629fd8c53e42bc3a8d34b9cfe (diff) | |
SSHClient: Also look for id_ecdsa in ~/.ssh.
I'm not using keys in ~/.ssh at all, so I missed adding ECDSA support
there as well.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | paramiko/client.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/paramiko/client.py b/paramiko/client.py index f314a4cb..0af54c8d 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -490,17 +490,23 @@ class SSHClient (object): keyfiles = [] rsa_key = os.path.expanduser('~/.ssh/id_rsa') dsa_key = os.path.expanduser('~/.ssh/id_dsa') + ecdsa_key = os.path.expanduser('~/.ssh/id_ecdsa') if os.path.isfile(rsa_key): keyfiles.append((RSAKey, rsa_key)) if os.path.isfile(dsa_key): keyfiles.append((DSSKey, dsa_key)) + if os.path.isfile(ecdsa_key): + keyfiles.append((ECDSAKey, ecdsa_key)) # look in ~/ssh/ for windows users: rsa_key = os.path.expanduser('~/ssh/id_rsa') dsa_key = os.path.expanduser('~/ssh/id_dsa') + ecdsa_key = os.path.expanduser('~/ssh/id_ecdsa') if os.path.isfile(rsa_key): keyfiles.append((RSAKey, rsa_key)) if os.path.isfile(dsa_key): keyfiles.append((DSSKey, dsa_key)) + if os.path.isfile(ecdsa_key): + keyfiles.append((ECDSAKey, ecdsa_key)) if not look_for_keys: keyfiles = [] |