Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1267 CVE 2023 48795 update sshj #1268

Merged
merged 2 commits into from
Nov 22, 2024
Merged

1267 CVE 2023 48795 update sshj #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b7e3ac
update sshj and bouncycastle to current versions
csc-gip Nov 21, 2024
0d31ce7
update for sshj and cleanup tabs
csc-gip Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions installation/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
<dependency>
<groupId>com.hierynomus</groupId>
<artifactId>sshj</artifactId>
<version>0.34.0</version>
<version>0.39.0</version>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
Expand Down Expand Up @@ -447,12 +447,22 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
<version>1.76</version>
<version>1.79</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk18on</artifactId>
<version>1.76</version>
<artifactId>bcprov-jdk18on</artifactId>
<version>1.79</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
<version>1.79</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.79</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/connection/ssh/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<Application applicationName="SSH" comment="" factoryVersion="" versionName="2.0.29" xmlVersion="1.1">
<Application applicationName="SSH" comment="" factoryVersion="" versionName="2.0.30" xmlVersion="1.1">
<ApplicationInfo>
<Description Lang="DE">SSH Connections (NETCONF, Shell), Management, SFTP, SharedLibs, SFTPTrigger</Description>
<Description Lang="EN">SSH connections (NETCONF, Shell), management, SFTP, sharedLibs, SFTPTrigger</Description>
Expand Down
4 changes: 2 additions & 2 deletions modules/xact/connection/ssh/sharedlib/SSHJUtils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gip.xyna</groupId>
<artifactId>SSHJUtils</artifactId>
<version>2.0.25</version>
<version>2.0.26</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>com.gip.xyna</groupId>
<artifactId>SSHJUtils_third_parties</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<type>pom</type>
<scope>runtime</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion modules/xact/connection/ssh/sharedlib/SSHJUtils/src/xact/ssh/HostKeyStorableRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ private HostKeyStorable addAdjusted(HostKeyStorable hostkey) {
String[] subelements = rawpublickey.trim().split("\\s+");
if (subelements.length==1) {
try {
byte[] keyBytes = net.schmizz.sshj.common.Base64.decode(hostkey.getPublickey().trim());
byte[] keyBytes = Base64.getDecoder().decode(hostkey.getPublickey().trim());
java.security.PublicKey key = new net.schmizz.sshj.common.Buffer.PlainBuffer(keyBytes).readPublicKey();
EncryptionType encryType = EncryptionType.getByStringRepresentation(key.getAlgorithm());
publickey=hostkey.getPublickey().trim();
Expand Down
14 changes: 13 additions & 1 deletion modules/xact/connection/ssh/sharedlib/SSHJUtils/third_parties.pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gip.xyna</groupId>
<artifactId>SSHJUtils_third_parties</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -38,5 +38,17 @@
<groupId>com.hierynomus</groupId>
<artifactId>sshj</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion modules/xact/ssh/file/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<RuntimeContextRequirements>
<RuntimeContextRequirement>
<ApplicationName>SSH</ApplicationName>
<VersionName>2.0.29</VersionName>
<VersionName>2.0.30</VersionName>
</RuntimeContextRequirement>
<RuntimeContextRequirement>
<ApplicationName>FileMgmt</ApplicationName>
Expand Down
2 changes: 1 addition & 1 deletion modules/xint/crypto/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<Application applicationName="Crypto" comment="" factoryVersion="" versionName="1.0.7" xmlVersion="1.1">
<Application applicationName="Crypto" comment="" factoryVersion="" versionName="1.0.8" xmlVersion="1.1">
<ApplicationInfo>
<Description Lang="DE">Cryptography</Description>
<Description Lang="EN">Cryptography</Description>
Expand Down
9 changes: 7 additions & 2 deletions modules/xint/crypto/sharedlib/pgp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gip.xyna</groupId>
<artifactId>PGPSharedLib</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -42,7 +42,12 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk18on</artifactId>
<artifactId>bcprov-jdk18on</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
Loading