From 47dbf77ad58228f59ef0caaa4f4f1e128aeb5d3e Mon Sep 17 00:00:00 2001
From: kcichonczyk <88378534+kcichonczyk@users.noreply.github.com>
Date: Fri, 17 Mar 2023 09:14:36 +0100
Subject: [PATCH] Feature/acs 4460 mtls support (#752)

* ACS-4460: Release T-Core (T-Engines) 3.0.1-A3 [release], Truststore  type fix.
---
 .../java/org/alfresco/transform/base/config/MTLSConfig.java   | 4 +++-
 .../test/java/org/alfresco/transform/base/MtlsTestUtils.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java b/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
index 12ed0761..d231623f 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/config/MTLSConfig.java
@@ -116,7 +116,9 @@ public class MTLSConfig {
         }
         if(isTruststoreConfigured())
         {
-            sslContextBuilder.loadTrustMaterial(trustStoreResource.getURL(), trustStorePassword);
+            sslContextBuilder
+                    .setKeyStoreType(trustStoreType)
+                    .loadTrustMaterial(trustStoreResource.getURL(), trustStorePassword);
         }
 
         return sslContextBuilder;
diff --git a/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java b/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
index 3f7f5fdf..ecaea580 100644
--- a/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
+++ b/engines/base/src/test/java/org/alfresco/transform/base/MtlsTestUtils.java
@@ -47,7 +47,9 @@ public class MtlsTestUtils {
         }
 
         File trustStore = new File(trustStoreFile);
-        sslContextBuilder.loadTrustMaterial(trustStore, trustStorePassword);
+        sslContextBuilder
+                .setKeyStoreType(trustStoreType)
+                .loadTrustMaterial(trustStore, trustStorePassword);
 
         SSLContext sslContext = sslContextBuilder.build();
         SSLConnectionSocketFactory sslContextFactory = new SSLConnectionSocketFactory(sslContext);