From ec63fac5ca8b3ab7d5674d0921f3115e8bef86b2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 16 Feb 2023 13:24:22 +0100 Subject: [PATCH] Use {Key,Trust}ManagerFactory.getDefaultAlgorithm() Do not much with properties and magix strings -- use proper method to acquire the algorithm. Change-Id: I91b6a4f8fdaab1abf9bbaa665957f92d96e59663 Signed-off-by: Robert Varga --- .../aaa/cert/impl/CertificateManagerService.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java index d08f56913..1303e24bf 100644 --- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java +++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java @@ -13,7 +13,6 @@ import java.security.KeyManagementException; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; -import java.security.Security; import java.security.UnrecoverableKeyException; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; @@ -145,16 +144,12 @@ public class CertificateManagerService implements ICertificateManager, AutoClose @Override public SSLContext getServerContext() { - String algorithm = Security.getProperty("ssl.KeyManagerFactory.algorithm"); - if (algorithm == null) { - algorithm = "SunX509"; - } SSLContext serverContext = null; try { - KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm); + KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); kmf.init(aaaCertProvider.getODLKeyStore(), aaaCertProvider.getOdlKeyStoreInfo().getStorePassword().toCharArray()); - TrustManagerFactory tmf = TrustManagerFactory.getInstance(algorithm); + TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); tmf.init(aaaCertProvider.getTrustKeyStore()); serverContext = SSLContext.getInstance("TLS"); -- 2.36.6