From ab94ee3be44c717c93bfc63da2b89fc174a8a725 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 23 Feb 2007 19:44:58 +0000
Subject: [PATCH] Add a new SSL trust manager that can be used to interactively prompt the user about whether a given SSL certificate should be trusted. This will be used for all of our client tools in the case when no trust store is available and the user has not requested the "--trustAll" option.
---
opends/src/server/org/opends/server/tools/SSLConnectionFactory.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java b/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
index 4a5f2f0..630ed29 100644
--- a/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
+++ b/opends/src/server/org/opends/server/tools/SSLConnectionFactory.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.tools;
@@ -97,6 +97,8 @@
BlindTrustManagerProvider blindTrustProvider =
new BlindTrustManagerProvider();
trustManagers = blindTrustProvider.getTrustManagers();
+ } else if (trustStorePath == null) {
+ trustManagers = PromptTrustManager.getTrustManagers();
} else
{
trustManagers = getTrustManagers(KeyStore.getDefaultType(),
--
Gitblit v1.10.0