From 7369ecc8296a0329e424596ff71c60629add3ce2 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 21 Feb 2007 19:44:18 +0000
Subject: [PATCH] Redesign the server to support multiple key manager providers, trust manager providers, and certificate mappers, and update the components which need access to those elements so that they can specify which one they want to use. Among other things, this will provide the ability to use different certificates for different listeners, and provide template configuration entries that make it easier for users to enable SSL and/or StartTLS.
---
opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java b/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
index c559a69..cc4c9b4 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2006 Sun Microsystems, Inc.
+ * Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.protocols.jmx;
@@ -41,7 +41,9 @@
import javax.management.remote.JMXServiceURL;
import javax.management.remote.rmi.RMIConnectorServer;
+import org.opends.server.api.KeyManagerProvider;
import org.opends.server.config.JMXMBean;
+import org.opends.server.extensions.NullKeyManagerProvider;
import org.opends.server.types.DebugLogCategory;
import org.opends.server.types.DebugLogSeverity;
@@ -318,9 +320,15 @@
// ---------------------
//
// Get a Server socket factory
+ KeyManagerProvider provider = jmxConnectionHandler.keyManagerProvider;
+ if (provider == null)
+ {
+ provider = new NullKeyManagerProvider();
+ }
+
SSLContext ctx = SSLContext.getInstance("TLSv1");
ctx.init(
- jmxConnectionHandler.jmxKeyManager.getKeyManagers(),
+ provider.getKeyManagers(),
null,
null);
SSLSocketFactory ssf = ctx.getSocketFactory();
--
Gitblit v1.10.0