diff options
author | yamanaka | 2004-11-02 16:54:30 +0000 |
---|---|---|
committer | yamanaka | 2004-11-02 16:54:30 +0000 |
commit | 762416f2f57d08cd7e384e29be6099b5b043b654 (patch) | |
tree | fdb479dcaa05b999b5a4ad2fd0fa1e337cf57dcc | |
parent | f8ad917d2ae27f1b8191fd2bae88bd67da77e548 (diff) | |
download | eclipse.platform.team-762416f2f57d08cd7e384e29be6099b5b043b654.tar.gz eclipse.platform.team-762416f2f57d08cd7e384e29be6099b5b043b654.tar.xz eclipse.platform.team-762416f2f57d08cd7e384e29be6099b5b043b654.zip |
* [Bug 76916] Eclipse ignores known_host file on Mac and Windows
This problem has been fixed.
* [Bug 74198] Public Key Authentication with "large" keys fails without
any hints.
At least, NPE should not be thrown.
-rw-r--r-- | bundles/org.eclipse.team.cvs.ssh2/.classpath | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.team.cvs.ssh2/about.html | 4 | ||||
-rw-r--r-- | bundles/org.eclipse.team.cvs.ssh2/build.properties | 2 | ||||
-rwxr-xr-x | bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar | bin | 0 -> 105657 bytes | |||
-rw-r--r-- | bundles/org.eclipse.team.cvs.ssh2/plugin.xml | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java | 12 |
6 files changed, 12 insertions, 10 deletions
diff --git a/bundles/org.eclipse.team.cvs.ssh2/.classpath b/bundles/org.eclipse.team.cvs.ssh2/.classpath index cbe4c6829..b0c00e5a6 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/.classpath +++ b/bundles/org.eclipse.team.cvs.ssh2/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="lib" path="jsch-0.1.17.jar"/> + <classpathentry kind="lib" path="jsch-0.1.18.jar"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.team.cvs.ssh2/about.html b/bundles/org.eclipse.team.cvs.ssh2/about.html index d19b4e09a..5fdd811f2 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/about.html +++ b/bundles/org.eclipse.team.cvs.ssh2/about.html @@ -18,14 +18,14 @@ For purposes of the CPL, "Program" shall mean the SWT.</p> <p>The Content includes items that have been sourced from third parties as follows:</p> -<h4>JSch 0.1.16</h4> +<h4>JSch 0.1.18</h4> <p>The plug-in is based on software developed by Atsuhiko Yamanaka, JCraft, Inc., and others and made available at <a href="http://www.jcraft.com/">http://www.jcraft.com/</a>. <p>The following files shall be defined as the "JSch": <ul> - <li>jsch-0.1.16.jar</li> + <li>jsch-0.1.18.jar</li> </ul> <p>Use of JSch is governed by the terms and conditions of the following license:</p> diff --git a/bundles/org.eclipse.team.cvs.ssh2/build.properties b/bundles/org.eclipse.team.cvs.ssh2/build.properties index 04a50d574..6ddeea4bb 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/build.properties +++ b/bundles/org.eclipse.team.cvs.ssh2/build.properties @@ -15,4 +15,4 @@ bin.includes = about.html,\ *.jar src.includes = about.html source.cvsssh2.jar = src/ -extra.cvsssh2.jar=jsch-0.1.16.jar +extra.cvsssh2.jar=jsch-0.1.18.jar diff --git a/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar b/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar Binary files differnew file mode 100755 index 000000000..d809be68a --- /dev/null +++ b/bundles/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar diff --git a/bundles/org.eclipse.team.cvs.ssh2/plugin.xml b/bundles/org.eclipse.team.cvs.ssh2/plugin.xml index 95946ae61..4b014129d 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/plugin.xml +++ b/bundles/org.eclipse.team.cvs.ssh2/plugin.xml @@ -17,7 +17,7 @@ <library name="cvsssh2.jar"> <export name="*"/> </library> - <library name="jsch-0.1.17.jar"> + <library name="jsch-0.1.18.jar"> </library> </runtime> diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java index c06724a99..051ba5268 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java @@ -806,14 +806,14 @@ public class CVSSSH2PreferencePage extends PreferencePage private Button removeHostKeyButton; class TableLabelProvider extends LabelProvider implements ITableLabelProvider { public String getColumnText(Object element, int columnIndex) { - KnownHosts.HostKey entry = (KnownHosts.HostKey)element; + HostKey entry = (HostKey)element; switch (columnIndex) { case 0: return entry.getHost(); case 1: return entry.getType(); case 2: - return entry.getFingerPrint(); + return entry.getFingerPrint(JSchSession.getJSch()); default: return null; } @@ -930,7 +930,8 @@ public class CVSSSH2PreferencePage extends PreferencePage Dialog.applyDialogFont(parent); JSchSession.loadKnownHosts(); - viewer.setInput(JSchSession.getJSch().getHostKeys()); + HostKeyRepository hkr=JSchSession.getJSch().getHostKeyRepository(); + viewer.setInput(hkr.getHostKey()); handleSelection(); return group; @@ -943,9 +944,10 @@ public class CVSSSH2PreferencePage extends PreferencePage private void removeHostKey(){ JSch jsch=JSchSession.getJSch(); IStructuredSelection selection = (IStructuredSelection)viewer.getSelection(); + HostKeyRepository hkr=JSchSession.getJSch().getHostKeyRepository(); for (Iterator iterator = selection.iterator(); iterator.hasNext();) { - KnownHosts.HostKey hostkey = (KnownHosts.HostKey) iterator.next(); - jsch.removeHostKey(hostkey.getHost(), hostkey.getType()); + HostKey hostkey = (HostKey) iterator.next(); + hkr.remove(hostkey.getHost(), hostkey.getType()); viewer.remove(hostkey); } } |