Changed to password prompt for private key passphrase.

iterate-ch · Nov 8, 2017 · 6a15da9 · 6a15da9
1 parent fd77643
commit 6a15da9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/manta/src/main/java/ch/cyberduck/core/manta/MantaPublicKeyAuthentication.java b/manta/src/main/java/ch/cyberduck/core/manta/MantaPublicKeyAuthentication.java
@@ -79,7 +79,8 @@ public char[] reqPassword(Resource<?> resource) {
                     String password = keychain.find(bookmark);
                     if(StringUtils.isEmpty(password)) {
                         try {
-                            password = prompt.prompt(bookmark, credentials.getUsername(),
+                            // Use password prompt
+                            password = prompt.prompt(bookmark,
                                 LocaleFactory.localizedString("Private key password protected", "Credentials"),
                                 String.format("%s (%s)",
                                     LocaleFactory.localizedString("Enter the passphrase for the private key file", "Credentials"),

diff --git a/ssh/src/main/java/ch/cyberduck/core/sftp/auth/SFTPPublicKeyAuthentication.java b/ssh/src/main/java/ch/cyberduck/core/sftp/auth/SFTPPublicKeyAuthentication.java
@@ -99,12 +99,13 @@ public char[] reqPassword(Resource<?> resource) {
                         final String password = keychain.find(bookmark);
                         if(StringUtils.isEmpty(password)) {
                             try {
-                                return prompt.prompt(bookmark, credentials.getUsername(),
+                                // Use password prompt
+                                return prompt.prompt(bookmark,
                                     LocaleFactory.localizedString("Private key password protected", "Credentials"),
                                     String.format("%s (%s)",
                                         LocaleFactory.localizedString("Enter the passphrase for the private key file", "Credentials"),
                                         identity.getAbbreviatedPath()), new LoginOptions(bookmark.getProtocol())
-                                        .user(false).password(true)
+                                        .user(false).password(true).publickey(false)
                                 ).getPassword().toCharArray();
                             }
                             catch(LoginCanceledException e) {