From 7cb0cf55b94ee58670c8063887877cda9637871c Mon Sep 17 00:00:00 2001
From: ARPIT GUPTA <gupta.arpit@salesforce.com>
Date: Mon, 8 Apr 2024 13:13:07 +0530
Subject: [PATCH 1/4] Removed bouncy castle hard bound provider, fixed
 corresponding junit

---
 pom.xml                                               | 11 ++++-------
 .../extension/sftp/AbstractSftpConnectorTestCase.java |  1 -
 src/test/java/org/mule/extension/sftp/SftpServer.java |  6 ------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5fea27cd..e4c72dea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,10 @@
                     <groupId>org.apache.sshd</groupId>
                     <artifactId>sshd-core</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -161,13 +165,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>${bcprovJDK15on.version}</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.mule.runtime</groupId>
             <artifactId>mule-core</artifactId>
diff --git a/src/test/java/org/mule/extension/sftp/AbstractSftpConnectorTestCase.java b/src/test/java/org/mule/extension/sftp/AbstractSftpConnectorTestCase.java
index b2ed34e7..586bda7b 100644
--- a/src/test/java/org/mule/extension/sftp/AbstractSftpConnectorTestCase.java
+++ b/src/test/java/org/mule/extension/sftp/AbstractSftpConnectorTestCase.java
@@ -18,7 +18,6 @@
         "org.apache.sshd:sshd-common",
         "org.apache.sshd:sshd-scp",
         "org.apache.sshd:sshd-core",
-        "org.bouncycastle:bcprov-jdk15on",
         "net.i2p.crypto:eddsa"
     },
     applicationRuntimeLibs = {"org.slf4j:slf4j-api"},
