Skip to content

Commit 30134f2

Browse files
msohnmsohn
committed
Update Apache sshd to 2.14.0
This fixes an 'incorrect signature' error when trying to use the keys generated by SSHD during server init with an OpenSSH client. This also includes a few other changes since 2.13.2: * GH-524 Performance improvements * GH-533 Fix multi-step authentication * GH-582 Fix filtering in NamedFactory * GH-587 Prevent NullPointerExceptionon closed channel in NettyIoSession * GH-590 Better support for FIPS * GH-597 Pass on Charset in ClientSession.executeRemoteCommand() https://github.com/apache/mina-sshd/releases/tag/sshd-2.14.0 Change-Id: I76909fd56e70ee4ce16a075bd40ed6b2a609cc47
1 parent 81d552e commit 30134f2

File tree

24 files changed

+151
-151
lines changed

24 files changed

+151
-151
lines changed

‎WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@ maven_jar(
108108
sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850",
109109
)
110110

111-
SSHD_VERS = "2.13.2"
111+
SSHD_VERS = "2.14.0"
112112

113113
maven_jar(
114114
name = "sshd-osgi",
115115
artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
116-
sha1 = "34914a5bef9ba3d04971fdec1273b47df835b038",
116+
sha1 = "6ef66228a088f8ac1383b2ff28f3102f80ebc01a",
117117
)
118118

119119
maven_jar(
120120
name = "sshd-sftp",
121121
artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
122-
sha1 = "334f42d5bbc8afb7f1149a37d10f8718cf59cc06",
122+
sha1 = "c070ac920e72023ae9ab0a3f3a866bece284b470",
123123
)
124124

125125
JNA_VERS = "5.15.0"

‎org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ Bundle-Localization: OSGI-INF/l10n/plugin
88
Bundle-Vendor: %Bundle-Vendor
99
Bundle-ActivationPolicy: lazy
1010
Bundle-RequiredExecutionEnvironment: JavaSE-17
11-
Import-Package: org.apache.sshd.common;version="[2.13.2,2.14.0)",
12-
org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)",
13-
org.apache.sshd.common.file.virtualfs;version="[2.13.2,2.14.0)",
14-
org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)",
15-
org.apache.sshd.common.io;version="[2.13.2,2.14.0)",
16-
org.apache.sshd.common.kex;version="[2.13.2,2.14.0)",
17-
org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)",
18-
org.apache.sshd.common.session;version="[2.13.2,2.14.0)",
19-
org.apache.sshd.common.signature;version="[2.13.2,2.14.0)",
20-
org.apache.sshd.common.util.buffer;version="[2.13.2,2.14.0)",
21-
org.apache.sshd.common.util.logging;version="[2.13.2,2.14.0)",
22-
org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)",
23-
org.apache.sshd.common.util.threads;version="[2.13.2,2.14.0)",
24-
org.apache.sshd.core;version="[2.13.2,2.14.0)",
25-
org.apache.sshd.server;version="[2.13.2,2.14.0)",
26-
org.apache.sshd.server.auth;version="[2.13.2,2.14.0)",
27-
org.apache.sshd.server.auth.gss;version="[2.13.2,2.14.0)",
28-
org.apache.sshd.server.auth.keyboard;version="[2.13.2,2.14.0)",
29-
org.apache.sshd.server.auth.password;version="[2.13.2,2.14.0)",
30-
org.apache.sshd.server.command;version="[2.13.2,2.14.0)",
31-
org.apache.sshd.server.session;version="[2.13.2,2.14.0)",
32-
org.apache.sshd.server.shell;version="[2.13.2,2.14.0)",
33-
org.apache.sshd.server.subsystem;version="[2.13.2,2.14.0)",
34-
org.apache.sshd.sftp;version="[2.13.2,2.14.0)",
35-
org.apache.sshd.sftp.server;version="[2.13.2,2.14.0)",
11+
Import-Package: org.apache.sshd.common;version="[2.14.0,2.15.0)",
12+
org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)",
13+
org.apache.sshd.common.file.virtualfs;version="[2.14.0,2.15.0)",
14+
org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)",
15+
org.apache.sshd.common.io;version="[2.14.0,2.15.0)",
16+
org.apache.sshd.common.kex;version="[2.14.0,2.15.0)",
17+
org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)",
18+
org.apache.sshd.common.session;version="[2.14.0,2.15.0)",
19+
org.apache.sshd.common.signature;version="[2.14.0,2.15.0)",
20+
org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)",
21+
org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)",
22+
org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)",
23+
org.apache.sshd.common.util.threads;version="[2.14.0,2.15.0)",
24+
org.apache.sshd.core;version="[2.14.0,2.15.0)",
25+
org.apache.sshd.server;version="[2.14.0,2.15.0)",
26+
org.apache.sshd.server.auth;version="[2.14.0,2.15.0)",
27+
org.apache.sshd.server.auth.gss;version="[2.14.0,2.15.0)",
28+
org.apache.sshd.server.auth.keyboard;version="[2.14.0,2.15.0)",
29+
org.apache.sshd.server.auth.password;version="[2.14.0,2.15.0)",
30+
org.apache.sshd.server.command;version="[2.14.0,2.15.0)",
31+
org.apache.sshd.server.session;version="[2.14.0,2.15.0)",
32+
org.apache.sshd.server.shell;version="[2.14.0,2.15.0)",
33+
org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)",
34+
org.apache.sshd.sftp;version="[2.14.0,2.15.0)",
35+
org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)",
3636
org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)",
3737
org.eclipse.jgit.api;version="[7.1.0,7.2.0)",
3838
org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)",

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.17" sequenceNumber="1727792939">
4+
<target name="jgit-4.17" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.18" sequenceNumber="1727792939">
4+
<target name="jgit-4.18" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.19-staging" sequenceNumber="1727792939">
4+
<target name="jgit-4.19-staging" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.20" sequenceNumber="1727792939">
4+
<target name="jgit-4.20" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.21" sequenceNumber="1727792939">
4+
<target name="jgit-4.21" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.22" sequenceNumber="1727792939">
4+
<target name="jgit-4.22" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.23" sequenceNumber="1727792939">
4+
<target name="jgit-4.23" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.24" sequenceNumber="1727792939">
4+
<target name="jgit-4.24" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.25" sequenceNumber="1727792939">
4+
<target name="jgit-4.25" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.26" sequenceNumber="1727792939">
4+
<target name="jgit-4.26" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.27" sequenceNumber="1727792939">
4+
<target name="jgit-4.27" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.28" sequenceNumber="1727792939">
4+
<target name="jgit-4.28" sequenceNumber="1728432373">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>org.apache.sshd</groupId>
6565
<artifactId>sshd-osgi</artifactId>
66-
<version>2.13.2</version>
66+
<version>2.14.0</version>
6767
<type>jar</type>
6868
</dependency>
6969
<dependency>
7070
<groupId>org.apache.sshd</groupId>
7171
<artifactId>sshd-sftp</artifactId>
72-
<version>2.13.2</version>
72+
<version>2.14.0</version>
7373
<type>jar</type>
7474
</dependency>
7575
</dependencies>

0 commit comments

Comments
 (0)