diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 15:40:25 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 15:40:25 -0700 |
| commit | dc9de3f3c37752e5ee2b36bb4e9747e767baea14 (patch) | |
| tree | 7a09b0e5872c08963229dc7feeab85116be2da5e | |
| parent | 1a162428dd8ee6dc7b44d97aa7237bcb83145f42 (diff) | |
Formatting tweaks
| -rw-r--r-- | paramiko/client.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/paramiko/client.py b/paramiko/client.py index 4d269d0d..4326abbd 100644 --- a/paramiko/client.py +++ b/paramiko/client.py @@ -185,7 +185,8 @@ class SSHClient (object): - The ``pkey`` or ``key_filename`` passed in (if any) - Any key we can find through an SSH agent - - Any "id_rsa" or "id_dsa" key discoverable in ``~/.ssh/`` + - Any "id_rsa", "id_dsa" or "id_ecdsa" key discoverable in + ``~/.ssh/`` - Plain username/password auth, if a password was given If a private key requires a password to unlock it, and a password is @@ -361,7 +362,8 @@ class SSHClient (object): - The key passed in, if one was passed in. - Any key we can find through an SSH agent (if allowed). - - Any "id_rsa" or "id_dsa" key discoverable in ~/.ssh/ (if allowed). + - Any "id_rsa", "id_dsa" or "id_ecdsa" key discoverable in ~/.ssh/ + (if allowed). - Plain username/password auth, if a password was given. (The password might be needed to unlock a private key, or for |