Do not much with properties and magix strings -- use proper method to
acquire the algorithm.
Change-Id: I91b6a4f8fdaab1abf9bbaa665957f92d96e59663
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
ec63fac5ca8b3ab7d5674d0921f3115e8bef86b2)
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
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;
import java.security.UnrecoverableKeyException;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
@Override
public SSLContext getServerContext() {
@Override
public SSLContext getServerContext() {
- String algorithm = Security.getProperty("ssl.KeyManagerFactory.algorithm");
- if (algorithm == null) {
- algorithm = "SunX509";
- }
SSLContext serverContext = null;
try {
SSLContext serverContext = null;
try {
- KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(aaaCertProvider.getODLKeyStore(),
aaaCertProvider.getOdlKeyStoreInfo().getStorePassword().toCharArray());
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(KeyStoreConstant.TLS_PROTOCOL);
tmf.init(aaaCertProvider.getTrustKeyStore());
serverContext = SSLContext.getInstance(KeyStoreConstant.TLS_PROTOCOL);