From e67b78c2eb7de43f37b69e158caffee8546293a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Oct 2023 08:22:40 +0000
Subject: [PATCH 1/4] Bump com.hierynomus:sshj from 0.35.0 to 0.37.0

Bumps [com.hierynomus:sshj](https://github.com/hierynomus/sshj) from 0.35.0 to 0.37.0.
- [Commits](https://github.com/hierynomus/sshj/compare/v0.35.0...v0.37.0)

---
updated-dependencies:
- dependency-name: com.hierynomus:sshj
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 ssh/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssh/pom.xml b/ssh/pom.xml
index a78328073f3..cc00ad3ad41 100644
--- a/ssh/pom.xml
+++ b/ssh/pom.xml
@@ -23,7 +23,7 @@
     <artifactId>ssh</artifactId>
     <packaging>jar</packaging>
     <properties>
-        <sshj-version>0.35.0</sshj-version>
+        <sshj-version>0.37.0</sshj-version>
         <jsch-agentproxy-version>0.0.10</jsch-agentproxy-version>
     </properties>
     <dependencies>

From 79befbbfae7d6f7dfee9e2b65c5dc2052a1d138e Mon Sep 17 00:00:00 2001
From: David Kocher <dkocher@iterate.ch>
Date: Thu, 12 Oct 2023 10:25:49 +0200
Subject: [PATCH 2/4] Delete excludes no longer required.

---
 ssh/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ssh/pom.xml b/ssh/pom.xml
index cc00ad3ad41..115e81589c7 100644
--- a/ssh/pom.xml
+++ b/ssh/pom.xml
@@ -48,16 +48,6 @@
             <groupId>com.hierynomus</groupId>
             <artifactId>sshj</artifactId>
             <version>${sshj-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>

From 95d10f00295c20b42cc8ae9bbccdd31216939010 Mon Sep 17 00:00:00 2001
From: David Kocher <dkocher@iterate.ch>
Date: Thu, 12 Oct 2023 10:37:14 +0200
Subject: [PATCH 3/4] Replace base64 usage.

---
 .../ch/cyberduck/core/sftp/auth/SFTPAgentAuthentication.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssh/src/main/java/ch/cyberduck/core/sftp/auth/SFTPAgentAuthentication.java b/ssh/src/main/java/ch/cyberduck/core/sftp/auth/SFTPAgentAuthentication.java
index f2a85df8372..f7dd92c4a3e 100644
--- a/ssh/src/main/java/ch/cyberduck/core/sftp/auth/SFTPAgentAuthentication.java
+++ b/ssh/src/main/java/ch/cyberduck/core/sftp/auth/SFTPAgentAuthentication.java
@@ -29,6 +29,7 @@
 import ch.cyberduck.core.sftp.openssh.OpenSSHIdentitiesOnlyConfigurator;
 import ch.cyberduck.core.threading.CancelCallback;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -48,7 +49,6 @@
 import com.jcraft.jsch.agentproxy.Identity;
 import com.jcraft.jsch.agentproxy.sshj.AuthAgent;
 import net.schmizz.sshj.SSHClient;
-import net.schmizz.sshj.common.Base64;
 import net.schmizz.sshj.common.Buffer;
 import net.schmizz.sshj.transport.TransportException;
 import net.schmizz.sshj.userauth.UserAuthException;
@@ -165,7 +165,7 @@ private Collection<Identity> identityFromPublicKey(final Local identity) throws
             if(StringUtils.isNotBlank(keydata)) {
                 String[] parts = keydata.split("\\s+");
                 if(parts.length >= 2) {
-                    return Collections.singletonList(new CustomIdentity(Base64.decode(parts[1])));
+                    return Collections.singletonList(new CustomIdentity(Base64.decodeBase64(parts[1])));
                 }
             }
         }

From 0a59352079e1e6307e21061904deff3efb3e4d9e Mon Sep 17 00:00:00 2001
From: David Kocher <dkocher@iterate.ch>
Date: Mon, 29 Jan 2024 09:31:36 +0100
Subject: [PATCH 4/4] Update dependency.

---
 ssh/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssh/pom.xml b/ssh/pom.xml
index 115e81589c7..08bc9f51cbf 100644
--- a/ssh/pom.xml
+++ b/ssh/pom.xml
@@ -23,7 +23,7 @@
     <artifactId>ssh</artifactId>
     <packaging>jar</packaging>
     <properties>
-        <sshj-version>0.37.0</sshj-version>
+        <sshj-version>0.38.0</sshj-version>
         <jsch-agentproxy-version>0.0.10</jsch-agentproxy-version>
     </properties>
     <dependencies>