From a6ec0783eb4d08295ac1c8a102c018879a879afb Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Tue, 18 Sep 2007 18:37:07 +0000
Subject: [PATCH] Fix for issues 2282 and 2285. Do not check ADS certificate validity period.
---
opends/src/server/org/opends/server/backends/TrustStoreBackend.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/TrustStoreBackend.java b/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
index dc2f793..00f2d5a 100644
--- a/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
+++ b/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -59,7 +59,6 @@
import static org.opends.server.util.StaticUtils.*;
import org.opends.server.util.Validator;
import org.opends.server.util.CertificateManager;
-import org.opends.server.util.ExpirationCheckTrustManager;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TrustStoreBackendCfg;
import org.opends.server.admin.Configuration;
@@ -70,7 +69,6 @@
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
import javax.naming.ldap.Rdn;
import java.security.cert.Certificate;
import java.net.UnknownHostException;
@@ -1404,13 +1402,13 @@
TrustManagerFactory.getInstance(trustManagerAlgorithm);
trustManagerFactory.init(trustStore);
TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
- TrustManager[] newTrustManagers = new TrustManager[trustManagers.length];
- for (int i=0; i < trustManagers.length; i++)
- {
- newTrustManagers[i] = new ExpirationCheckTrustManager(
- (X509TrustManager) trustManagers[i]);
- }
- return newTrustManagers;
+// TrustManager[] newTrustManagers = new TrustManager[trustManagers.length];
+// for (int i=0; i < trustManagers.length; i++)
+// {
+// newTrustManagers[i] = new ExpirationCheckTrustManager(
+// (X509TrustManager) trustManagers[i]);
+// }
+ return trustManagers;
}
catch (Exception e)
{
--
Gitblit v1.10.0