diff --git a/src/test/java/org/mule/extension/sftp/SftpServer.java b/src/test/java/org/mule/extension/sftp/SftpServer.java
index 769cc53f..940c7207 100644
--- a/src/test/java/org/mule/extension/sftp/SftpServer.java
+++ b/src/test/java/org/mule/extension/sftp/SftpServer.java
@@ -22,7 +22,6 @@
 import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
 import org.apache.sshd.sftp.server.SftpSubsystemFactory;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 public class SftpServer {
 
@@ -35,7 +34,6 @@ public class SftpServer {
   public SftpServer(int port, Path path) {
     this.port = port;
     this.path = path;
-    configureSecurityProvider();
     SftpSubsystemFactory factory = createFtpSubsystemFactory();
     sshdServer = SshServer.setUpDefaultServer();
     configureSshdServer(factory);
@@ -65,10 +63,6 @@ private SftpSubsystemFactory createFtpSubsystemFactory() {
     return new SftpSubsystemFactory();
   }
 
-  private void configureSecurityProvider() {
-    Security.addProvider(new BouncyCastleProvider());
-  }
-
   private static PasswordAuthenticator passwordAuthenticator() {
     return (arg0, arg1, arg2) -> USERNAME.equals(arg0) && PASSWORD.equals(arg1);
   }

From a57a5d0a90ae913eebd0bb9174712a970fc1ca54 Mon Sep 17 00:00:00 2001
From: Dipesh Kumar Dutta <dipeshkumar.dutta@salesforce.com>
Date: Mon, 1 Apr 2024 14:05:04 +0530
Subject: [PATCH 2/4] Fix FIPS testcases

---
 pom.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index e4c72dea..b20aff38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <formatterConfigPath>formatter.xml</formatterConfigPath>
         <settingsFile>${java.io.tmpdir}/effective-settings.xml</settingsFile>
         <mtf.tools.version>1.2.0</mtf.tools.version>
-        <mtf.javaopts></mtf.javaopts>
+<!--        <mtf.javaopts></mtf.javaopts>-->
         <jacoco.version>0.8.10</jacoco.version>
         <maven.impsort.plugin.version>1.6.2</maven.impsort.plugin.version>
         <maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
@@ -118,6 +118,7 @@
             <groupId>net.i2p.crypto</groupId>
             <artifactId>eddsa</artifactId>
             <version>${eddsa.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -273,11 +274,11 @@
                             -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${session.executionRootDirectory}/target/jacoco-munit.exec
                         </argLine>
                     </argLines>
-                    <environmentVariables>
-                        <!-- Toggles the JDK17 style flag -->
-                        <!-- ugly hack -->
-                        <_JAVA_OPTIONS>-XX:+PrintCommandLineFlags ${mtf.javaopts}</_JAVA_OPTIONS>
-                    </environmentVariables>
+<!--                    <environmentVariables>-->
+<!--                        &lt;!&ndash; Toggles the JDK17 style flag &ndash;&gt;-->
+<!--                        &lt;!&ndash; ugly hack &ndash;&gt;-->
+<!--                        <_JAVA_OPTIONS>-XX:+PrintCommandLineFlags ${mtf.javaopts}</_JAVA_OPTIONS>-->
+<!--                    </environmentVariables>-->
                 </configuration>
                 <dependencies>
                     <dependency>

From c4c9402301e309da199e24d8104dde8a6fb44cf2 Mon Sep 17 00:00:00 2001
From: ARPIT GUPTA <gupta.arpit@salesforce.com>
Date: Fri, 3 May 2024 10:22:23 +0530
Subject: [PATCH 3/4] W-15551780: Removed eddsa dependency from pom

---
 pom.xml                                                    | 7 -------
 .../mule/extension/sftp/AbstractSftpConnectorTestCase.java | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index b20aff38..244ea2ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,13 +114,6 @@
             <version>${sshdVersion}</version>
         </dependency>
 
-        <dependency>
-            <groupId>net.i2p.crypto</groupId>
-            <artifactId>eddsa</artifactId>
-            <version>${eddsa.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/src/test/java/org/mule/extension/sftp/AbstractSftpConnectorTestCase.java b/src/test/java/org/mule/extension/sftp/AbstractSftpConnectorTestCase.java
index 586bda7b..de70f406 100644
--- a/src/test/java/org/mule/extension/sftp/AbstractSftpConnectorTestCase.java
+++ b/src/test/java/org/mule/extension/sftp/AbstractSftpConnectorTestCase.java
@@ -17,8 +17,7 @@
         "org.apache.sshd:sshd-sftp",
         "org.apache.sshd:sshd-common",
         "org.apache.sshd:sshd-scp",
-        "org.apache.sshd:sshd-core",
-        "net.i2p.crypto:eddsa"
+        "org.apache.sshd:sshd-core"
     },
     applicationRuntimeLibs = {"org.slf4j:slf4j-api"},
     exportPluginClasses = {SftpClientFactory.class, SftpClient.class, SftpUtils.class})

From 7ebea7b1fc97d288ac18ea1d8d21ba445ff21167 Mon Sep 17 00:00:00 2001
From: ARPIT GUPTA <gupta.arpit@salesforce.com>
Date: Fri, 3 May 2024 11:16:11 +0530
Subject: [PATCH 4/4] W-15551780: Updated pom

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 244ea2ae..1c203740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,11 +46,10 @@
         <settingsFile>${java.io.tmpdir}/effective-settings.xml</settingsFile>
         <mtf.tools.version>1.2.0</mtf.tools.version>
 <!--        <mtf.javaopts></mtf.javaopts>-->
-        <jacoco.version>0.8.10</jacoco.version>
+        <jacoco.version>0.8.12</jacoco.version>
         <maven.impsort.plugin.version>1.6.2</maven.impsort.plugin.version>
         <maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
         <importGoal>check</importGoal>
-        <eddsa.version>0.3.0</eddsa.version>
         <slf4jApi.version>2.0.12</slf4jApi.version>
         <tikaCore.version>2.9.1</tikaCore.version>
         <bcprovJDK15on.version>1.59</bcprovJDK15on.version>