Merge pull request #1714 from Arshardh/bny-ssl-fix-main

Use system property to get SSL algorithm
wso2 · Jul 11, 2024 · d85f038 · d85f038
2 parents 3d95991 + 668eb2c
commit d85f038
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/....websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/utils/SSLUtil.java b/....websocket.transport/src/main/java/org/wso2/carbon/websocket/transport/utils/SSLUtil.java
@@ -53,7 +53,7 @@ public static SSLContext createServerSSLContext(final String keyStoreLocation,
  KeyStore keyStore = KeyStore.getInstance(KEY_STORE_TYPE);
  keyStore.load(new FileInputStream(keyStoreLocation), keyStorePwd.toCharArray());
  KeyManagerFactory keyManagerFactory =
- KeyManagerFactory.getInstance(KEY_MANAGER_TYPE);
+ KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
  keyManagerFactory.init(keyStore, keyStorePwd.toCharArray());
  serverSSLCtx = SSLContext.getInstance(PROTOCOL);
  serverSSLCtx.init(keyManagerFactory.getKeyManagers(), null, null);
@@ -85,7 +85,7 @@ public static SSLContext createClientSSLContext(final String trustStoreLocation,
  trustStore.load(new FileInputStream(trustStoreLocation),
  trustStorePwd.toCharArray());
  TrustManagerFactory trustManagerFactory =
- TrustManagerFactory.getInstance(TRUST_MANAGER_TYPE);
+ TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
  trustManagerFactory.init(trustStore);
  clientSSLCtx = SSLContext.getInstance(PROTOCOL);
  clientSSLCtx.init(null, trustManagerFactory.getTrustManagers(), null);
@@ -116,7 +116,7 @@ public static TrustManagerFactory createTrustmanager(final String trustStoreLoca
  KeyStore trustStore = KeyStore.getInstance(TRUST_STORE_TYPE);
  trustStore.load(new FileInputStream(trustStoreLocation),
  trustStorePwd.toCharArray());
- trustManagerFactory = TrustManagerFactory.getInstance(TRUST_MANAGER_TYPE);
+ trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
  trustManagerFactory.init(trustStore);
  // clientSSLCtx = SSLContext.getInstance(PROTOCOL);
  // clientSSLCtx.init(null,