Use Windows system certificate store if requested by system properties

eclipse-ee4j · Sep 23, 2024 · 87d4096 · 87d4096
1 parent d0c6f63
commit 87d4096
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/client/src/main/java/org/glassfish/tyrus/client/SslContextConfigurator.java b/client/src/main/java/org/glassfish/tyrus/client/SslContextConfigurator.java
@@ -578,6 +578,17 @@ public SSLContext createSSLContext() {
             TrustManagerFactory trustManagerFactory = null;
             KeyManagerFactory keyManagerFactory = null;
 
+            if ("SunMSCAPI".equals(System.getProperty(TRUST_STORE_PROVIDER))) {
+                try {
+                    KeyStore keyStore = KeyStore.getInstance(System.getProperty(TRUST_STORE_TYPE), "SunMSCAPI");
+                    keyStore.load(null, null);
+                    trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                    trustManagerFactory.init(keyStore);
+                } catch (Throwable e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
             if (keyStoreBytes != null || keyStoreFile != null) {
                 try {
                     KeyStore keyStore;

diff --git a/...client/src/main/java/org/glassfish/tyrus/container/jdk/client/SslContextConfigurator.java b/...client/src/main/java/org/glassfish/tyrus/container/jdk/client/SslContextConfigurator.java
@@ -524,6 +524,17 @@ public SSLContext createSSLContext() {
 
         try {
             TrustManagerFactory trustManagerFactory = null;
+            if ("SunMSCAPI".equals(System.getProperty(TRUST_STORE_PROVIDER))) {
+                try {
+                    KeyStore keyStore = KeyStore.getInstance(System.getProperty(TRUST_STORE_TYPE), "SunMSCAPI");
+                    keyStore.load(null, null);
+                    trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                    trustManagerFactory.init(keyStore);
+                } catch (Throwable e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
             KeyManagerFactory keyManagerFactory = null;
 
             if (keyStoreBytes != null || keyStoreFile != null) {