Switch remaining uses of jks keystores to pkcs12

rh-openjdk · Jul 11, 2023 · 54dc1c9 · 54dc1c9
1 parent 616f1c2
commit 54dc1c9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -109,13 +109,13 @@ JAVA_SECURITY_PARAMS := $(shell \
         if cat "$(JAVA_CONF_DIR)/security/java.security" 2>&1 | grep -q '^fips.keystore.type=pkcs12' ; then \
             printf '%s ' -Djavax.net.ssl.keyStore=$(KEYSTORE_P12) ; \
             printf '%s ' -Djavax.net.ssl.keyStorePassword=$(KEYSTORE_PASSWORD) ; \
-            printf '%s ' -Djavax.net.ssl.trustStore=$(TRUSTSTORE_JKS) ; \
+            printf '%s ' -Djavax.net.ssl.trustStore=$(TRUSTSTORE_P12) ; \
             printf '%s ' -Djavax.net.ssl.trustStorePassword=$(TRUSTSTORE_PASSWORD) ; \
         fi ; \
     else \
-        printf '%s ' -Djavax.net.ssl.keyStore=$(KEYSTORE_JKS) ; \
+        printf '%s ' -Djavax.net.ssl.keyStore=$(KEYSTORE_P12) ; \
         printf '%s ' -Djavax.net.ssl.keyStorePassword=$(KEYSTORE_PASSWORD) ; \
-        printf '%s ' -Djavax.net.ssl.trustStore=$(TRUSTSTORE_JKS) ; \
+        printf '%s ' -Djavax.net.ssl.trustStore=$(TRUSTSTORE_P12) ; \
         printf '%s ' -Djavax.net.ssl.trustStorePassword=$(TRUSTSTORE_PASSWORD) ; \
     fi ; \
     if [ 1 = "$(TEST_PKCS11_FIPS)" ] || [ 1 = "$(SSLTESTS_USE_OPENSSL_CLIENT)" ] ; then \
@@ -135,10 +135,10 @@ JAVA_SECURITY_DEPS := $(shell \
     elif [ 1 = "$(TEST_PKCS11_FIPS)" ] ; then \
         printf '%s ' $(JAVA_PKCS11_FIPS_SECURITY_CFG) ; \
         if cat "$(JAVA_CONF_DIR)/security/java.security" 2>&1 | grep -q '^fips.keystore.type=pkcs12' ; then \
-            printf '%s %s ' $(KEYSTORE_P12) $(TRUSTSTORE_JKS) ; \
+            printf '%s %s ' $(KEYSTORE_P12) $(TRUSTSTORE_P12) ; \
         fi ; \
     else \
-        printf '%s %s ' $(KEYSTORE_JKS) $(TRUSTSTORE_JKS) ; \
+        printf '%s %s ' $(KEYSTORE_P12) $(TRUSTSTORE_P12) ; \
     fi ; \
 )
 SEP := $(shell if uname -s | grep -qi cygwin ; then printf ';' ; else printf ':' ; fi )