Set keystore type to PKCS12

wso2 · Nov 8, 2024 · dc58661 · dc58661
1 parent 41f10ee
commit dc58661
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.../org/wso2/identity/integration/common/clients/sso/saml/query/ClientSignKeyDataHolder.java b/.../org/wso2/identity/integration/common/clients/sso/saml/query/ClientSignKeyDataHolder.java
@@ -60,6 +60,8 @@ public class ClientSignKeyDataHolder implements X509Credential {
 
     private PublicKey publicKey = null;
 
+    private static final String KEYSTORE_TYPE = "PKCS12";
+
     /**
      * Constructor method
      * @param keyStorePath path to the key store
@@ -75,7 +77,7 @@ public ClientSignKeyDataHolder(String keyStorePath,  String password, String key
         try {
             File file = new File(keyStorePath);
             is = new FileInputStream(file);
-            KeyStore keystore = KeystoreUtils.getKeystoreInstance(KeyStore.getDefaultType());
+            KeyStore keystore = KeystoreUtils.getKeystoreInstance(KEYSTORE_TYPE);
             keystore.load(is, password.toCharArray());
 
             privateKey = (PrivateKey) keystore.getKey(keyAlias, password.toCharArray());

diff --git a/...ckend/src/test/java/org/wso2/identity/integration/test/base/MockOIDCIdentityProvider.java b/...ckend/src/test/java/org/wso2/identity/integration/test/base/MockOIDCIdentityProvider.java
@@ -31,6 +31,7 @@
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
 import org.wso2.carbon.utils.security.KeystoreUtils;
+import org.wso2.identity.integration.common.utils.ISIntegrationTest;
 import org.wso2.identity.integration.test.util.Utils;
 
 import java.io.FileInputStream;
@@ -71,7 +72,7 @@ public void start() {
         wireMockServer = new WireMockServer(WireMockConfiguration.wireMockConfig()
                 .httpsPort(8089)
                 .keystorePath(Paths.get(Utils.getResidentCarbonHome(), "repository", "resources", "security",
-                        "wso2carbon.p12").toAbsolutePath().toString())
+                        ISIntegrationTest.KEYSTORE_NAME).toAbsolutePath().toString())
                 .keystorePassword("wso2carbon")
                 .keyManagerPassword("wso2carbon")
                 .extensions(
@@ -179,7 +180,7 @@ public void verifyForLogoutFlow() {
 
     private String buildIdToken() throws Exception {
 
-        KeyStore wso2KeyStore = getKeyStoreFromFile("wso2carbon.p12", "wso2carbon",
+        KeyStore wso2KeyStore = getKeyStoreFromFile(ISIntegrationTest.KEYSTORE_NAME, "wso2carbon",
                 Utils.getResidentCarbonHome());
         RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) wso2KeyStore.getKey("wso2carbon", "wso2carbon".toCharArray());
 
@@ -213,7 +214,7 @@ private KeyStore getKeyStoreFromFile(String keystoreName, String password, Strin
 
         Path tenantKeystorePath = Paths.get(home, "repository", "resources", "security", keystoreName);
         FileInputStream file = new FileInputStream(tenantKeystorePath.toString());
-        KeyStore keystore = KeystoreUtils.getKeystoreInstance(KeyStore.getDefaultType());
+        KeyStore keystore = KeystoreUtils.getKeystoreInstance(ISIntegrationTest.KEYSTORE_TYPE);
         keystore.load(file, password.toCharArray());
         return keystore;
     }

diff --git a/...ain/java/org/wso2/identity/scenarios/commons/security/SSOAgentX509KeyStoreCredential.java b/...ain/java/org/wso2/identity/scenarios/commons/security/SSOAgentX509KeyStoreCredential.java
@@ -98,7 +98,7 @@ protected void readX509Credentials(InputStream keyStoreInputStream, char[] keySt
                                        char[] privateKeyPassword)
             throws Exception {
         try {
-            KeyStore keyStore = KeystoreUtils.getKeystoreInstance("PKCS12");
+            KeyStore keyStore = Keystore.getInstance("PKCS12");
             keyStore.load(keyStoreInputStream, keyStorePassword);
             readX509Credentials(keyStore, publicCertAlias, privateKeyAlias, privateKeyPassword);
         } catch (Exception e) {