From c5363aef775a5ee38fc667df87ac32c642ef6bac Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 18 May 2012 17:54:23 +0000 Subject: QPID-3973 : [Java] Add support for non JKS key store types (patch supplied by jsightle@redhat.com) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1340191 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java | 3 ++- .../org/apache/qpid/server/configuration/ServerConfiguration.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'qpid/java/broker/src/main') diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java index 5004d320c2..ac1fcf05db 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java @@ -242,8 +242,9 @@ public class Broker { final String keystorePath = serverConfig.getConnectorKeyStorePath(); final String keystorePassword = serverConfig.getConnectorKeyStorePassword(); + final String keystoreType = serverConfig.getConnectorKeyStoreType(); final String keyManagerFactoryAlgorithm = serverConfig.getConnectorKeyManagerFactoryAlgorithm(); - final SSLContext sslContext = SSLContextFactory.buildServerContext(keystorePath, keystorePassword, keyManagerFactoryAlgorithm); + final SSLContext sslContext = SSLContextFactory.buildServerContext(keystorePath, keystorePassword, keystoreType, keyManagerFactoryAlgorithm); for(int sslPort : sslPorts) { diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 0be4e682c9..baf6d5e6ad 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -743,7 +743,7 @@ public class ServerConfiguration extends ConfigurationPlugin { return getBooleanValue("connector.ssl.sslOnly"); } - + public List getSSLPorts() { return getListValue("connector.ssl.port", Collections.singletonList(DEFAULT_SSL_PORT)); @@ -761,6 +761,11 @@ public class ServerConfiguration extends ConfigurationPlugin return getStringValue("connector.ssl.keyStorePassword", fallback); } + public String getConnectorKeyStoreType() + { + return getStringValue("connector.ssl.keyStoreType", "JKS"); + } + public String getConnectorKeyManagerFactoryAlgorithm() { final String systemFallback = KeyManagerFactory.getDefaultAlgorithm(); -- cgit v1.2.1