From c9be76aa5748caa7e04fd35386eb08b5c40d968a Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Mon, 12 Oct 2015 09:34:55 +0000
Subject: [PATCH] OPENDJ-1959: Duplicated WARNING messages
---
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
index 2318dbb..c27d3e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
@@ -49,7 +49,6 @@
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509ExtendedKeyManager;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -209,8 +208,8 @@
// TODO: Move the following configuration to replication configuration.
// TODO: https://opends.dev.java.net/issues/show_bug.cgi?id=2473
- /** The name of the local certificate to use for SSL. */
- private final String sslCertNickname;
+ /** The names of the local certificates to use for SSL. */
+ private final SortedSet<String> sslCertNicknames;
/** Whether replication sessions use SSL encryption. */
private final boolean sslEncryption;
@@ -296,7 +295,7 @@
applyConfigurationChange(config);
// Secure replication related...
- sslCertNickname = config.getSSLCertNickname();
+ sslCertNicknames = config.getSSLCertNickname();
sslEncryption = config.isSSLEncryption();
sslProtocols = config.getSSLProtocol();
sslCipherSuites = config.getSSLCipherSuite();
@@ -2868,7 +2867,7 @@
/** {@inheritDoc} */
@Override
- public SSLContext getSslContext(String sslCertNickname)
+ public SSLContext getSslContext(SortedSet<String> sslCertNicknames)
throws ConfigException
{
SSLContext sslContext;
@@ -2881,16 +2880,16 @@
sslContext = SSLContext.getInstance("TLS");
- if (sslCertNickname == null)
+ if (sslCertNicknames == null)
{
sslContext.init(keyManagers, trustManagers, null);
}
else
{
- X509ExtendedKeyManager[] extendedKeyManagers =
+ KeyManager[] extendedKeyManagers =
SelectableCertificateKeyManager.wrap(
keyManagers,
- sslCertNickname);
+ sslCertNicknames);
sslContext.init(extendedKeyManagers, trustManagers, null);
}
}
@@ -2910,9 +2909,9 @@
/** {@inheritDoc} */
@Override
- public String getSslCertNickname()
+ public SortedSet<String> getSslCertNicknames()
{
- return sslCertNickname;
+ return sslCertNicknames;
}
/** {@inheritDoc} */
--
Gitblit v1.10.0