diff --git a/etc/backend-service/pom.xml b/etc/backend-service/pom.xml index e307f616a..10e2ba29c 100644 --- a/etc/backend-service/pom.xml +++ b/etc/backend-service/pom.xml @@ -79,7 +79,7 @@ ${project.basedir}/../resources - wso2carbon.jks + wso2carbon.p12 diff --git a/etc/backend-service/src/main/org/wso2/sample/identity/backend/BackendApplication.java b/etc/backend-service/src/main/org/wso2/sample/identity/backend/BackendApplication.java index 85fce2de9..dbdee9ebd 100644 --- a/etc/backend-service/src/main/org/wso2/sample/identity/backend/BackendApplication.java +++ b/etc/backend-service/src/main/org/wso2/sample/identity/backend/BackendApplication.java @@ -37,7 +37,7 @@ public class BackendApplication { private static final Logger logger = LoggerFactory.getLogger(BookingService.class); private static final Properties properties = new Properties(); - // Perform property loading and JKS setup + // Perform property loading and keystore setup static { final InputStream resourceAsStream = BackendApplication.class.getClassLoader().getResourceAsStream("service.properties"); @@ -50,40 +50,41 @@ public class BackendApplication { throw new RuntimeException("Service start failed due to configuration loading failure", e); } - setupJKS(); + setupKeystore(); } - private static void setupJKS() { - // First find jks properties - final InputStream jksInputStream = BackendApplication.class.getClassLoader().getResourceAsStream("jks.properties"); + private static void setupKeystore() { + // First find keystore properties + final InputStream keystoreInputStream = BackendApplication.class.getClassLoader() + .getResourceAsStream("keystore.properties"); - if (jksInputStream == null) { - logger.error("jks.properties not found. Trust store properties will not be set."); + if (keystoreInputStream == null) { + logger.error("keystore.properties not found. Trust store properties will not be set."); return; } // Load properties - final Properties jksProperties = new Properties(); + final Properties keystoreProperties = new Properties(); try { - jksProperties.load(jksInputStream); + keystoreProperties.load(keystoreInputStream); } catch (IOException e) { logger.error("Error while loading properties.", e); return; } - // Find and store JKS required for SSL communication on a temporary location - final InputStream keyStoreAsStream = BackendApplication.class.getClassLoader().getResourceAsStream(jksProperties.getProperty("keystorename")); + // Find and store keystore required for SSL communication on a temporary location + final InputStream keyStoreAsStream = BackendApplication.class.getClassLoader().getResourceAsStream(keystoreProperties.getProperty("keystorename")); try { - final File keystoreTempFile = File.createTempFile(jksProperties.getProperty("keystorename"), ""); + final File keystoreTempFile = File.createTempFile(keystoreProperties.getProperty("keystorename"), ""); keystoreTempFile.deleteOnExit(); Files.copy(keyStoreAsStream, keystoreTempFile.toPath(), StandardCopyOption.REPLACE_EXISTING); logger.info("Setting trust store path to : " + keystoreTempFile.getPath()); System.setProperty("javax.net.ssl.trustStore", keystoreTempFile.getPath()); - System.setProperty("javax.net.ssl.trustStorePassword", jksProperties.getProperty("keystorepassword")); + System.setProperty("javax.net.ssl.trustStorePassword", keystoreProperties.getProperty("keystorepassword")); } catch (IOException e) { logger.error("Error while setting trust store", e); throw new RuntimeException(e); diff --git a/etc/backend-service/src/main/resources/jks.properties b/etc/backend-service/src/main/resources/keystore.properties similarity index 50% rename from etc/backend-service/src/main/resources/jks.properties rename to etc/backend-service/src/main/resources/keystore.properties index db6fe95e1..e0e341c92 100644 --- a/etc/backend-service/src/main/resources/jks.properties +++ b/etc/backend-service/src/main/resources/keystore.properties @@ -1,2 +1,2 @@ -keystorename=wso2carbon.jks +keystorename=wso2carbon.p12 keystorepassword=wso2carbon diff --git a/etc/pickup-sample-app/pickup-saml/src/main/resources/wso2carbon.jks b/etc/pickup-sample-app/pickup-saml/src/main/resources/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/etc/pickup-sample-app/pickup-saml/src/main/resources/wso2carbon.jks and /dev/null differ diff --git a/etc/pickup-sample-app/pickup-saml/src/main/resources/wso2carbon.p12 b/etc/pickup-sample-app/pickup-saml/src/main/resources/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/etc/pickup-sample-app/pickup-saml/src/main/resources/wso2carbon.p12 differ diff --git a/etc/pickup-sample-app/pickup-saml/src/main/webapp/WEB-INF/web.xml b/etc/pickup-sample-app/pickup-saml/src/main/webapp/WEB-INF/web.xml index 3e1f16d49..072f72f09 100644 --- a/etc/pickup-sample-app/pickup-saml/src/main/webapp/WEB-INF/web.xml +++ b/etc/pickup-sample-app/pickup-saml/src/main/webapp/WEB-INF/web.xml @@ -41,7 +41,7 @@ certificate-file - wso2carbon.jks + wso2carbon.p12 diff --git a/etc/resources/wso2carbon.jks b/etc/resources/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/etc/resources/wso2carbon.jks and /dev/null differ diff --git a/etc/resources/wso2carbon.p12 b/etc/resources/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/etc/resources/wso2carbon.p12 differ diff --git a/identity-mgt/info-recovery-sample/README.txt b/identity-mgt/info-recovery-sample/README.txt index 171b4cf7d..3cb642f05 100644 --- a/identity-mgt/info-recovery-sample/README.txt +++ b/identity-mgt/info-recovery-sample/README.txt @@ -23,7 +23,7 @@ Specify the credentials to access Identity Server with admin privileges for "acc Specify the captcha validation enable or disable in the webApp using captchaDisable propery. -Specify the trustStore absolute resource path for "trustStorePath". eg. path to wso2carbon.jks of the Identity Server +Specify the trustStore absolute resource path for "trustStorePath". eg. path to wso2carbon.p12 of the Identity Server 2. If you are deploying the sample in tomcat enable the SSL configuration in {tomcat_home}/conf/server.xml @@ -32,7 +32,7 @@ Specify the trustStore absolute resource path for "trustStorePath". eg. path to + keystoreFile="/repository/resources/security/wso2carbon.p12" keystorePass="wso2carbon" /> 3. Configure the email confirmation links. diff --git a/identity-mgt/info-recovery-sample/pom.xml b/identity-mgt/info-recovery-sample/pom.xml index 27ba4ef2f..97689a2bd 100644 --- a/identity-mgt/info-recovery-sample/pom.xml +++ b/identity-mgt/info-recovery-sample/pom.xml @@ -107,12 +107,12 @@ javax.net.ssl.keystore - ${basedir}/src/main/resources/keystores/client-truststore.jks + ${basedir}/src/main/resources/keystores/client-truststore.p12 javax.net.ssl.trustStoreType - JKS + PKCS12 javax.net.ssl.trustStorePassword diff --git a/identity-mgt/info-recovery-sample/src/main/resources/client-truststore.jks b/identity-mgt/info-recovery-sample/src/main/resources/client-truststore.jks deleted file mode 100644 index e665f9b5d..000000000 Binary files a/identity-mgt/info-recovery-sample/src/main/resources/client-truststore.jks and /dev/null differ diff --git a/identity-mgt/info-recovery-sample/src/main/resources/client-truststore.p12 b/identity-mgt/info-recovery-sample/src/main/resources/client-truststore.p12 new file mode 100644 index 000000000..5e9df3cfa Binary files /dev/null and b/identity-mgt/info-recovery-sample/src/main/resources/client-truststore.p12 differ diff --git a/identity-mgt/info-recovery-sample/src/main/resources/wso2carbon.jks b/identity-mgt/info-recovery-sample/src/main/resources/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/identity-mgt/info-recovery-sample/src/main/resources/wso2carbon.jks and /dev/null differ diff --git a/identity-mgt/info-recovery-sample/src/main/resources/wso2carbon.p12 b/identity-mgt/info-recovery-sample/src/main/resources/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/identity-mgt/info-recovery-sample/src/main/resources/wso2carbon.p12 differ diff --git a/identity-mgt/info-recovery-sample/src/main/webapp/WEB-INF/web.xml b/identity-mgt/info-recovery-sample/src/main/webapp/WEB-INF/web.xml index f66a36fd1..cc7383d02 100644 --- a/identity-mgt/info-recovery-sample/src/main/webapp/WEB-INF/web.xml +++ b/identity-mgt/info-recovery-sample/src/main/webapp/WEB-INF/web.xml @@ -245,7 +245,7 @@ trustStorePath - /client-truststore.jks + /client-truststore.p12 accessUsername diff --git a/microprofile/microprofile-jwt/src/main/liberty/config/server.xml b/microprofile/microprofile-jwt/src/main/liberty/config/server.xml index aa78ed0e4..5dd7b288b 100644 --- a/microprofile/microprofile-jwt/src/main/liberty/config/server.xml +++ b/microprofile/microprofile-jwt/src/main/liberty/config/server.xml @@ -17,6 +17,6 @@ audiences="li6JMbjW6WDMKTWsRnGcjp5zcGhi" ignoreApplicationAuthMethod="false"> - diff --git a/oauth/oauth10a-resource-owner-equivalent/src/main/java/org/wso2/carbon/identity/samples/oauth/Main.java b/oauth/oauth10a-resource-owner-equivalent/src/main/java/org/wso2/carbon/identity/samples/oauth/Main.java index bec81c0af..441b42346 100644 --- a/oauth/oauth10a-resource-owner-equivalent/src/main/java/org/wso2/carbon/identity/samples/oauth/Main.java +++ b/oauth/oauth10a-resource-owner-equivalent/src/main/java/org/wso2/carbon/identity/samples/oauth/Main.java @@ -78,10 +78,10 @@ public static void main(String[] args) { /** * Call to Identity Server uses HTTPS protocol. * Therefore we to validate the server certificate. The server certificate is looked up in the - * trust store. Following code sets what trust-store to look for and its JKs password. + * trust store. Following code sets what trust-store to look for and its PKCS12 password. * Note : The trust store should have server's certificate. */ - System.setProperty("javax.net.ssl.trustStore", new File("src/main/resources/wso2carbon.jks").getAbsolutePath()); + System.setProperty("javax.net.ssl.trustStore", new File("src/main/resources/wso2carbon.p12").getAbsolutePath()); System.setProperty("javax.net.ssl.trustStorePassword", "wso2carbon"); client = new OAuthServiceClient(IDENTITY_SERVER , configContext, ADMIN_USER_NAME, ADMIN_PASSWORD); diff --git a/oauth/oauth10a-resource-owner-equivalent/src/main/resources/wso2carbon.jks b/oauth/oauth10a-resource-owner-equivalent/src/main/resources/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/oauth/oauth10a-resource-owner-equivalent/src/main/resources/wso2carbon.jks and /dev/null differ diff --git a/oauth/oauth10a-resource-owner-equivalent/src/main/resources/wso2carbon.p12 b/oauth/oauth10a-resource-owner-equivalent/src/main/resources/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/oauth/oauth10a-resource-owner-equivalent/src/main/resources/wso2carbon.p12 differ diff --git a/oidc-uma-samples/photo-edit/src/main/resources/jks.properties b/oidc-uma-samples/photo-edit/src/main/resources/keystore.properties similarity index 50% rename from oidc-uma-samples/photo-edit/src/main/resources/jks.properties rename to oidc-uma-samples/photo-edit/src/main/resources/keystore.properties index db6fe95e1..e0e341c92 100644 --- a/oidc-uma-samples/photo-edit/src/main/resources/jks.properties +++ b/oidc-uma-samples/photo-edit/src/main/resources/keystore.properties @@ -1,2 +1,2 @@ -keystorename=wso2carbon.jks +keystorename=wso2carbon.p12 keystorepassword=wso2carbon diff --git a/oidc-uma-samples/photo-view/src/main/resources/jks.properties b/oidc-uma-samples/photo-view/src/main/resources/keystore.properties similarity index 50% rename from oidc-uma-samples/photo-view/src/main/resources/jks.properties rename to oidc-uma-samples/photo-view/src/main/resources/keystore.properties index db6fe95e1..e0e341c92 100644 --- a/oidc-uma-samples/photo-view/src/main/resources/jks.properties +++ b/oidc-uma-samples/photo-view/src/main/resources/keystore.properties @@ -1,2 +1,2 @@ -keystorename=wso2carbon.jks +keystorename=wso2carbon.p12 keystorepassword=wso2carbon diff --git a/saml-query-profile-client/src/main/resources/wso2carbon.jks b/saml-query-profile-client/src/main/resources/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/saml-query-profile-client/src/main/resources/wso2carbon.jks and /dev/null differ diff --git a/saml-query-profile-client/src/main/resources/wso2carbon.p12 b/saml-query-profile-client/src/main/resources/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/saml-query-profile-client/src/main/resources/wso2carbon.p12 differ diff --git a/scim/scim-provisioning/src/main/java/org/wso2/scim/sample/utils/SCIMSamplesUtils.java b/scim/scim-provisioning/src/main/java/org/wso2/scim/sample/utils/SCIMSamplesUtils.java index 8b629a494..4ca9a8bc1 100644 --- a/scim/scim-provisioning/src/main/java/org/wso2/scim/sample/utils/SCIMSamplesUtils.java +++ b/scim/scim-provisioning/src/main/java/org/wso2/scim/sample/utils/SCIMSamplesUtils.java @@ -34,7 +34,7 @@ public class SCIMSamplesUtils { public static final String IS_HOME = ".." + File.separator + ".." + File.separator; public static final String TRUST_STORE_PATH = IS_HOME + "repository" + File.separator + "resources" + - File.separator + "security" + File.separator + "wso2carbon.jks"; + File.separator + "security" + File.separator + "wso2carbon.p12"; public static final String TRUST_STORE_PASS = "wso2carbon"; diff --git a/sso-samples/oidc-sso-sample/pickup-dispatch/pom.xml b/sso-samples/oidc-sso-sample/pickup-dispatch/pom.xml index f2c9c1ffb..023f24b0b 100644 --- a/sso-samples/oidc-sso-sample/pickup-dispatch/pom.xml +++ b/sso-samples/oidc-sso-sample/pickup-dispatch/pom.xml @@ -53,7 +53,7 @@ org.wso2.samples.is - oidc-jks-loader + oidc-keystore-loader ${project.version} diff --git a/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/jks.properties b/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/keystore.properties similarity index 50% rename from sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/jks.properties rename to sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/keystore.properties index db6fe95e1..e0e341c92 100644 --- a/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/jks.properties +++ b/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/resources/keystore.properties @@ -1,2 +1,2 @@ -keystorename=wso2carbon.jks +keystorename=wso2carbon.p12 keystorepassword=wso2carbon diff --git a/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/webapp/WEB-INF/web.xml b/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/webapp/WEB-INF/web.xml index 033b5a0ca..f7feee88b 100644 --- a/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/webapp/WEB-INF/web.xml +++ b/sso-samples/oidc-sso-sample/pickup-dispatch/src/main/webapp/WEB-INF/web.xml @@ -60,7 +60,7 @@ - org.wso2.sample.identity.jks.JKSLoader + org.wso2.sample.identity.KeystoreLoader org.wso2.sample.identity.oauth2.SampleContextEventListener diff --git a/sso-samples/oidc-sso-sample/pickup-manager/pom.xml b/sso-samples/oidc-sso-sample/pickup-manager/pom.xml index 3dcd0a3b4..e4f36aa60 100644 --- a/sso-samples/oidc-sso-sample/pickup-manager/pom.xml +++ b/sso-samples/oidc-sso-sample/pickup-manager/pom.xml @@ -58,7 +58,7 @@ org.wso2.samples.is - oidc-jks-loader + oidc-keystore-loader ${project.version} diff --git a/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/jks.properties b/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/jks.properties deleted file mode 100644 index db6fe95e1..000000000 --- a/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/jks.properties +++ /dev/null @@ -1,2 +0,0 @@ -keystorename=wso2carbon.jks -keystorepassword=wso2carbon diff --git a/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/keystore.properties b/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/keystore.properties new file mode 100644 index 000000000..e6b748e36 --- /dev/null +++ b/sso-samples/oidc-sso-sample/pickup-manager/src/main/resources/keystore.properties @@ -0,0 +1,2 @@ +keystorename=wso2carbon.12 +keystorepassword=wso2carbon diff --git a/sso-samples/saml2-sso-sample/saml2-web-app-pickup-dispatch/src/main/webapp/WEB-INF/web.xml b/sso-samples/saml2-sso-sample/saml2-web-app-pickup-dispatch/src/main/webapp/WEB-INF/web.xml index 21d8cca50..dcdfd2467 100644 --- a/sso-samples/saml2-sso-sample/saml2-web-app-pickup-dispatch/src/main/webapp/WEB-INF/web.xml +++ b/sso-samples/saml2-sso-sample/saml2-web-app-pickup-dispatch/src/main/webapp/WEB-INF/web.xml @@ -57,7 +57,7 @@ certificate-file - wso2carbon.jks + wso2carbon.p12 diff --git a/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/resources/wso2carbon.jks b/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/resources/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/resources/wso2carbon.jks and /dev/null differ diff --git a/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/resources/wso2carbon.p12 b/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/resources/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/resources/wso2carbon.p12 differ diff --git a/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/webapp/WEB-INF/web.xml b/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/webapp/WEB-INF/web.xml index 9d47e30b9..84d7464d2 100644 --- a/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/webapp/WEB-INF/web.xml +++ b/sso-samples/saml2-sso-sample/saml2-web-app-pickup-manager/src/main/webapp/WEB-INF/web.xml @@ -57,7 +57,7 @@ certificate-file - wso2carbon.jks + wso2carbon.p12 diff --git a/sso/sso-agent-sample/src/main/java/org/wso2/sample/is/sso/agent/SampleContextEventListener.java b/sso/sso-agent-sample/src/main/java/org/wso2/sample/is/sso/agent/SampleContextEventListener.java index f9f807a45..0c31099c1 100644 --- a/sso/sso-agent-sample/src/main/java/org/wso2/sample/is/sso/agent/SampleContextEventListener.java +++ b/sso/sso-agent-sample/src/main/java/org/wso2/sample/is/sso/agent/SampleContextEventListener.java @@ -56,7 +56,7 @@ public void contextInitialized(ServletContextEvent servletContextEvent) { } } InputStream keyStoreInputStream = servletContextEvent.getServletContext(). - getResourceAsStream("/WEB-INF/classes/wso2carbon.jks"); + getResourceAsStream("/WEB-INF/classes/wso2carbon.p12"); SSOAgentX509Credential credential = new SSOAgentX509KeyStoreCredential(keyStoreInputStream, properties.getProperty("KeyStorePassword").toCharArray(), diff --git a/sso/sso-agent-sample/src/main/resources/wso2carbon.jks b/sso/sso-agent-sample/src/main/resources/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/sso/sso-agent-sample/src/main/resources/wso2carbon.jks and /dev/null differ diff --git a/sso/sso-agent-sample/src/main/resources/wso2carbon.p12 b/sso/sso-agent-sample/src/main/resources/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/sso/sso-agent-sample/src/main/resources/wso2carbon.p12 differ diff --git a/sts/sts-client/src/main/java/org/wso2/carbon/identity/samples/sts/Client.java b/sts/sts-client/src/main/java/org/wso2/carbon/identity/samples/sts/Client.java index 7d6f3bae0..f7f5c4865 100644 --- a/sts/sts-client/src/main/java/org/wso2/carbon/identity/samples/sts/Client.java +++ b/sts/sts-client/src/main/java/org/wso2/carbon/identity/samples/sts/Client.java @@ -354,7 +354,7 @@ private RampartConfig buildRampartConfig() { Properties cryptoProperties = new Properties(); cryptoProperties.put( - "org.apache.ws.security.crypto.merlin.keystore.type", "JKS"); + "org.apache.ws.security.crypto.merlin.keystore.type", "PKCS12"); cryptoProperties.put("org.apache.ws.security.crypto.merlin.file", keystorePath); cryptoProperties.put( diff --git a/sts/sts-client/src/main/resources/client.properties b/sts/sts-client/src/main/resources/client.properties index 5f9a85471..cd459e1b0 100644 --- a/sts/sts-client/src/main/resources/client.properties +++ b/sts/sts-client/src/main/resources/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/sts/sts-client/src/main/resources/keystore/wso2carbon.jks b/sts/sts-client/src/main/resources/keystore/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/sts/sts-client/src/main/resources/keystore/wso2carbon.jks and /dev/null differ diff --git a/sts/sts-client/src/main/resources/keystore/wso2carbon.p12 b/sts/sts-client/src/main/resources/keystore/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/sts/sts-client/src/main/resources/keystore/wso2carbon.p12 differ diff --git a/user-mgt/remote-user-mgt/client.properties b/user-mgt/remote-user-mgt/client.properties index c03f2db6d..0ad592b71 100644 --- a/user-mgt/remote-user-mgt/client.properties +++ b/user-mgt/remote-user-mgt/client.properties @@ -5,5 +5,5 @@ remote.server.url=https://localhost:9443/services/ user.name=admin user.password=admin -truststore.path=keystore/client-truststore.jks +truststore.path=keystore/client-truststore.P12 truststore.password=wso2carbon diff --git a/user-mgt/remote-user-mgt/src/main/resources/keystore/client-truststore.jks b/user-mgt/remote-user-mgt/src/main/resources/keystore/client-truststore.jks deleted file mode 100644 index e665f9b5d..000000000 Binary files a/user-mgt/remote-user-mgt/src/main/resources/keystore/client-truststore.jks and /dev/null differ diff --git a/user-mgt/remote-user-mgt/src/main/resources/keystore/client-truststore.p12 b/user-mgt/remote-user-mgt/src/main/resources/keystore/client-truststore.p12 new file mode 100644 index 000000000..5e9df3cfa Binary files /dev/null and b/user-mgt/remote-user-mgt/src/main/resources/keystore/client-truststore.p12 differ diff --git a/xacml/kmarket-trading-sample/src/main/java/org/wso2/carbon/identity/samples/entitlement/kmarket/trading/WSO2IdentityAgent.java b/xacml/kmarket-trading-sample/src/main/java/org/wso2/carbon/identity/samples/entitlement/kmarket/trading/WSO2IdentityAgent.java index add630e79..2e397a167 100644 --- a/xacml/kmarket-trading-sample/src/main/java/org/wso2/carbon/identity/samples/entitlement/kmarket/trading/WSO2IdentityAgent.java +++ b/xacml/kmarket-trading-sample/src/main/java/org/wso2/carbon/identity/samples/entitlement/kmarket/trading/WSO2IdentityAgent.java @@ -104,7 +104,7 @@ public WSO2IdentityAgent(Properties properties) { try{ trustStore = (new File(".")).getCanonicalPath() + File.separator + "src" + File.separator + "main" + File.separator + - "resources" + File.separator + "wso2carbon.jks"; + "resources" + File.separator + "wso2carbon.P12"; } catch (IOException e) { e.printStackTrace(); } @@ -119,7 +119,7 @@ public WSO2IdentityAgent(Properties properties) { * Call to https://localhost:9443/services/ uses HTTPS protocol. * Therefore we to validate the server certificate or CA chain. The server certificate is looked up in the * trust store. - * Following code sets what trust-store to look for and its JKs password. + * Following code sets what trust-store to look for and its PKCS12 password. */ System.setProperty("javax.net.ssl.trustStore", trustStore ); diff --git a/xacml/kmarket-trading-sample/src/main/resources/wso2carbon.jks b/xacml/kmarket-trading-sample/src/main/resources/wso2carbon.jks deleted file mode 100644 index 86e6bcad8..000000000 Binary files a/xacml/kmarket-trading-sample/src/main/resources/wso2carbon.jks and /dev/null differ diff --git a/xacml/kmarket-trading-sample/src/main/resources/wso2carbon.p12 b/xacml/kmarket-trading-sample/src/main/resources/wso2carbon.p12 new file mode 100644 index 000000000..8c9638347 Binary files /dev/null and b/xacml/kmarket-trading-sample/src/main/resources/wso2carbon.p12 differ