Author: markt
Date: Tue Oct 9 19:07:25 2018
New Revision: 1843329
URL: http://svn.apache.org/viewvc?rev=1843329&view=rev
Log:
Revert previous change. It will break with the defaults.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java?rev=1843329&r1=1843328&r2=1843329&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
Tue Oct 9 19:07:25 2018
@@ -77,6 +77,7 @@ public class CertificateStreamProvider e
}
private static KeyManager[] configureClientCert(String clientCertFile,
String clientKeyFile, char[] clientKeyPassword, String clientKeyAlgo) throws
Exception {
+ // TODO What is intended usage of clientKeyAlgo?
try (InputStream certInputStream = new
FileInputStream(clientCertFile)) {
CertificateFactory certFactory =
CertificateFactory.getInstance("X509");
X509Certificate cert =
(X509Certificate)certFactory.generateCertificate(certInputStream);
@@ -90,7 +91,7 @@ public class CertificateStreamProvider e
String alias = cert.getSubjectX500Principal().getName();
keyStore.setKeyEntry(alias, privKey, clientKeyPassword, new
Certificate[]{cert});
- KeyManagerFactory keyManagerFactory =
KeyManagerFactory.getInstance(clientKeyAlgo);
+ KeyManagerFactory keyManagerFactory =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
keyManagerFactory.init(keyStore, clientKeyPassword);
return keyManagerFactory.getKeyManagers();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
