From eed18d7d1d089fdc1b9b2c101ae1419e9d911342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Mon, 1 Jul 2024 15:48:34 +0200
Subject: [PATCH] KARAF-7844: Upgrade to sshd 2.13.1

---
 pom.xml                                                       | 4 ++--
 .../test/java/org/apache/karaf/shell/ssh/SshUtilsTest.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 898eb1d80b8..1302dcc247c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,7 +169,7 @@
         <asm.version>9.7</asm.version>
         <javax.annotation.version>1.3.2</javax.annotation.version>
         <awaitility.version>3.1.6</awaitility.version>
-        <bouncycastle.version>1.77</bouncycastle.version>
+        <bouncycastle.version>1.78.1</bouncycastle.version>
         <camel.version>3.6.0</camel.version>
         <cglib.bundle.version>3.2.9_1</cglib.bundle.version>
         <cxf.version>3.5.5</cxf.version>
@@ -350,7 +350,7 @@
         <spring.security62.version>6.2.1_1</spring.security62.version>
 
         <sling.commons.johnzon.version>1.2.16</sling.commons.johnzon.version>
-        <sshd.version>2.12.1</sshd.version>
+        <sshd.version>2.13.1</sshd.version>
         <struts.bundle.version>1.3.10_1</struts.bundle.version>
         <xbean.version>4.24</xbean.version>
         <javax.mail.version>1.4.7</javax.mail.version>
diff --git a/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/SshUtilsTest.java b/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/SshUtilsTest.java
index 8c5beefe03c..9ed77826bf0 100644
--- a/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/SshUtilsTest.java
+++ b/shell/ssh/src/test/java/org/apache/karaf/shell/ssh/SshUtilsTest.java
@@ -34,7 +34,7 @@ public class SshUtilsTest {
     @Test
     public void testCiphersDefault() throws IOException {
         // verify our default configuration...
-        String ciphers = "aes128-ctr,aes128-cbc";
+        String ciphers = "aes128-ctr";
 
         List<NamedFactory<Cipher>> list = SshUtils.buildCiphers(ciphers.split(","));