diff --git a/modules/distribution/src/repository/resources/conf/catalina-server.xml b/modules/distribution/src/repository/resources/conf/catalina-server.xml index bfa5526d978..da4d825e4a5 100644 --- a/modules/distribution/src/repository/resources/conf/catalina-server.xml +++ b/modules/distribution/src/repository/resources/conf/catalina-server.xml @@ -73,7 +73,7 @@ disableUploadTimeout="false" secure="true" keystorePass="wso2carbon" - keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.jks" + keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.p12" maxThreads="250" acceptCount="200" bindOnInit="false" diff --git a/modules/distribution/src/repository/resources/conf/default.json b/modules/distribution/src/repository/resources/conf/default.json index 8b1c7f10b5b..37b99be4956 100644 --- a/modules/distribution/src/repository/resources/conf/default.json +++ b/modules/distribution/src/repository/resources/conf/default.json @@ -5,9 +5,9 @@ }, "user_store.type": "database_unique_id", - "keystore.primary.type" : "JKS", + "keystore.primary.type" : "PKCS12", "keystore.userstore_password_encryption": "", - "truststore.type" : "JKS", + "truststore.type" : "PKCS12", "transport.https.sslHostConfig.properties.certificateVerification": "want", diff --git a/modules/distribution/src/repository/resources/conf/deployment.toml b/modules/distribution/src/repository/resources/conf/deployment.toml index 4d16278ad4f..62253ff6cf8 100644 --- a/modules/distribution/src/repository/resources/conf/deployment.toml +++ b/modules/distribution/src/repository/resources/conf/deployment.toml @@ -24,13 +24,13 @@ username = "wso2carbon" password = "wso2carbon" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [truststore] -file_name="client-truststore.jks" +file_name="client-truststore.p12" password="wso2carbon" -type="JKS" +type="PKCS12" [account_recovery.endpoint.auth] hash= "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262" diff --git a/modules/distribution/src/repository/resources/conf/secret-conf.properties b/modules/distribution/src/repository/resources/conf/secret-conf.properties index 9a90557203f..4f642fb3bb8 100644 --- a/modules/distribution/src/repository/resources/conf/secret-conf.properties +++ b/modules/distribution/src/repository/resources/conf/secret-conf.properties @@ -18,8 +18,8 @@ # ##KeyStores configurations # -#keystore.identity.location=repository/resources/security/wso2carbon.jks -#keystore.identity.type=JKS +#keystore.identity.location=repository/resources/security/wso2carbon.p12 +#keystore.identity.type=PKCS12 #keystore.identity.alias=wso2carbon #keystore.identity.store.password=wso2carbon ##keystore.identity.store.secretProvider= @@ -27,8 +27,8 @@ ##keystore.identity.key.secretProvider= ##keystore.identity.parameters=enableHostnameVerifier=false;keyStoreCertificateFilePath=/home/esb.cer # -#keystore.trust.location=repository/resources/security/client-truststore.jks -#keystore.trust.type=JKS +#keystore.trust.location=repository/resources/security/client-truststore.p12 +#keystore.trust.type=PKCS12 #keystore.trust.alias=wso2carbon #keystore.trust.store.password=wso2carbon ##keystore.trust.store.secretProvider= diff --git a/modules/features/org.wso2.identity.jaggery.apps.feature/src/main/resources/dashboard/authentication/auth_config.json b/modules/features/org.wso2.identity.jaggery.apps.feature/src/main/resources/dashboard/authentication/auth_config.json index a2050424fed..5d76b2ecd79 100644 --- a/modules/features/org.wso2.identity.jaggery.apps.feature/src/main/resources/dashboard/authentication/auth_config.json +++ b/modules/features/org.wso2.identity.jaggery.apps.feature/src/main/resources/dashboard/authentication/auth_config.json @@ -12,7 +12,7 @@ "SAML.IdPCertAlias" : "wso2carbon", "SAML.PrivateKeyAlias": "wso2carbon", "SAML.PrivateKeyPassword" : "wso2carbon", - "SAML.KeyStore" : "{carbon.home}/repository/resources/security/wso2carbon.jks" + "SAML.KeyStore" : "{carbon.home}/repository/resources/security/wso2carbon.p12" } } diff --git a/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/identity/integration/common/utils/ISIntegrationTest.java b/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/identity/integration/common/utils/ISIntegrationTest.java index fc324c23f77..3940accc0d7 100644 --- a/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/identity/integration/common/utils/ISIntegrationTest.java +++ b/modules/integration/tests-common/integration-test-utils/src/main/java/org/wso2/identity/integration/common/utils/ISIntegrationTest.java @@ -142,10 +142,10 @@ protected File getDeploymentTomlFile(String carbonHome) { public void setSystemproperties() { System.setProperty("javax.net.ssl.trustStore", FrameworkPathUtil.getSystemResourceLocation() + File.separator + - "keystores" + File.separator + "products" + File.separator + "wso2carbon.jks"); + "keystores" + File.separator + "products" + File.separator + "wso2carbon.p12"); System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon"); - System.setProperty("javax.net.ssl.trustStoreType", "JKS"); + System.setProperty("javax.net.ssl.trustStoreType", "PKCS12"); } diff --git a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/automation.xml b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/automation.xml index bc6f749f9a3..504e6df884a 100644 --- a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/automation.xml +++ b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/automation.xml @@ -82,9 +82,9 @@ --> - keystores/products/wso2carbon.jks - - JKS + keystores/products/wso2carbon.p12 + + PKCS12 wso2carbon @@ -98,9 +98,9 @@ --> - client-truststore.jks - - JKS + client-truststore.p12 + + PKCS12 wso2carbon diff --git a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/automation_mapping.xsd b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/automation_mapping.xsd index e4c6027688c..b5b3e099f6f 100644 --- a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/automation_mapping.xsd +++ b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/automation_mapping.xsd @@ -138,7 +138,7 @@ - Keystore type (JKS/PKCS12 etc.) + Keystore type (PKCS12/PKCS12 etc.) @@ -181,7 +181,7 @@ - trust-store type (JKS/PKCS12 + trust-store type (PKCS12/PKCS12 etc.) diff --git a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/client-truststore.jks deleted file mode 100644 index a7354f88d90..00000000000 Binary files a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/client-truststore.jks and /dev/null differ diff --git a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/client-truststore.p12 b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/client-truststore.p12 new file mode 100644 index 00000000000..5e9df3cfaa2 Binary files /dev/null and b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/client-truststore.p12 differ diff --git a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/wso2carbon.jks deleted file mode 100644 index c9cc470d7af..00000000000 Binary files a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/wso2carbon.jks and /dev/null differ diff --git a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/wso2carbon.p12 b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/wso2carbon.p12 new file mode 100644 index 00000000000..8c963834745 Binary files /dev/null and b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/keystores/products/wso2carbon.p12 differ diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml index dc857f9a016..b3fee8602cb 100644 --- a/modules/integration/tests-integration/tests-backend/pom.xml +++ b/modules/integration/tests-integration/tests-backend/pom.xml @@ -251,7 +251,7 @@ zip true ${basedir}/target/tobeCopied/ - **/*.jks,**/*.mar,**/axis2_client.xml + **/*.jks,**/*.p12,**/*.mar,**/axis2_client.xml @@ -558,7 +558,7 @@ ${basedir}/target/tobeCopied/wso2is-${project.version}/repository/resources/security/ - **/*.jks + **/*.jks,**/*.p12 diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/analytics/commons/KeyStoreUtil.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/analytics/commons/KeyStoreUtil.java index c45c51b22a9..65f0b3a4f98 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/analytics/commons/KeyStoreUtil.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/analytics/commons/KeyStoreUtil.java @@ -27,14 +27,14 @@ public class KeyStoreUtil { public static void setTrustStoreParams() { String trustStore = filePath.getAbsolutePath(); - System.setProperty("javax.net.ssl.trustStore", trustStore + "/client-truststore.jks"); + System.setProperty("javax.net.ssl.trustStore", trustStore + "/client-truststore.p12"); System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon"); } public static void setKeyStoreParams() { String keyStore = filePath.getAbsolutePath(); - System.setProperty("Security.KeyStore.Location", keyStore + "/wso2carbon.jks"); + System.setProperty("Security.KeyStore.Location", keyStore + "/wso2carbon.p12"); System.setProperty("Security.KeyStore.Password", "wso2carbon"); } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2IDTokenEncryptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2IDTokenEncryptionTestCase.java index caf83db18c1..78032efcd85 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2IDTokenEncryptionTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2IDTokenEncryptionTestCase.java @@ -441,9 +441,9 @@ private String getLocationHeaderValue(HttpResponse response) { */ private void initServiceProviderKeys() throws Exception { - KeyStore keyStore = KeyStore.getInstance("JKS"); + KeyStore keyStore = KeyStore.getInstance("PKCS12"); String jksPath = TestConfigurationProvider.getResourceLocation("IS") + File.separator + "sp" + - File.separator + "keystores" + File.separator + "sp1KeyStore.jks"; + File.separator + "keystores" + File.separator + "sp1KeyStore.p12"; String jksPassword = "wso2carbon"; keyStore.load(Files.newInputStream(Paths.get(jksPath)), jksPassword.toCharArray()); diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2RequestObjectSignatureValidationTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2RequestObjectSignatureValidationTestCase.java index ddb2b5679e2..717e5034e44 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2RequestObjectSignatureValidationTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2RequestObjectSignatureValidationTestCase.java @@ -278,9 +278,9 @@ private String buildSignedJWT(String consumerKey, RSAPrivateKey privateKey) thro private void initServiceProviderKeys() throws Exception { - KeyStore keyStore = KeyStore.getInstance("JKS"); + KeyStore keyStore = KeyStore.getInstance("PKCS12"); String jksPath = TestConfigurationProvider.getResourceLocation("IS") + File.separator + "sp" + - File.separator + "keystores" + File.separator + "sp1KeyStore.jks"; + File.separator + "keystores" + File.separator + "sp1KeyStore.p12"; String jksPassword = "wso2carbon"; keyStore.load(Files.newInputStream(Paths.get(jksPath)), jksPassword.toCharArray()); @@ -297,7 +297,7 @@ private void initServiceProviderKeys() throws Exception { // Use another keystore to get sp2 private key. jksPath = TestConfigurationProvider.getResourceLocation("IS") + File.separator + "sp" + - File.separator + "keystores" + File.separator + "sp2KeyStore.jks"; + File.separator + "keystores" + File.separator + "sp2KeyStore.p12"; keyStore.load(Files.newInputStream(Paths.get(jksPath)), jksPassword.toCharArray()); diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oidc/OIDCAuthzCodeIdTokenValidationTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oidc/OIDCAuthzCodeIdTokenValidationTestCase.java index 30d97dc4ccd..348e4f5f2a9 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oidc/OIDCAuthzCodeIdTokenValidationTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oidc/OIDCAuthzCodeIdTokenValidationTestCase.java @@ -275,9 +275,9 @@ private String getLocationHeaderValue(HttpResponse response) { private void initServiceProviderKeys() throws Exception { - KeyStore keyStore = KeyStore.getInstance("JKS"); + KeyStore keyStore = KeyStore.getInstance("PKCS12"); String jksPath = TestConfigurationProvider.getResourceLocation("IS") + File.separator + "sp" + - File.separator + "keystores" + File.separator + "sp1KeyStore.jks"; + File.separator + "keystores" + File.separator + "sp1KeyStore.p12"; String jksPassword = "wso2carbon"; keyStore.load(new FileInputStream(jksPath), jksPassword.toCharArray()); diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SAMLErrorResponseTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SAMLErrorResponseTestCase.java index 9334c3cabb4..383dc9bba6d 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SAMLErrorResponseTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SAMLErrorResponseTestCase.java @@ -175,10 +175,10 @@ private void createApplication() throws Exception { private void setSystemProperties() { URL resourceUrl = getClass().getResource(ISIntegrationTest.URL_SEPARATOR + "keystores" + ISIntegrationTest.URL_SEPARATOR - + "products" + ISIntegrationTest.URL_SEPARATOR + "wso2carbon.jks"); + + "products" + ISIntegrationTest.URL_SEPARATOR + "wso2carbon.p12"); System.setProperty(JAVAX_NET_SSL_TRUSTORE, resourceUrl.getPath()); System.setProperty(JAVAX_NET_SSL_TRUSTORE_PASSWORD, "wso2carbon"); - System.setProperty(JAVAX_NET_SSL_TRUSTORE_TYPE, "JKS"); + System.setProperty(JAVAX_NET_SSL_TRUSTORE_TYPE, "PKCS12"); } private HttpResponse sendSAMLMessage(String url, Map parameters) throws Exception { diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SAMLQueryProfileTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SAMLQueryProfileTestCase.java index f27e0ddbae7..89ba8dc3cdb 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SAMLQueryProfileTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SAMLQueryProfileTestCase.java @@ -256,7 +256,7 @@ public void testSAMLAssertionIDRequest() { log.info("RESPONSE " + this.samlResponse); String id = QueryClientUtils.getAssertionId(this.samlResponse); URL resourceUrl = getClass().getResource(ISIntegrationTest.URL_SEPARATOR + "keystores" + ISIntegrationTest.URL_SEPARATOR - + "products" + ISIntegrationTest.URL_SEPARATOR + "wso2carbon.jks"); + + "products" + ISIntegrationTest.URL_SEPARATOR + "wso2carbon.p12"); ClientSignKeyDataHolder signKeyDataHolder = null; try { signKeyDataHolder = new ClientSignKeyDataHolder(resourceUrl.getPath(), @@ -279,7 +279,7 @@ public void testSAMLAttributeQueryRequest() { try { URL resourceUrl = getClass().getResource(ISIntegrationTest.URL_SEPARATOR + "keystores" + ISIntegrationTest.URL_SEPARATOR - + "products" + ISIntegrationTest.URL_SEPARATOR + "wso2carbon.jks"); + + "products" + ISIntegrationTest.URL_SEPARATOR + "wso2carbon.p12"); ClientSignKeyDataHolder signKeyDataHolder = new ClientSignKeyDataHolder(resourceUrl.getPath(), "wso2carbon", "wso2carbon"); String serverURL = TestUserMode.TENANT_ADMIN.equals(config.getUserMode()) ? WSO2IS_TENANT_URL : WSO2IS_URL; diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SPMetaDataTenantTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SPMetaDataTenantTestCase.java index 5e9edc8ea53..7b90a2eb27b 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SPMetaDataTenantTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/saml/SPMetaDataTenantTestCase.java @@ -87,7 +87,7 @@ public void addSPMetadataForTenant() throws Exception { KeyStoreData[] keyStoreDataArray = keyStoreAdminClient.getKeyStores(); Assert.assertTrue(keyStoreDataArray != null && keyStoreDataArray.length > 0); - String [] storeEntries = keyStoreAdminClient.getStoreEntries("wso2-com.jks"); + String [] storeEntries = keyStoreAdminClient.getStoreEntries("wso2-com.p12"); Assert.assertTrue(storeEntries != null && storeEntries.length > 0); Assert.assertTrue(Arrays.asList(storeEntries).contains(CERT_ALIAS)); } @@ -104,7 +104,7 @@ public void restartTestServer() throws Exception { KeyStoreData[] keyStoreDataArray = keyStoreAdminClient.getKeyStores(); Assert.assertTrue(keyStoreDataArray != null && keyStoreDataArray.length > 0); - String [] storeEntries = keyStoreAdminClient.getStoreEntries("wso2-com.jks"); + String [] storeEntries = keyStoreAdminClient.getStoreEntries("wso2-com.p12"); Assert.assertTrue(storeEntries != null && storeEntries.length > 0); Assert.assertTrue(Arrays.asList(storeEntries).contains(CERT_ALIAS)); } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/sts/SAML2TokenRenweTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/sts/SAML2TokenRenweTestCase.java index 55e8ca2063e..b522175cab5 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/sts/SAML2TokenRenweTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/sts/SAML2TokenRenweTestCase.java @@ -45,7 +45,7 @@ public void testInit() throws Exception { super.init(); scm = new ServerConfigurationManager(isServer); sasc = new SecurityAdminServiceClient(backendURL, sessionCookie); - String KeyStoreName = "wso2carbon.jks"; + String KeyStoreName = "wso2carbon.p12"; SecurityAdminServiceClient securityAdminServiceClient = new SecurityAdminServiceClient( backendURL, sessionCookie); securityAdminServiceClient.applySecurity("wso2carbon-sts", "1", diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/sts/TestPassiveSTS.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/sts/TestPassiveSTS.java index 4476cfb98b8..4e5f1e13193 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/sts/TestPassiveSTS.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/sts/TestPassiveSTS.java @@ -419,11 +419,11 @@ public void testSendLogoutRequestEmptyWtrealm() throws Exception { private void setSystemProperties() { URL resourceUrl = getClass().getResource(ISIntegrationTest.URL_SEPARATOR + "keystores" + ISIntegrationTest.URL_SEPARATOR - + "products" + ISIntegrationTest.URL_SEPARATOR + "wso2carbon.jks"); + + "products" + ISIntegrationTest.URL_SEPARATOR + "wso2carbon.p12"); System.setProperty("javax.net.ssl.trustStore", resourceUrl.getPath()); System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon"); - System.setProperty("javax.net.ssl.trustStoreType", "JKS"); + System.setProperty("javax.net.ssl.trustStoreType", "PKCS12"); } private ClaimMapping[] getClaimMappings() { diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/user/store/config/UserStorePasswordEncryption.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/user/store/config/UserStorePasswordEncryption.java index f6e5b85968d..ac597edd8a4 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/user/store/config/UserStorePasswordEncryption.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/user/store/config/UserStorePasswordEncryption.java @@ -82,7 +82,7 @@ public void testInit() throws Exception { serverConfigurationManager = new ServerConfigurationManager(isServer); keyStoreFilePath = getTestArtifactLocation() + File.separator + "keystores" + File.separator + "products" + File.separator - + "wso2carbon.jks"; + + "wso2carbon.p12"; userstoreDeploymentDir = Utils.getResidentCarbonHome() + File.separator + "repository" + File.separator + "deployment" + File.separator + "server" + File.separator + "userstores"; } @@ -183,7 +183,7 @@ private KeyStore getKeyStore(String keyStoreFilePath, String password, String ke InputStream inputStream = null; try { inputStream = new FileInputStream(new File(keyStoreFilePath).getAbsolutePath()); - store = KeyStore.getInstance("JKS"); + store = KeyStore.getInstance("PKCS12"); store.load(inputStream, password.toCharArray()); return store; } catch (FileNotFoundException e) { diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/util/Utils.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/util/Utils.java index f8ead9248b5..23d84e44013 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/util/Utils.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/util/Utils.java @@ -130,9 +130,9 @@ public static Tomcat getTomcat(Class testClass) { public static void setSystemProperties(Class classIn) { System.setProperty("javax.net.ssl.trustStore", FrameworkPathUtil.getSystemResourceLocation() + File.separator + - "keystores" + File.separator + "products" + File.separator + "wso2carbon.jks"); + "keystores" + File.separator + "products" + File.separator + "wso2carbon.p12"); System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon"); - System.setProperty("javax.net.ssl.trustStoreType", "JKS"); + System.setProperty("javax.net.ssl.trustStoreType", "PKCS12"); } public static HttpResponse sendPOSTMessage(String sessionKey, String url, String userAgent, String diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml index f6b3ad134b5..65c2b1c1445 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [event.default_listener.governance_identity_mgt] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml index 013fdbda27c..3f3fc99b4fa 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [identity_mgt.analytics_login_data_publisher] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml index 85ef7af3bc1..5c3bf9923ad 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml @@ -24,13 +24,13 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [truststore] -file_name="client-truststore.jks" +file_name="client-truststore.p12" password="wso2carbon" -type="JKS" +type="PKCS12" [account_recovery.endpoint.auth] hash= "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml index 85b8bd3ef43..5dee26bc7e4 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml @@ -24,13 +24,13 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [truststore] -file_name="client-truststore.jks" +file_name="client-truststore.p12" password="wso2carbon" -type="JKS" +type="PKCS12" [account_recovery.endpoint.auth] hash= "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml index 3efed46f7e5..ead58e5c6ca 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml @@ -510,7 +510,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml index 77d325f5126..4feee71a839 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml @@ -25,7 +25,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -name = "wso2carbon.jks" +name = "wso2carbon.p12" password = "wso2carbon" [authentication.authenticator.email_otp.parameters] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity-original-530-cache-disabled.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity-original-530-cache-disabled.xml index 17561c539d1..eb9a461ec15 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity-original-530-cache-disabled.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity-original-530-cache-disabled.xml @@ -357,7 +357,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/axis2.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/axis2.xml index e8e6a5447ed..3ed23156f97 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/axis2.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/axis2.xml @@ -245,16 +245,16 @@ true - repository/resources/security/wso2carbon.jks - JKS + repository/resources/security/wso2carbon.p12 + PKCS12 wso2carbon wso2carbon - repository/resources/security/client-truststore.jks - JKS + repository/resources/security/client-truststore.p12 + PKCS12 wso2carbon @@ -416,16 +416,16 @@ true - repository/resources/security/wso2carbon.jks - JKS + repository/resources/security/wso2carbon.p12 + PKCS12 wso2carbon wso2carbon - repository/resources/security/client-truststore.jks - JKS + repository/resources/security/client-truststore.p12 + PKCS12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml index 95d6f563413..8a8a9fd57b5 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml @@ -25,7 +25,7 @@ username = "wso2carbon" password = "wso2carbon" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [user_store.properties] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml index 05beef3a6bc..e3bb536820d 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml @@ -384,7 +384,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml index 6d43d8668f4..c135513b9f5 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml @@ -34,10 +34,10 @@ - ${carbon.home}/repository/resources/security/userRP.jks + ${carbon.home}/repository/resources/security/userRP.p12 - - JKS + + PKCS12 wso2carbon @@ -251,7 +251,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml index 5e721775096..421e7638ba2 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml @@ -28,5 +28,5 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml index 5beb46bf566..1d8207e7ed3 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [oauth] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml index 62f1a79b668..f3368e6c0e5 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [oauth] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml index 04d0aad2a75..b1a5bf4efdd 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [[resource.access_control]] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/IDENTITY6777-identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/IDENTITY6777-identity.xml index f80c57c8d0a..feaa3103420 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/IDENTITY6777-identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/IDENTITY6777-identity.xml @@ -337,7 +337,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml index d03b5584fee..ea31f8b5464 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml @@ -24,13 +24,13 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [truststore] -file_name = "client-truststore.jks" +file_name = "client-truststore.p12" password = "wso2carbon" -type = "JKS" +type = "PKCS12" [account_recovery.endpoint.auth] hash = "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/encrypt-decrypt-persistence-enabled-identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/encrypt-decrypt-persistence-enabled-identity.xml index 7aae30c3b39..808ed6fee21 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/encrypt-decrypt-persistence-enabled-identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/encrypt-decrypt-persistence-enabled-identity.xml @@ -364,7 +364,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml index 4e7a8eee2a0..859c0628144 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [saml] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml index cc92fc48874..00e84324fdc 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [oauth.oidc.claims] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml index 4260c454dfb..acd6d801e03 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml @@ -24,7 +24,7 @@ password = "$env{SHARED_DATABASE_PASSWORD}" type = "database_unique_id" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [oauth.oidc.claims] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml index 5e32413e0be..e455346f819 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml @@ -24,7 +24,7 @@ password = "$env{SHARED_DATABASE_PASSWORD}" type = "database_unique_id" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [oauth.token_generation] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml index e289772eb65..fd3a6d7ce25 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml @@ -24,7 +24,7 @@ password = "$env{SHARED_DATABASE_PASSWORD}" type = "database_unique_id" [keystore.primary] -name = "wso2carbon.jks" +name = "wso2carbon.p12" password = "wso2carbon" [oauth] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml index 45d89179c3e..d26d3dc46fb 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [oauth] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml index 095b0d4712a..1980c0ce34e 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml @@ -34,10 +34,10 @@ - ${carbon.home}/repository/resources/security/userRP.jks + ${carbon.home}/repository/resources/security/userRP.p12 - - JKS + + PKCS12 wso2carbon @@ -251,7 +251,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml index 282f9b60f22..61a7fecdd78 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [[datasource]] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml index 8f1c1394259..ff6ebc565f6 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml @@ -24,5 +24,5 @@ username = "wso2carbon" password = "wso2carbon" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application-authentication-default.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application-authentication-default.xml index f5a2997b3ee..08dfadb8500 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application-authentication-default.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application-authentication-default.xml @@ -94,7 +94,7 @@ /authenticationendpoint/login.do - /repository/resources/security/client-truststore.jks + /repository/resources/security/client-truststore.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml index ab7cf7b682f..dc04ca7be15 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/application_authentication_changed_acs.toml @@ -24,7 +24,7 @@ password = "$env{SHARED_DATABASE_PASSWORD}" type = "database_unique_id" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [authentication.authenticator.saml.parameters] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/error-code-enabled-application-authentication.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/error-code-enabled-application-authentication.xml index 8d9f09f8af3..0b34eed90dd 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/error-code-enabled-application-authentication.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/error-code-enabled-application-authentication.xml @@ -108,7 +108,7 @@ /authenticationendpoint/login.do - /repository/resources/security/client-truststore.jks + /repository/resources/security/client-truststore.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-idp.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-idp.xml index 9605d17c6da..cba23f56fb2 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-idp.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-idp.xml @@ -121,25 +121,25 @@ false - MIIDqTCCApGgAwIBAgIEYfEVSjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV - UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxDTALBgNVBAoM - BFdTTzIxDTALBgNVBAsMBFdTTzIxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0yMjAx - MjYwOTMyNThaFw0yNDA0MzAwOTMyNThaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI - DAJDQTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzENMAsGA1UECgwEV1NPMjENMAsG - A1UECwwEV1NPMjESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF - AAOCAQ8AMIIBCgKCAQEAkdgncoCrz655Lq8pTdX07eoVBjdZDCUE6ueBd0D1hpJ0 - /zE3x3Az6tlvzs98PsPuGzaQOMmuLa4qxNJ+OKxJmutDUlClpuvxuf+jyq4gCV5t - EIILWRMBjlBEpJfWm63+VKKU4nvBWNJ7KfhWjl8+DUdNSh2pCDLpUObmb9Kquqc1 - x4BgttjN4rx/P+3/v+1jETXzIP1L44yHtpQNv0khYf4j/aHjcEri9ykvpz1mtdac - brKK25N4V1HHRwDqZiJzOCCISXDuqB6wguY/v4n0l1XtrEs7iCyfRFwNSKNrLqr2 - 3tR1CscmLfbH6ZLg5CYJTD+1uPSx0HMOB4Wv51PbWwIDAQABo2MwYTAUBgNVHREE - DTALgglsb2NhbGhvc3QwHQYDVR0OBBYEFH0KQ3YTZJxTsNsPyrZOSFgXXhG+MB0G - A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjALBgNVHQ8EBAMCBPAwDQYJKoZI - hvcNAQELBQADggEBAFNJ34CIiIlCxmyp27+KA224LaHVtL5DucFK0P22FQ+QKkON - iUwO70KoVFreBH1Smxu4ePWk6rMZFOM5oL8HXYg3twy+5eGcL3PQd7X5dwAqlViv - zokoi6SDaA/bIG6J/O1U9Qd4XEVJdVuLqjk1+cp70ALt0X6B7sNLfjFcbz3jQULN - nK8HNvqbn7zQuP10s8p5y2qVkPBA/pjigRDsIWR6p78QESF+TaHFjxfcD6f9cnYi - e+yEHERtG8k8x5jLFe+odI1/QGZP8Fy0oKT+E/TJ1FBh4rB1FtKylqGeauPu89Dn - aJ9+kvpNQ94yFmEuhtDByvDijxAqvlin3TPIfy8= + MIIDqDCCApCgAwIBAgIEZXBGCTANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJV + UzELMAkGA1UECAwCQ0ExFDASBgNVBAcMC1NhbnRhIENsYXJhMQ0wCwYDVQQKDARX + U08yMQ0wCwYDVQQLDARXU08yMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjMxMjA2 + MDk1OTM3WhcNMjUwMTA3MDk1OTM3WjBiMQswCQYDVQQGEwJVUzELMAkGA1UECAwC + Q0ExFDASBgNVBAcMC1NhbnRhIENsYXJhMQ0wCwYDVQQKDARXU08yMQ0wCwYDVQQL + DARXU08yMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB + DwAwggEKAoIBAQCa4jlw8KrXs396SvKfTQ02IeRoaZquekoJSiw0l9e9BI2EavnT + G8Jyop8z2rOr6C6jjdgUytz5jBhopbgfxrP2i0NGujJFLNnSU8rchD2TJ9Qo8tWv + fjAKC/UlRxSoErOTdz7XS1CcPf6oQfNzMZ6By29zfISuC+rWnjLqT3M6z0F0b3+m + oiiZfQ05F00hwzSE9WBlL+GRxwpyQQYwsbGfZ+viI3EGv7sRv+xqpLPhW5SLzhGz + sZi9C0M0G1jbvV1d+PY0MThE60rkavjM++RRBesoi5JknZksAt9hOqxY3A1IMdDA + NpdKqhdF1aAyDX+vTZFrHfLsuEBec5Pp3tIXAgMBAAGjZjBkMA4GA1UdDwEB/wQE + AwIE8DAUBgNVHREEDTALgglsb2NhbGhvc3QwHQYDVR0OBBYEFHXXV2nlofhi8Wwj + w0EoaFSYnWbSMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG + 9w0BAQsFAAOCAQEARe8DI8n72eUlQy9GSpiyxv8QUHFdiQa1nBW9nVTZdyJoSX0q + h6N3xVNJXR3/zLvL8MBVMvjkt0OQqvEiyjwnEWO6DbxTRr3vdf+rv5VwdkYn4McM + Kx4xF8Zag8xhyaYqUQzQXng51rV1+c4uzXugEhE5SzdDHYEXzX6joZIg1yN+hEPc + 77RZJJHmwIQrTd3bnZpytB6RdBjnjSyh0BeHlJQGmPxomxYAS1hVszRdfWtrxDAB + flIJimJiHh3dykcyNlrwBu903pMdUGQGqsUyEjhFd7s4AzuqYHJr5rYy950df9Ib + YShu2YflVEsWZqJR62CibWBcJKyHPYmtC0cSRQ== diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml index 8ec420b7371..b30b9dec2e7 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml @@ -384,7 +384,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml index 0aea90dcc5e..b7f0586c948 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-deployment.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [saml.extensions] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-identity.xml index e175c98070a..fb1a03e22e2 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-assertion-query-enabled-identity.xml @@ -355,7 +355,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml index 14faad863d3..4b2915fe0d3 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml-sso-for-admin-console.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [admin_console.authenticator.saml_sso_authenticator] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml index 845fd25aa80..ba6604814bf 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/saml_ecp_consent_management_disabled.toml @@ -24,7 +24,7 @@ password = "$env{SHARED_DATABASE_PASSWORD}" type = "database_unique_id" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [authentication.consent] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml index 1bdebb7f357..604911ec2b9 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim/IDENTITY4776/catalina_server_config.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [transport.https] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml index 7a33ab8fa53..133839afbb5 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/scim2/me_unsecured_identity.toml @@ -24,7 +24,7 @@ password = "$env{SHARED_DATABASE_PASSWORD}" type = "database_unique_id" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [resource_access_control.scim2_me_post_method] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp1KeyStore.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp1KeyStore.jks deleted file mode 100644 index 4cde8a242fe..00000000000 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp1KeyStore.jks and /dev/null differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp1KeyStore.p12 b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp1KeyStore.p12 new file mode 100644 index 00000000000..1b9206eead3 Binary files /dev/null and b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp1KeyStore.p12 differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp2KeyStore.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp2KeyStore.jks deleted file mode 100644 index 482e68a1edd..00000000000 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp2KeyStore.jks and /dev/null differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp2KeyStore.p12 b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp2KeyStore.p12 new file mode 100644 index 00000000000..f9c4eda12f7 Binary files /dev/null and b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/sp/keystores/sp2KeyStore.p12 differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/tenant.qualified/tenant_qualified_url_tenanted_sessions_disabled.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/tenant.qualified/tenant_qualified_url_tenanted_sessions_disabled.toml index b4a20b941b7..427806ff50e 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/tenant.qualified/tenant_qualified_url_tenanted_sessions_disabled.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/tenant.qualified/tenant_qualified_url_tenanted_sessions_disabled.toml @@ -24,13 +24,13 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [truststore] -file_name = "client-truststore.jks" +file_name = "client-truststore.p12" password = "wso2carbon" -type = "JKS" +type = "PKCS12" [account_recovery.endpoint.auth] hash = "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml index 001f3b1e880..413a298408f 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml @@ -28,13 +28,13 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [truststore] -file_name = "client-truststore.jks" +file_name = "client-truststore.p12" password = "wso2carbon" -type = "JKS" +type = "PKCS12" [account_recovery.endpoint.auth] hash = "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml index e4fd0c3a499..348d16c8838 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_federated_association.toml @@ -24,7 +24,7 @@ password = "$env{SHARED_DATABASE_PASSWORD}" type = "database_unique_id" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [identity_mgt.user_onboarding] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml index f695d98af85..d87dba01793 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/carbon15051/email_login_config.toml @@ -27,7 +27,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [tenant_mgt] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml index b4c36cde0d8..911b256d871 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/jdbc_user_mgt_config.toml @@ -24,5 +24,5 @@ password = "$env{SHARED_DATABASE_PASSWORD}" type = "database_unique_id" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml index 67c09884b6e..315129dd075 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/ldap_user_mgt_config.toml @@ -28,5 +28,5 @@ username = "wso2carbon" password = "wso2carbon" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml index 961caacb042..947f917b1af 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/userMgt/read_only_ldap_user_mgt_config.toml @@ -29,5 +29,5 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/xacml_scope_validator.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/xacml_scope_validator.toml index 6da7b341ef2..12abe763689 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/xacml_scope_validator.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/xacml_scope_validator.toml @@ -24,7 +24,7 @@ username = "$env{SHARED_DATABASE_USERNAME}" password = "$env{SHARED_DATABASE_PASSWORD}" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [oauth] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml index 5aaa795fc77..d739182505b 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml @@ -82,9 +82,9 @@ --> - keystores/products/wso2carbon.jks - - JKS + keystores/products/wso2carbon.p12 + + PKCS12 wso2carbon @@ -98,9 +98,9 @@ --> - client-truststore.jks - - JKS + client-truststore.p12 + + PKCS12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/automationSchema.xsd b/modules/integration/tests-integration/tests-backend/src/test/resources/automationSchema.xsd index c18b0826df0..f692e61f95a 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/automationSchema.xsd +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/automationSchema.xsd @@ -138,7 +138,7 @@ - Keystore type (JKS/PKCS12 etc.) + Keystore type (PKCS12/PKCS12 etc.) @@ -181,7 +181,7 @@ - trust-store type (JKS/PKCS12 + trust-store type (PKCS12/PKCS12 etc.) diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/backupIdentity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/backupIdentity.xml index 57cbe24412e..4c787644bb7 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/backupIdentity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/backupIdentity.xml @@ -26,10 +26,10 @@ - ${carbon.home}/repository/resources/security/userRP.jks + ${carbon.home}/repository/resources/security/userRP.p12 - - JKS + + PKCS12 wso2carbon @@ -242,7 +242,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/identity.xml index 296725f20ba..5261de7ef2f 100755 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/identity.xml @@ -42,9 +42,9 @@ --> - ${carbon.home}/repository/resources/security/userRP.jks - - JKS + ${carbon.home}/repository/resources/security/userRP.p12 + + PKCS12 wso2carbon @@ -139,7 +139,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.jks deleted file mode 100644 index a7354f88d90..00000000000 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.jks and /dev/null differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.p12 b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.p12 new file mode 100644 index 00000000000..5e9df3cfaa2 Binary files /dev/null and b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.p12 differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.jks deleted file mode 100644 index 386db4c67a8..00000000000 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.jks and /dev/null differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.p12 b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.p12 new file mode 100644 index 00000000000..8c963834745 Binary files /dev/null and b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.p12 differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.pem b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.pem index 37cf84c6f44..849e25eb785 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.pem +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.pem @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDqTCCApGgAwIBAgIEYfEVSjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV -UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxDTALBgNVBAoM -BFdTTzIxDTALBgNVBAsMBFdTTzIxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0yMjAx -MjYwOTMyNThaFw0yNDA0MzAwOTMyNThaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI -DAJDQTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzENMAsGA1UECgwEV1NPMjENMAsG -A1UECwwEV1NPMjESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAkdgncoCrz655Lq8pTdX07eoVBjdZDCUE6ueBd0D1hpJ0 -/zE3x3Az6tlvzs98PsPuGzaQOMmuLa4qxNJ+OKxJmutDUlClpuvxuf+jyq4gCV5t -EIILWRMBjlBEpJfWm63+VKKU4nvBWNJ7KfhWjl8+DUdNSh2pCDLpUObmb9Kquqc1 -x4BgttjN4rx/P+3/v+1jETXzIP1L44yHtpQNv0khYf4j/aHjcEri9ykvpz1mtdac -brKK25N4V1HHRwDqZiJzOCCISXDuqB6wguY/v4n0l1XtrEs7iCyfRFwNSKNrLqr2 -3tR1CscmLfbH6ZLg5CYJTD+1uPSx0HMOB4Wv51PbWwIDAQABo2MwYTAUBgNVHREE -DTALgglsb2NhbGhvc3QwHQYDVR0OBBYEFH0KQ3YTZJxTsNsPyrZOSFgXXhG+MB0G -A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjALBgNVHQ8EBAMCBPAwDQYJKoZI -hvcNAQELBQADggEBAFNJ34CIiIlCxmyp27+KA224LaHVtL5DucFK0P22FQ+QKkON -iUwO70KoVFreBH1Smxu4ePWk6rMZFOM5oL8HXYg3twy+5eGcL3PQd7X5dwAqlViv -zokoi6SDaA/bIG6J/O1U9Qd4XEVJdVuLqjk1+cp70ALt0X6B7sNLfjFcbz3jQULN -nK8HNvqbn7zQuP10s8p5y2qVkPBA/pjigRDsIWR6p78QESF+TaHFjxfcD6f9cnYi -e+yEHERtG8k8x5jLFe+odI1/QGZP8Fy0oKT+E/TJ1FBh4rB1FtKylqGeauPu89Dn -aJ9+kvpNQ94yFmEuhtDByvDijxAqvlin3TPIfy8= +MIIDqDCCApCgAwIBAgIEZXBGCTANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJV +UzELMAkGA1UECAwCQ0ExFDASBgNVBAcMC1NhbnRhIENsYXJhMQ0wCwYDVQQKDARX +U08yMQ0wCwYDVQQLDARXU08yMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjMxMjA2 +MDk1OTM3WhcNMjUwMTA3MDk1OTM3WjBiMQswCQYDVQQGEwJVUzELMAkGA1UECAwC +Q0ExFDASBgNVBAcMC1NhbnRhIENsYXJhMQ0wCwYDVQQKDARXU08yMQ0wCwYDVQQL +DARXU08yMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQCa4jlw8KrXs396SvKfTQ02IeRoaZquekoJSiw0l9e9BI2EavnT +G8Jyop8z2rOr6C6jjdgUytz5jBhopbgfxrP2i0NGujJFLNnSU8rchD2TJ9Qo8tWv +fjAKC/UlRxSoErOTdz7XS1CcPf6oQfNzMZ6By29zfISuC+rWnjLqT3M6z0F0b3+m +oiiZfQ05F00hwzSE9WBlL+GRxwpyQQYwsbGfZ+viI3EGv7sRv+xqpLPhW5SLzhGz +sZi9C0M0G1jbvV1d+PY0MThE60rkavjM++RRBesoi5JknZksAt9hOqxY3A1IMdDA +NpdKqhdF1aAyDX+vTZFrHfLsuEBec5Pp3tIXAgMBAAGjZjBkMA4GA1UdDwEB/wQE +AwIE8DAUBgNVHREEDTALgglsb2NhbGhvc3QwHQYDVR0OBBYEFHXXV2nlofhi8Wwj +w0EoaFSYnWbSMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG +9w0BAQsFAAOCAQEARe8DI8n72eUlQy9GSpiyxv8QUHFdiQa1nBW9nVTZdyJoSX0q +h6N3xVNJXR3/zLvL8MBVMvjkt0OQqvEiyjwnEWO6DbxTRr3vdf+rv5VwdkYn4McM +Kx4xF8Zag8xhyaYqUQzQXng51rV1+c4uzXugEhE5SzdDHYEXzX6joZIg1yN+hEPc +77RZJJHmwIQrTd3bnZpytB6RdBjnjSyh0BeHlJQGmPxomxYAS1hVszRdfWtrxDAB +flIJimJiHh3dykcyNlrwBu903pMdUGQGqsUyEjhFd7s4AzuqYHJr5rYy950df9Ib +YShu2YflVEsWZqJR62CibWBcJKyHPYmtC0cSRQ== -----END CERTIFICATE----- diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/saml-metadata-super-tenant.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/saml-metadata-super-tenant.json index 6460aa225c5..d049b72f02e 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/saml-metadata-super-tenant.json +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/saml-metadata-super-tenant.json @@ -2,86 +2,149 @@ "defaultNameIdFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", "certificateAlias": { "options": [ - "digicertassuredidrootca", - "comodorsaca", - "swisssignplatinumg2ca", - "swisssignsilverg2ca", - "securetrustca", - "digicertassuredidg3", - "digicertassuredidg2", - "teliasonerarootcav1", - "identrustpublicca", - "affirmtrustnetworkingca", - "entrustevca", - "globalsigneccrootcar5", - "globalsigneccrootcar4", - "certumca", - "addtrustclass1ca", "wso2carbon", - "entrustrootcag2", - "quovadisrootca3", - "quovadisrootca2", - "digicertglobalrootg3", - "digicertglobalrootg2", - "digicerthighassuranceevrootca", - "geotrustuniversalca", - "verisignclass3ca", - "thawteprimaryrootcag3", - "thawteprimaryrootcag2", - "buypassclass3ca", - "geotrustprimaryca", - "dtrustclass3ca2", - "buypassclass2ca", - "baltimorecybertrustca", - "starfieldclass2ca", - "actalisauthenticationrootca", - "camerfirmachamberscommerceca", - "globalsignrootcar6", - "ttelesecglobalrootclass3ca", - "digicerttrustedrootg4", - "verisignclass3g5ca", - "ttelesecglobalrootclass2ca", - "verisignclass3g4ca", - "verisignclass3g3ca", - "xrampglobalca", - "entrustrootcaec1", - "certumtrustednetworkca", - "verisignclass3g2ca", - "globalsignr3ca", - "secomscrootca2", - "secomscrootca1", - "affirmtrustcommercialca", - "verisignuniversalrootca", - "letsencryptisrgx1", - "digicertglobalrootca", - "globalsignca", - "thawteprimaryrootca", - "starfieldrootg2ca", - "affirmtrustpremiumeccca", - "starfieldservicesrootg2ca", - "comodoaaaca", - "addtrustqualifiedca", - "keynectisrootca", - "addtrustexternalca", - "verisignclass2g2ca", - "quovadisrootca3g3", - "geotrustprimarycag3", - "geotrustprimarycag2", - "swisssigngoldg2ca", - "entrust2048ca", - "quovadisrootca2g3", - "chunghwaepkirootca", - "camerfirmachambersignca", - "quovadisrootca1g3", - "camerfirmachambersca", - "usertrusteccca", - "godaddyclass2ca", - "affirmtrustpremiumca", - "identrustcommercial", - "usertrustrsaca", - "dtrustclass3ca2ev", - "comodoeccca", - "godaddyrootg2ca" + "c_de,o_atos,cn_atos_trustedroot_2011", + "c_de,o_atos,cn_atos_trustedroot_root_ca_ecc_tls_2021", + "c_de,o_atos,cn_atos_trustedroot_root_ca_rsa_tls_2021", + "c_es,o_accv,ou_pkiaccv,cn_accvraiz1", + "cn_aaa_certificate_services,o_comodo_ca_limited,l_salford,st_greater_manchester,c_gb", + "cn_ac_raiz_fnmtrcm_servidores_seguros,ou_ceres,o_fnmtrcm,c_es", + "cn_actalis_authentication_root_ca,o_actalis_spa03358520967,l_milan,c_it", + "cn_affirmtrust_commercial,o_affirmtrust,c_us", + "cn_affirmtrust_networking,o_affirmtrust,c_us", + "cn_affirmtrust_premium_ecc,o_affirmtrust,c_us", + "cn_affirmtrust_premium,o_affirmtrust,c_us", + "cn_amazon_root_ca_1,o_amazon,c_us", + "cn_amazon_root_ca_2,o_amazon,c_us", + "cn_amazon_root_ca_4,o_amazon,c_us", + "cn_amazon_root_ca_3,o_amazon,c_us", + "cn_anf_secure_server_root_ca,ou_anf_ca_raiz,o_anf_autoridad_de_certificacion,c_es", + "cn_autoridad_de_certificacion_firmaprofesional_cif_a62634068,c_es", + "cn_baltimore_cybertrust_root,ou_cybertrust,o_baltimore,c_ie", + "cn_bjca_global_root_ca1,o_beijing_certificate_authority,c_cn", + "cn_bjca_global_root_ca2,o_beijing_certificate_authority,c_cn", + "cn_buypass_class_2_root_ca,o_buypass_as983163327,c_no", + "cn_buypass_class_3_root_ca,o_buypass_as983163327,c_no", + "cn_ca_disig_root_r2,o_disig_as,l_bratislava,c_sk", + "cn_certainly_root_e1,o_certainly,c_us", + "cn_certainly_root_r1,o_certainly,c_us", + "cn_certigna_root_ca,ou_0002_48146308100036,o_dhimyotis,c_fr", + "cn_certigna,o_dhimyotis,c_fr", + "cn_certum_ec384_ca,ou_certum_certification_authority,o_asseco_data_systems_sa,c_pl", + "cn_certum_trusted_network_ca_2,ou_certum_certification_authority,o_unizeto_technologies_sa,c_pl", + "cn_certum_trusted_network_ca,ou_certum_certification_authority,o_unizeto_technologies_sa,c_pl", + "cn_certum_trusted_root_ca,ou_certum_certification_authority,o_asseco_data_systems_sa,c_pl", + "cn_cfca_ev_root,o_china_financial_certification_authority,c_cn", + "cn_comodo_certification_authority,o_comodo_ca_limited,l_salford,st_greater_manchester,c_gb", + "cn_comodo_ecc_certification_authority,o_comodo_ca_limited,l_salford,st_greater_manchester,c_gb", + "cn_comodo_rsa_certification_authority,o_comodo_ca_limited,l_salford,st_greater_manchester,c_gb", + "cn_digicert_assured_id_root_ca,ou_wwwdigicertcom,o_digicert_inc,c_us", + "cn_digicert_assured_id_root_g2,ou_wwwdigicertcom,o_digicert_inc,c_us", + "cn_digicert_assured_id_root_g3,ou_wwwdigicertcom,o_digicert_inc,c_us", + "cn_digicert_global_root_ca,ou_wwwdigicertcom,o_digicert_inc,c_us", + "cn_digicert_global_root_g2,ou_wwwdigicertcom,o_digicert_inc,c_us", + "cn_digicert_global_root_g3,ou_wwwdigicertcom,o_digicert_inc,c_us", + "cn_digicert_high_assurance_ev_root_ca,ou_wwwdigicertcom,o_digicert_inc,c_us", + "cn_digicert_tls_ecc_p384_root_g5,o_digicert__inc,c_us", + "cn_digicert_tls_rsa4096_root_g5,o_digicert__inc,c_us", + "cn_digicert_trusted_root_g4,ou_wwwdigicertcom,o_digicert_inc,c_us", + "cn_dtrust_br_root_ca_1_2020,o_dtrust_gmbh,c_de", + "cn_dtrust_ev_root_ca_1_2020,o_dtrust_gmbh,c_de", + "cn_dtrust_root_class_3_ca_2_2009,o_dtrust_gmbh,c_de", + "cn_dtrust_root_class_3_ca_2_ev_2009,o_dtrust_gmbh,c_de", + "cn_emsign_ecc_root_ca__c3,o_emudhra_inc,ou_emsign_pki,c_us", + "cn_emsign_ecc_root_ca__g3,o_emudhra_technologies_limited,ou_emsign_pki,c_in", + "cn_emsign_root_ca__c1,o_emudhra_inc,ou_emsign_pki,c_us", + "cn_emsign_root_ca__g1,o_emudhra_technologies_limited,ou_emsign_pki,c_in", + "cn_entrust_root_certification_authority__ec1,ou__c__2012_entrust__inc__for_authorized_use_only,ou_see_wwwentrustnetlegalterms,o_entrust__inc,c_us", + "cn_entrust_root_certification_authority__g2,ou__c__2009_entrust__inc__for_authorized_use_only,ou_see_wwwentrustnetlegalterms,o_entrust__inc,c_us", + "cn_entrust_root_certification_authority__g4,ou__c__2015_entrust__inc__for_authorized_use_only,ou_see_wwwentrustnetlegalterms,o_entrust__inc,c_us", + "cn_entrust_root_certification_authority,ou__c__2006_entrust__inc,ou_wwwentrustnetcps_is_incorporated_by_reference,o_entrust__inc,c_us", + "cn_entrustnet_certification_authority__2048_,ou__c__1999_entrustnet_limited,ou_wwwentrustnetcps_2048_incorp_by_ref__limits_liab_,o_entrustnet", + "cn_eszigno_root_ca_2017,o_microsec_ltd,l_budapest,c_hu", + "cn_gdca_trustauth_r5_root,o_guang_dong_certificate_authority_co_ltd,c_cn", + "cn_globalsign_root_ca,ou_root_ca,o_globalsign_nvsa,c_be", + "cn_globalsign_root_e46,o_globalsign_nvsa,c_be", + "cn_globalsign_root_r46,o_globalsign_nvsa,c_be", + "cn_globalsign,o_globalsign,ou_globalsign_ecc_root_ca__r4", + "cn_globalsign,o_globalsign,ou_globalsign_ecc_root_ca__r5", + "cn_globalsign,o_globalsign,ou_globalsign_root_ca__r3", + "cn_globalsign,o_globalsign,ou_globalsign_root_ca__r6", + "cn_globaltrust_2020,o_ecommerce_monitoring_gmbh,c_at", + "cn_go_daddy_root_certificate_authority__g2,o_godaddycom__inc,l_scottsdale,st_arizona,c_us", + "cn_gts_root_r1,o_google_trust_services_llc,c_us", + "cn_gts_root_r2,o_google_trust_services_llc,c_us", + "cn_gts_root_r3,o_google_trust_services_llc,c_us", + "cn_gts_root_r4,o_google_trust_services_llc,c_us", + "cn_harica_tls_ecc_root_ca_2021,o_hellenic_academic_and_research_institutions_ca,c_gr", + "cn_harica_tls_rsa_root_ca_2021,o_hellenic_academic_and_research_institutions_ca,c_gr", + "cn_hellenic_academic_and_research_institutions_ecc_rootca_2015,o_hellenic_academic_and_research_institutions_cert_authority,l_athens,c_gr", + "cn_hellenic_academic_and_research_institutions_rootca_2015,o_hellenic_academic_and_research_institutions_cert_authority,l_athens,c_gr", + "cn_hipki_root_ca__g1,o_chunghwa_telecom_co__ltd,c_tw", + "cn_hongkong_post_root_ca_3,o_hongkong_post,l_hong_kong,st_hong_kong,c_hk", + "cn_identrust_commercial_root_ca_1,o_identrust,c_us", + "cn_identrust_public_sector_root_ca_1,o_identrust,c_us", + "cn_isrg_root_x1,o_internet_security_research_group,c_us", + "cn_isrg_root_x2,o_internet_security_research_group,c_us", + "cn_izenpecom,o_izenpe_sa,c_es", + "cn_microsec_eszigno_root_ca_2009,o_microsec_ltd,l_budapest,c_hu", + "cn_microsoft_ecc_root_certificate_authority_2017,o_microsoft_corporation,c_us", + "cn_microsoft_rsa_root_certificate_authority_2017,o_microsoft_corporation,c_us", + "cn_naver_global_root_certification_authority,o_naver_business_platform_corp,c_kr", + "cn_netlock_arany__class_gold__fc591tanc3basc3adtvc3a1ny,ou_tanc3basc3adtvc3a1nykiadc3b3k__certification_services_,o_netlock_kft,l_budapest,c_hu", + "cn_oiste_wisekey_global_root_gb_ca,ou_oiste_foundation_endorsed,o_wisekey,c_ch", + "cn_oiste_wisekey_global_root_gc_ca,ou_oiste_foundation_endorsed,o_wisekey,c_ch", + "cn_quovadis_root_ca_1_g3,o_quovadis_limited,c_bm", + "cn_quovadis_root_ca_2_g3,o_quovadis_limited,c_bm", + "cn_quovadis_root_ca_2,o_quovadis_limited,c_bm", + "cn_quovadis_root_ca_3_g3,o_quovadis_limited,c_bm", + "cn_quovadis_root_ca_3,o_quovadis_limited,c_bm", + "cn_sectigo_public_server_authentication_root_e46,o_sectigo_limited,c_gb", + "cn_sectigo_public_server_authentication_root_r46,o_sectigo_limited,c_gb", + "cn_secure_global_ca,o_securetrust_corporation,c_us", + "cn_securesign_rootca11,o_japan_certification_services__inc,c_jp", + "cn_securetrust_ca,o_securetrust_corporation,c_us", + "cn_security_communication_ecc_rootca1,o_secom_trust_systems_co_ltd,c_jp", + "cn_security_communication_rootca3,o_secom_trust_systems_co_ltd,c_jp", + "cn_sslcom_ev_root_certification_authority_ecc,o_ssl_corporation,l_houston,st_texas,c_us", + "cn_sslcom_ev_root_certification_authority_rsa_r2,o_ssl_corporation,l_houston,st_texas,c_us", + "cn_sslcom_root_certification_authority_ecc,o_ssl_corporation,l_houston,st_texas,c_us", + "cn_sslcom_root_certification_authority_rsa,o_ssl_corporation,l_houston,st_texas,c_us", + "cn_sslcom_tls_ecc_root_ca_2022,o_ssl_corporation,c_us", + "cn_sslcom_tls_rsa_root_ca_2022,o_ssl_corporation,c_us", + "cn_starfield_root_certificate_authority__g2,o_starfield_technologies__inc,l_scottsdale,st_arizona,c_us", + "cn_starfield_services_root_certificate_authority__g2,o_starfield_technologies__inc,l_scottsdale,st_arizona,c_us", + "cn_swisssign_gold_ca__g2,o_swisssign_ag,c_ch", + "cn_swisssign_silver_ca__g2,o_swisssign_ag,c_ch", + "cn_szafir_root_ca2,o_krajowa_izba_rozliczeniowa_sa,c_pl", + "cn_telia_root_ca_v2,o_telia_finland_oyj,c_fi", + "cn_teliasonera_root_ca_v1,o_teliasonera", + "cn_trustcor_eca1,ou_trustcor_certificate_authority,o_trustcor_systems_s_de_rl,l_panama_city,st_panama,c_pa", + "cn_trustcor_rootcert_ca1,ou_trustcor_certificate_authority,o_trustcor_systems_s_de_rl,l_panama_city,st_panama,c_pa", + "cn_trustcor_rootcert_ca2,ou_trustcor_certificate_authority,o_trustcor_systems_s_de_rl,l_panama_city,st_panama,c_pa", + "cn_trustwave_global_certification_authority,o_trustwave_holdings__inc,l_chicago,st_illinois,c_us", + "cn_trustwave_global_ecc_p256_certification_authority,o_trustwave_holdings__inc,l_chicago,st_illinois,c_us", + "cn_trustwave_global_ecc_p384_certification_authority,o_trustwave_holdings__inc,l_chicago,st_illinois,c_us", + "cn_ttelesec_globalroot_class_2,ou_tsystems_trust_center,o_tsystems_enterprise_services_gmbh,c_de", + "cn_ttelesec_globalroot_class_3,ou_tsystems_trust_center,o_tsystems_enterprise_services_gmbh,c_de", + "cn_tubitak_kamu_sm_ssl_kok_sertifikasi__surum_1,ou_kamu_sertifikasyon_merkezi__kamu_sm,o_turkiye_bilimsel_ve_teknolojik_arastirma_kurumu__tubitak,l_gebze__kocaeli,c_tr", + "cn_tuntrust_root_ca,o_agence_nationale_de_certification_electronique,c_tn", + "cn_twca_global_root_ca,ou_root_ca,o_taiwanca,c_tw", + "cn_twca_root_certification_authority,ou_root_ca,o_taiwanca,c_tw", + "cn_uca_extended_validation_root,o_unitrust,c_cn", + "cn_uca_global_g2_root,o_unitrust,c_cn", + "cn_usertrust_ecc_certification_authority,o_the_usertrust_network,l_jersey_city,st_new_jersey,c_us", + "cn_usertrust_rsa_certification_authority,o_the_usertrust_network,l_jersey_city,st_new_jersey,c_us", + "cn_vtrus_ecc_root_ca,o_itruschina_co_ltd,c_cn", + "cn_vtrus_root_ca,o_itruschina_co_ltd,c_cn", + "cn_xramp_global_certification_authority,o_xramp_security_services_inc,ou_wwwxrampsecuritycom,c_us", + "ou_ac_raiz_fnmtrcm,o_fnmtrcm,c_es", + "ou_certsign_root_ca_g2,o_certsign_sa,c_ro", + "ou_certsign_root_ca,o_certsign,c_ro", + "ou_epki_root_certification_authority,o_chunghwa_telecom_co__ltd,c_tw", + "ou_go_daddy_class_2_certification_authority,o_the_go_daddy_group__inc,c_us", + "ou_security_communication_rootca2,o_secom_trust_systems_co_ltd,c_jp", + "ou_starfield_class_2_certification_authority,o_starfield_technologies__inc,c_us" ], "defaultValue": "wso2carbon" }, diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/client.properties b/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/client.properties index 146fa8801c7..b0ab63e822c 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/client.properties +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/client.properties @@ -15,7 +15,7 @@ claim.uris=http://wso2.org/claims/givenname,http://wso2.org/claims/emailaddress relyingParty.message=Hello World #Following paths start from the resources folder -path.keystore=keystore/wso2carbon.jks +path.keystore=keystore/wso2carbon.p12 path.repo=repo path.policy.sts=sts-policy-ut.xml #path.policy.sts=sts-policy-signonly.xml diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/keystore/wso2carbon.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/keystore/wso2carbon.jks deleted file mode 100644 index c9cc470d7af..00000000000 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/keystore/wso2carbon.jks and /dev/null differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/keystore/wso2carbon.p12 b/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/keystore/wso2carbon.p12 new file mode 100644 index 00000000000..8c963834745 Binary files /dev/null and b/modules/integration/tests-integration/tests-backend/src/test/resources/stsclient/keystore/wso2carbon.p12 differ diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/identityMgt/axis2-default.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/identityMgt/axis2-default.xml index 772d484e73f..5e2c38f6310 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/identityMgt/axis2-default.xml +++ b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/identityMgt/axis2-default.xml @@ -257,16 +257,16 @@ true - repository/resources/security/wso2carbon.jks - JKS + repository/resources/security/wso2carbon.p12 + PKCS12 wso2carbon wso2carbon - repository/resources/security/client-truststore.jks - JKS + repository/resources/security/client-truststore.p12 + PKCS12 wso2carbon @@ -428,16 +428,16 @@ true - repository/resources/security/wso2carbon.jks - JKS + repository/resources/security/wso2carbon.p12 + PKCS12 wso2carbon wso2carbon - repository/resources/security/client-truststore.jks - JKS + repository/resources/security/client-truststore.p12 + PKCS12 wso2carbon diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/identityMgt/axis2.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/identityMgt/axis2.xml index e8e6a5447ed..3ed23156f97 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/identityMgt/axis2.xml +++ b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/identityMgt/axis2.xml @@ -245,16 +245,16 @@ true - repository/resources/security/wso2carbon.jks - JKS + repository/resources/security/wso2carbon.p12 + PKCS12 wso2carbon wso2carbon - repository/resources/security/client-truststore.jks - JKS + repository/resources/security/client-truststore.p12 + PKCS12 wso2carbon @@ -416,16 +416,16 @@ true - repository/resources/security/wso2carbon.jks - JKS + repository/resources/security/wso2carbon.p12 + PKCS12 wso2carbon wso2carbon - repository/resources/security/client-truststore.jks - JKS + repository/resources/security/client-truststore.p12 + PKCS12 wso2carbon diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-default.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-default.xml index 88f8859a94b..f3f59ea37fd 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-default.xml +++ b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-default.xml @@ -34,10 +34,10 @@ - ${carbon.home}/repository/resources/security/userRP.jks + ${carbon.home}/repository/resources/security/userRP.p12 - - JKS + + PKCS12 wso2carbon @@ -251,7 +251,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml index 797f368c4b0..725db52a4d5 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml +++ b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml @@ -34,10 +34,10 @@ - ${carbon.home}/repository/resources/security/userRP.jks + ${carbon.home}/repository/resources/security/userRP.p12 - - JKS + + PKCS12 wso2carbon @@ -251,7 +251,7 @@ ${Ports.ThriftEntitlementReceivePort} 10000 - ${carbon.home}/repository/resources/security/wso2carbon.jks + ${carbon.home}/repository/resources/security/wso2carbon.p12 wso2carbon diff --git a/modules/integration/tests-ui-integration/src/test/resources/automation.xml b/modules/integration/tests-ui-integration/src/test/resources/automation.xml index 7d2271fc28e..6700dd55c34 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/automation.xml +++ b/modules/integration/tests-ui-integration/src/test/resources/automation.xml @@ -82,9 +82,9 @@ --> - keystores/products/wso2carbon.jks - - JKS + keystores/products/wso2carbon.p12 + + PKCS12 wso2carbon @@ -98,9 +98,9 @@ --> - client-truststore.jks - - JKS + client-truststore.p12 + + PKCS12 wso2carbon diff --git a/modules/integration/tests-ui-integration/src/test/resources/automation_mapping.xsd b/modules/integration/tests-ui-integration/src/test/resources/automation_mapping.xsd index 2424cbf00da..8c248d3f423 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/automation_mapping.xsd +++ b/modules/integration/tests-ui-integration/src/test/resources/automation_mapping.xsd @@ -139,7 +139,7 @@ - Keystore type (JKS/PKCS12 etc.) + Keystore type (PKCS12/PKCS12 etc.) @@ -182,7 +182,7 @@ - trust-store type (JKS/PKCS12 + trust-store type (PKCS12/PKCS12 etc.) diff --git a/modules/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.jks deleted file mode 100644 index a7354f88d90..00000000000 Binary files a/modules/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.jks and /dev/null differ diff --git a/modules/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.p12 b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.p12 new file mode 100644 index 00000000000..5e9df3cfaa2 Binary files /dev/null and b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/client-truststore.p12 differ diff --git a/modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.jks deleted file mode 100644 index c9cc470d7af..00000000000 Binary files a/modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.jks and /dev/null differ diff --git a/modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.p12 b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.p12 new file mode 100644 index 00000000000..8c963834745 Binary files /dev/null and b/modules/integration/tests-ui-integration/src/test/resources/keystores/products/wso2carbon.p12 differ diff --git a/modules/integration/tests-ui-integration/tests-ui/pom.xml b/modules/integration/tests-ui-integration/tests-ui/pom.xml index 87b8c4e41c1..cff2f4f5e09 100644 --- a/modules/integration/tests-ui-integration/tests-ui/pom.xml +++ b/modules/integration/tests-ui-integration/tests-ui/pom.xml @@ -123,7 +123,7 @@ zip true ${basedir}/target/tobeCopied/ - **/*.jks,**/*.mar,**/axis2_client.xml + **/*.jks,**/*.p12,**/*.mar,**/axis2_client.xml @@ -231,7 +231,7 @@ ${basedir}/target/tobeCopied/wso2is-${project.version}/repository/resources/security/ - **/*.jks + **/*.jks,**/*.p12 diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/EndpointConfigDefault.properties b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/EndpointConfigDefault.properties index 879535a2771..1e4a65f1e71 100755 --- a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/EndpointConfigDefault.properties +++ b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/EndpointConfigDefault.properties @@ -18,9 +18,9 @@ tenantListEnabled=false hostname.verification.enabled=true mutual.ssl.username=admin -client.keyStore=./repository/resources/security/wso2carbon.jks +client.keyStore=./repository/resources/security/wso2carbon.p12 Carbon.Security.KeyStore.Password=wso2carbon -client.trustStore=./repository/resources/security/client-truststore.jks +client.trustStore=./repository/resources/security/client-truststore.p12 Carbon.Security.TrustStore.Password=wso2carbon identity.server.host=localhost identity.server.port=9443 diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/EndpointConfigTenantDropdownEnabled.properties b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/EndpointConfigTenantDropdownEnabled.properties index 0517af22b14..d7212a9f082 100755 --- a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/EndpointConfigTenantDropdownEnabled.properties +++ b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/EndpointConfigTenantDropdownEnabled.properties @@ -18,9 +18,9 @@ tenantListEnabled=true hostname.verification.enabled=true mutual.ssl.username=admin -client.keyStore=./repository/resources/security/wso2carbon.jks +client.keyStore=./repository/resources/security/wso2carbon.p12 Carbon.Security.KeyStore.Password=wso2carbon -client.trustStore=./repository/resources/security/client-truststore.jks +client.trustStore=./repository/resources/security/client-truststore.p12 Carbon.Security.TrustStore.Password=wso2carbon identity.server.host=localhost identity.server.port=9443 diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/application-authentication-default.xml b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/application-authentication-default.xml index 542360312bd..9758b6ad473 100755 --- a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/application-authentication-default.xml +++ b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/application-authentication-default.xml @@ -94,7 +94,7 @@ /authenticationendpoint/login.do - /repository/resources/security/client-truststore.jks + /repository/resources/security/client-truststore.p12 wso2carbon diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/application-authentication-tanantDropdown-enabled.xml b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/application-authentication-tanantDropdown-enabled.xml index d26c664c49c..9baef5dd5d9 100755 --- a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/application-authentication-tanantDropdown-enabled.xml +++ b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/application-authentication-tanantDropdown-enabled.xml @@ -94,7 +94,7 @@ /authenticationendpoint/login.do - /repository/resources/security/client-truststore.jks + /repository/resources/security/client-truststore.p12 wso2carbon diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/catalina-server-default.xml b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/catalina-server-default.xml index 6cce78cfa8e..20c9096ff8b 100644 --- a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/catalina-server-default.xml +++ b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/catalina-server-default.xml @@ -73,7 +73,7 @@ compressionMinSize="2048" noCompressionUserAgents="gozilla, traviata" compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg" - keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.jks" + keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.p12" keystorePass="wso2carbon" URIEncoding="UTF-8"/> diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/catalina-server-tanantDropdown-enabled.xml b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/catalina-server-tanantDropdown-enabled.xml index c68a93efced..6bec0ff8728 100644 --- a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/catalina-server-tanantDropdown-enabled.xml +++ b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/artifacts/IS/tenantDropdown/catalina-server-tanantDropdown-enabled.xml @@ -73,7 +73,7 @@ compressionMinSize="2048" noCompressionUserAgents="gozilla, traviata" compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg" - keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.jks" + keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.p12" keystorePass="wso2carbon" URIEncoding="UTF-8"/> diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/automation.xml b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/automation.xml index 449ee34e7e5..5a48a56eb5d 100644 --- a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/automation.xml +++ b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/automation.xml @@ -82,9 +82,9 @@ --> - keystores/products/wso2carbon.jks - - JKS + keystores/products/wso2carbon.p12 + + PKCS12 wso2carbon @@ -98,9 +98,9 @@ --> - client-truststore.jks - - JKS + client-truststore.p12 + + PKCS12 wso2carbon diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/automation_mapping.xsd b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/automation_mapping.xsd index c18b0826df0..f692e61f95a 100644 --- a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/automation_mapping.xsd +++ b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/automation_mapping.xsd @@ -138,7 +138,7 @@ - Keystore type (JKS/PKCS12 etc.) + Keystore type (PKCS12/PKCS12 etc.) @@ -181,7 +181,7 @@ - trust-store type (JKS/PKCS12 + trust-store type (PKCS12/PKCS12 etc.) diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/client-truststore.jks deleted file mode 100644 index a7354f88d90..00000000000 Binary files a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/client-truststore.jks and /dev/null differ diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/client-truststore.p12 b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/client-truststore.p12 new file mode 100644 index 00000000000..5e9df3cfaa2 Binary files /dev/null and b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/client-truststore.p12 differ diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/wso2carbon.jks deleted file mode 100644 index c9cc470d7af..00000000000 Binary files a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/wso2carbon.jks and /dev/null differ diff --git a/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/wso2carbon.p12 b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/wso2carbon.p12 new file mode 100644 index 00000000000..8c963834745 Binary files /dev/null and b/modules/integration/tests-ui-integration/tests-ui/src/test/resources/keystores/products/wso2carbon.p12 differ diff --git a/modules/p2-profile-gen/carbon.product b/modules/p2-profile-gen/carbon.product index c792cd2e74d..8e60ab8b500 100644 --- a/modules/p2-profile-gen/carbon.product +++ b/modules/p2-profile-gen/carbon.product @@ -2,7 +2,7 @@ +version="4.9.24" useFeatures="true" includeLaunchers="true"> @@ -14,7 +14,7 @@ version="4.9.23" useFeatures="true" includeLaunchers="true"> - + diff --git a/oidc-fapi-conformance-tests/config/deployment-fapi-config.toml b/oidc-fapi-conformance-tests/config/deployment-fapi-config.toml index 1d6d5cc0a2a..190da3942dc 100644 --- a/oidc-fapi-conformance-tests/config/deployment-fapi-config.toml +++ b/oidc-fapi-conformance-tests/config/deployment-fapi-config.toml @@ -24,13 +24,13 @@ username = "wso2carbon" password = "wso2carbon" [keystore.primary] -file_name = "wso2carbon.jks" +file_name = "wso2carbon.p12" password = "wso2carbon" [truststore] -file_name="client-truststore.jks" +file_name="client-truststore.p12" password="wso2carbon" -type="JKS" +type="PKCS12" [account_recovery.endpoint.auth] hash= "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262" diff --git a/oidc-fapi-conformance-tests/configure_is_fapi.py b/oidc-fapi-conformance-tests/configure_is_fapi.py index fef6d88614f..9fdbc26d537 100644 --- a/oidc-fapi-conformance-tests/configure_is_fapi.py +++ b/oidc-fapi-conformance-tests/configure_is_fapi.py @@ -138,9 +138,9 @@ def addCertsToKeystore(rootCertPath, issuerCertPath, ISPath): print(">>> Adding certs to keystore...") try: # add root cert to keystore - os.system("keytool -import -noprompt -trustcacerts -alias obroot -file " + rootCertPath + " -storetype JKS -keystore " + ISPath + "/repository/resources/security/client-truststore.jks -storepass wso2carbon") + os.system("keytool -import -noprompt -trustcacerts -alias obroot -file " + rootCertPath + " -storetype PKCS12 -keystore " + ISPath + "/repository/resources/security/client-truststore.p12 -storepass wso2carbon") # add issuer cert to keystore - os.system("keytool -import -noprompt -trustcacerts -alias obissuer -file " + issuerCertPath + " -storetype JKS -keystore " + ISPath + "/repository/resources/security/client-truststore.jks -storepass wso2carbon") + os.system("keytool -import -noprompt -trustcacerts -alias obissuer -file " + issuerCertPath + " -storetype PKCS12 -keystore " + ISPath + "/repository/resources/security/client-truststore.p12 -storepass wso2carbon") except Exception as error: print("\nError occurred: " + str(error)) exit(1) diff --git a/pom.xml b/pom.xml index b596ccade70..47f68cd13a8 100755 --- a/pom.xml +++ b/pom.xml @@ -2384,7 +2384,7 @@ 3.4.1 - 4.9.23 + 4.9.24 1.0.6 @@ -2433,7 +2433,7 @@ 3.1.1 - 4.3.10 + 4.3.11 2.5 2.0 2.0.4.wso2v5 diff --git a/product-scenarios/scenarios-commons/src/main/java/org/wso2/identity/scenarios/commons/security/SSOAgentX509KeyStoreCredential.java b/product-scenarios/scenarios-commons/src/main/java/org/wso2/identity/scenarios/commons/security/SSOAgentX509KeyStoreCredential.java index dd8a4aba0d4..f851937f32c 100644 --- a/product-scenarios/scenarios-commons/src/main/java/org/wso2/identity/scenarios/commons/security/SSOAgentX509KeyStoreCredential.java +++ b/product-scenarios/scenarios-commons/src/main/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 = KeyStore.getInstance("JKS"); + KeyStore keyStore = KeyStore.getInstance("PKCS12"); keyStore.load(keyStoreInputStream, keyStorePassword); readX509Credentials(keyStore, publicCertAlias, privateKeyAlias, privateKeyPassword); } catch (Exception e) { diff --git a/product-scenarios/scenarios-commons/src/main/java/org/wso2/identity/scenarios/commons/util/DeploymentUtil.java b/product-scenarios/scenarios-commons/src/main/java/org/wso2/identity/scenarios/commons/util/DeploymentUtil.java index 637c85f712f..c86e6a474b9 100644 --- a/product-scenarios/scenarios-commons/src/main/java/org/wso2/identity/scenarios/commons/util/DeploymentUtil.java +++ b/product-scenarios/scenarios-commons/src/main/java/org/wso2/identity/scenarios/commons/util/DeploymentUtil.java @@ -33,7 +33,7 @@ public class DeploymentUtil { private static final String DEPLOYMENT_PROPERTIES = "deployment.properties"; private static final String JOB_PROPERTIES = "testplan-props.properties"; private static final Logger LOG = LoggerFactory.getLogger(DeploymentUtil.class); - private static final String PATH_TO_WSO2CARBON_JKS = "keystores/products/wso2carbon.jks"; + private static final String PATH_TO_WSO2CARBON_JKS = "keystores/products/wso2carbon.p12"; private static final String DATA_BUCKET_LOCATION = "DATA_BUCKET_LOCATION"; @@ -42,7 +42,7 @@ public static void setKeyStoreProperties() { String RESOURCE_LOCATION = System.getProperty("common.resource.location"); System.setProperty("javax.net.ssl.trustStore", RESOURCE_LOCATION + PATH_TO_WSO2CARBON_JKS); System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon"); - System.setProperty("javax.net.ssl.trustStoreType", "JKS"); + System.setProperty("javax.net.ssl.trustStoreType", "PKCS12"); } /** diff --git a/product-scenarios/scenarios-commons/src/main/resources/keystores/products/wso2carbon.jks b/product-scenarios/scenarios-commons/src/main/resources/keystores/products/wso2carbon.jks deleted file mode 100644 index c60c25db6d2..00000000000 Binary files a/product-scenarios/scenarios-commons/src/main/resources/keystores/products/wso2carbon.jks and /dev/null differ diff --git a/product-scenarios/scenarios-commons/src/main/resources/keystores/products/wso2carbon.p12 b/product-scenarios/scenarios-commons/src/main/resources/keystores/products/wso2carbon.p12 new file mode 100644 index 00000000000..8c963834745 Binary files /dev/null and b/product-scenarios/scenarios-commons/src/main/resources/keystores/products/wso2carbon.p12 differ diff --git a/usecases/common/client-truststore.jks b/usecases/common/client-truststore.jks deleted file mode 100644 index 0b2b31e29ef..00000000000 Binary files a/usecases/common/client-truststore.jks and /dev/null differ diff --git a/usecases/common/client-truststore.p12 b/usecases/common/client-truststore.p12 new file mode 100644 index 00000000000..5e9df3cfaa2 Binary files /dev/null and b/usecases/common/client-truststore.p12 differ diff --git a/usecases/uc.sh b/usecases/uc.sh index a058af55b56..a122bd6f40e 100644 --- a/usecases/uc.sh +++ b/usecases/uc.sh @@ -3,7 +3,7 @@ rm -rf wso2is-4.7.0 unzip modules/distribution/target/wso2is-4.7.0.zip cp usecases/common/drivers/informix/*.jar wso2is-4.7.0/repository/components/lib/ cp usecases/common/drivers/mysql/*.jar wso2is-4.7.0/repository/components/lib/ -cp usecases/common/client-truststore.jks wso2is-4.7.0/repository/resources/security/ +cp usecases/common/client-truststore.p12 wso2is-4.7.0/repository/resources/security/ cp usecases/common/informix-um/*.jar wso2is-4.7.0/repository/components/lib/ cp usecases/$1/master-datasources.xml wso2is-4.7.0/repository/conf/datasources/ cp usecases/$1/user-mgt.xml wso2is-4.7.0/repository/conf/