From 46ae65b058226fe748f8983c74f7982de94c45aa Mon Sep 17 00:00:00 2001
From: Jeremy Norris <jeremy.norris@lbnetworks.co>
Date: Tue, 1 Aug 2023 07:08:53 -0500
Subject: [PATCH] Update dependencies.

---
 pom.xml                                          | 4 ++--
 src/main/java/com/jcraft/jsch/bc/CAST128CBC.java | 6 ++++--
 src/main/java/com/jcraft/jsch/bc/CAST128CTR.java | 8 +++++---
 src/main/java/com/jcraft/jsch/bc/SEEDCBC.java    | 6 ++++--
 src/main/java/com/jcraft/jsch/bc/TwofishCBC.java | 6 ++++--
 src/main/java/com/jcraft/jsch/bc/TwofishCTR.java | 8 +++++---
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index f496cff3..0133c58e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.75</version>
+            <version>1.76</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -405,7 +405,7 @@
                         <Import-Package><![CDATA[
                             com.sun.jna*;version="${range;[=0,+)}",
                             org.apache.logging.log4j*;version="${range;[=0,4)}",
-                            org.bouncycastle*;version="[1.69,${versionmask;+})",
+                            org.bouncycastle*;version="[1.76,${versionmask;+})",
                             org.slf4j*;version="[1.7,${versionmask;+})",
                             org.ietf.jgss;resolution:=optional,
                             *
diff --git a/src/main/java/com/jcraft/jsch/bc/CAST128CBC.java b/src/main/java/com/jcraft/jsch/bc/CAST128CBC.java
index d3b6c933..62071aaa 100644
--- a/src/main/java/com/jcraft/jsch/bc/CAST128CBC.java
+++ b/src/main/java/com/jcraft/jsch/bc/CAST128CBC.java
@@ -28,9 +28,11 @@
 
 import com.jcraft.jsch.Cipher;
 import org.bouncycastle.crypto.BufferedBlockCipher;
+import org.bouncycastle.crypto.DefaultBufferedBlockCipher;
 import org.bouncycastle.crypto.engines.CAST5Engine;
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 public class CAST128CBC implements Cipher {
   private static final int ivsize = 8;
@@ -64,7 +66,7 @@ public void init(int mode, byte[] key, byte[] iv) throws Exception {
     try {
       ParametersWithIV keyspec =
           new ParametersWithIV(new KeyParameter(key, 0, key.length), iv, 0, iv.length);
-      cipher = new BufferedBlockCipher(new CBCBlockCipher(new CAST5Engine()));
+      cipher = new DefaultBufferedBlockCipher(CBCBlockCipher.newInstance(new CAST5Engine()));
       cipher.init(mode == ENCRYPT_MODE, keyspec);
     } catch (Exception e) {
       cipher = null;
diff --git a/src/main/java/com/jcraft/jsch/bc/CAST128CTR.java b/src/main/java/com/jcraft/jsch/bc/CAST128CTR.java
index 986858dd..f1821012 100644
--- a/src/main/java/com/jcraft/jsch/bc/CAST128CTR.java
+++ b/src/main/java/com/jcraft/jsch/bc/CAST128CTR.java
@@ -28,13 +28,15 @@
 
 import com.jcraft.jsch.Cipher;
 import org.bouncycastle.crypto.engines.CAST5Engine;
+import org.bouncycastle.crypto.modes.CTRModeCipher;
 import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 public class CAST128CTR implements Cipher {
   private static final int ivsize = 8;
   private static final int bsize = 16;
-  private SICBlockCipher cipher;
+  private CTRModeCipher cipher;
 
   @Override
   public int getIVSize() {
@@ -63,7 +65,7 @@ public void init(int mode, byte[] key, byte[] iv) throws Exception {
     try {
       ParametersWithIV keyspec =
           new ParametersWithIV(new KeyParameter(key, 0, key.length), iv, 0, iv.length);
-      cipher = new SICBlockCipher(new CAST5Engine());
+      cipher = SICBlockCipher.newInstance(new CAST5Engine());
       cipher.init(mode == ENCRYPT_MODE, keyspec);
     } catch (Exception e) {
       cipher = null;
diff --git a/src/main/java/com/jcraft/jsch/bc/SEEDCBC.java b/src/main/java/com/jcraft/jsch/bc/SEEDCBC.java
index dd032fde..3c9d2d4c 100644
--- a/src/main/java/com/jcraft/jsch/bc/SEEDCBC.java
+++ b/src/main/java/com/jcraft/jsch/bc/SEEDCBC.java
@@ -28,9 +28,11 @@
 
 import com.jcraft.jsch.Cipher;
 import org.bouncycastle.crypto.BufferedBlockCipher;
+import org.bouncycastle.crypto.DefaultBufferedBlockCipher;
 import org.bouncycastle.crypto.engines.SEEDEngine;
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 public class SEEDCBC implements Cipher {
   private static final int ivsize = 16;
@@ -64,7 +66,7 @@ public void init(int mode, byte[] key, byte[] iv) throws Exception {
     try {
       ParametersWithIV keyspec =
           new ParametersWithIV(new KeyParameter(key, 0, key.length), iv, 0, iv.length);
-      cipher = new BufferedBlockCipher(new CBCBlockCipher(new SEEDEngine()));
+      cipher = new DefaultBufferedBlockCipher(CBCBlockCipher.newInstance(new SEEDEngine()));
       cipher.init(mode == ENCRYPT_MODE, keyspec);
     } catch (Exception e) {
       cipher = null;
diff --git a/src/main/java/com/jcraft/jsch/bc/TwofishCBC.java b/src/main/java/com/jcraft/jsch/bc/TwofishCBC.java
index 716de0a5..2a875497 100644
--- a/src/main/java/com/jcraft/jsch/bc/TwofishCBC.java
+++ b/src/main/java/com/jcraft/jsch/bc/TwofishCBC.java
@@ -28,9 +28,11 @@
 
 import com.jcraft.jsch.Cipher;
 import org.bouncycastle.crypto.BufferedBlockCipher;
+import org.bouncycastle.crypto.DefaultBufferedBlockCipher;
 import org.bouncycastle.crypto.engines.TwofishEngine;
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 abstract class TwofishCBC implements Cipher {
   private static final int ivsize = 16;
@@ -59,7 +61,7 @@ public void init(int mode, byte[] key, byte[] iv) throws Exception {
     try {
       ParametersWithIV keyspec =
           new ParametersWithIV(new KeyParameter(key, 0, key.length), iv, 0, iv.length);
-      cipher = new BufferedBlockCipher(new CBCBlockCipher(new TwofishEngine()));
+      cipher = new DefaultBufferedBlockCipher(CBCBlockCipher.newInstance(new TwofishEngine()));
       cipher.init(mode == ENCRYPT_MODE, keyspec);
     } catch (Exception e) {
       cipher = null;
diff --git a/src/main/java/com/jcraft/jsch/bc/TwofishCTR.java b/src/main/java/com/jcraft/jsch/bc/TwofishCTR.java
index e86c7285..ab6ad230 100644
--- a/src/main/java/com/jcraft/jsch/bc/TwofishCTR.java
+++ b/src/main/java/com/jcraft/jsch/bc/TwofishCTR.java
@@ -28,12 +28,14 @@
 
 import com.jcraft.jsch.Cipher;
 import org.bouncycastle.crypto.engines.TwofishEngine;
+import org.bouncycastle.crypto.modes.CTRModeCipher;
 import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.*;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 abstract class TwofishCTR implements Cipher {
   private static final int ivsize = 16;
-  private SICBlockCipher cipher;
+  private CTRModeCipher cipher;
 
   @Override
   public int getIVSize() {
@@ -58,7 +60,7 @@ public void init(int mode, byte[] key, byte[] iv) throws Exception {
     try {
       ParametersWithIV keyspec =
           new ParametersWithIV(new KeyParameter(key, 0, key.length), iv, 0, iv.length);
-      cipher = new SICBlockCipher(new TwofishEngine());
+      cipher = SICBlockCipher.newInstance(new TwofishEngine());
       cipher.init(mode == ENCRYPT_MODE, keyspec);
     } catch (Exception e) {
       cipher = null;