Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryamanaka2004-06-16 08:23:49 +0000
committeryamanaka2004-06-16 08:23:49 +0000
commitb655f04a6b50a5c87d088d2a2e7732b27f928715 (patch)
treed8a005d2813a75615cf1d6c3b88993fc2884157a
parentf4b231099ada64512a09a54c570eef6858e9cdf6 (diff)
downloadeclipse.platform.team-b655f04a6b50a5c87d088d2a2e7732b27f928715.tar.gz
eclipse.platform.team-b655f04a6b50a5c87d088d2a2e7732b27f928715.tar.xz
eclipse.platform.team-b655f04a6b50a5c87d088d2a2e7732b27f928715.zip
Bug 66493: [SSH2] keyboard-interactive
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.15.jarbin100755 -> 0 bytes
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jarbin99777 -> 101612 bytes
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java14
3 files changed, 13 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.15.jar b/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.15.jar
deleted file mode 100644
index fc568041f..000000000
--- a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.15.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar b/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar
index 4b1441a7d..3f77d8988 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar
+++ b/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar
Binary files differ
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
index 54bf41fa4..7d232da72 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
@@ -19,6 +19,7 @@ import java.util.Enumeration;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.team.internal.ccvs.core.CVSException;
@@ -157,7 +158,12 @@ class JSchSession {
public void setUsername(String username) {
}
};
- authenticator.promptForUserInfo(includeLocation ? location : null, info, message);
+ try{
+ authenticator.promptForUserInfo(includeLocation ? location : null, info, message);
+ }
+ catch(OperationCanceledException e){
+ _password[0]=null;
+ }
return _password[0];
}
public boolean promptPassphrase(String message) {
@@ -212,6 +218,9 @@ class JSchSession {
echo);
return result;
}
+ catch(OperationCanceledException e){
+ return null;
+ }
catch(CVSException e){
return null;
}
@@ -300,6 +309,9 @@ class JSchSession {
return session;
} catch (JSchException e) {
pool.remove(key);
+ if(e.toString().indexOf("Auth cancel")!=-1){ //$NON-NLS-1$
+ throw new OperationCanceledException(""); //$NON-NLS-1$
+ }
throw e;
}
}

Back to the top