Enh 36550340 - ENH: [Beta] - Change the default keystore type in 14.1…

….2 to PKCS12 (main -> ce-main@108733) [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 108885]
oracle · May 8, 2024 · 1232876 · 1232876
1 parent 64d79e8
commit 1232876
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/prj/coherence-core/src/main/java/com/oracle/coherence/common/net/SSLSocketProvider.java b/prj/coherence-core/src/main/java/com/oracle/coherence/common/net/SSLSocketProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -373,7 +373,7 @@ public interface Dependencies
         /**
         * The default keystore type.
         */
-        String DEFAULT_KEYSTORE_TYPE = KEYSTORE_TYPE_JKS;
+        String DEFAULT_KEYSTORE_TYPE = KEYSTORE_TYPE_PKCS12;
         }
 
 

diff --git a/prj/test/functional/ssl/src/main/java/ssl/SSLSocketProviderTest.java b/prj/test/functional/ssl/src/main/java/ssl/SSLSocketProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -84,6 +84,17 @@ public void testSimpleServerConfiguration()
         assertThat(sslDeps.getHostnameVerifier(), is(nullValue()));
         }
 
+    @Test
+    public void testSimpleServerP12Configuration()
+        {
+        SSLSocketProviderDefaultDependencies sslDeps = loadDependencies("ssl-config-p12-server.xml");
+        SSLContext ctx = sslDeps.getSSLContext();
+        assertThat(ctx, is(notNullValue()));
+        assertThat(ctx.getProtocol(), is(SSLSocketProviderDefaultDependencies.DEFAULT_SSL_PROTOCOL));
+        assertThat(sslDeps.getExecutor(), is(notNullValue()));
+        assertThat(sslDeps.getHostnameVerifier(), is(nullValue()));
+        }
+
     @Test
     public void testCustomConfiguration()
             throws IOException

diff --git a/prj/test/functional/ssl/src/main/resources/ssl-config-p12-server.xml b/prj/test/functional/ssl/src/main/resources/ssl-config-p12-server.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+  Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+
+  Licensed under the Universal Permissive License v 1.0 as shown at
+  https://oss.oracle.com/licenses/upl.
+  -->
+<ssl>
+  <identity-manager>
+    <key-store>
+      <url>file:server.p12</url>
+      <password>password</password>
+    </key-store>
+    <password>password</password>
+  </identity-manager>
+
+  <trust-manager>
+    <key-store>
+      <url>file:client.p12</url>
+      <password>password</password>
+    </key-store>
+  </trust-manager>
+</ssl>