diff options
| author | Delano Mandelbaum <delano.mandelbaum@gmail.com> | 2013-09-10 16:53:56 -0700 |
|---|---|---|
| committer | Delano Mandelbaum <delano.mandelbaum@gmail.com> | 2013-09-10 16:53:56 -0700 |
| commit | f0570418fbbc911b7406c2d9eba6f7493b949801 (patch) | |
| tree | 4b11fde998d6339e34fbb82077cd542081f29e0f | |
| parent | a158fa5f41ce852e1eedb249a2abe52d39bc5fa1 (diff) | |
| parent | 4e36e97302f3bd1e5ea293618181785e04086434 (diff) | |
| download | net-ssh-f0570418fbbc911b7406c2d9eba6f7493b949801.tar.gz | |
Merge pull request #120 from metametaclass/master
fix for 'Could not parse PKey: no start line' error on private keys with passphrases
| -rw-r--r-- | lib/net/ssh/authentication/key_manager.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/net/ssh/authentication/key_manager.rb b/lib/net/ssh/authentication/key_manager.rb index 80bff95..dbbf699 100644 --- a/lib/net/ssh/authentication/key_manager.rb +++ b/lib/net/ssh/authentication/key_manager.rb @@ -229,6 +229,9 @@ module Net else identity end + rescue ArgumentError => e + process_identity_loading_error(identity, e) + nil rescue Exception => e process_identity_loading_error(identity, e) nil |