From 5976d5714001a387d4709b34c306a4f1c5a38d02 Mon Sep 17 00:00:00 2001
From: Yuriy Movchan <Yuriy.Movchan@gmail.com>
Date: Fri, 29 Jul 2022 16:59:23 +0000
Subject: [PATCH] Revert "Restore original EMPTY_BYTES variable place"
---
opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java
index 0c7db67..5a7f3cd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/SSLConnectionFactory.java
@@ -40,7 +40,6 @@
import org.opends.server.extensions.BlindTrustManagerProvider;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.SSLContextBuilder;
-import org.forgerock.opendj.ldap.TrustManagers;
import org.opends.server.util.CollectionUtils;
import org.opends.server.util.ExpirationCheckTrustManager;
import org.opends.server.util.SelectableCertificateKeyManager;
@@ -121,13 +120,8 @@
new BlindTrustManagerProvider();
trustManagers = blindTrustProvider.getTrustManagers();
} else if (trustStorePath == null) {
- if (isFips()) {
- TrustManager tm = TrustManagers.checkUsingPkcs11TrustStore();
- trustManagers = new TrustManager[] { tm };
- } else {
- trustManagers = PromptTrustManager.getTrustManagers();
- }
- } else
+ trustManagers = PromptTrustManager.getTrustManagers();
+ } else
{
TrustManager[] tmpTrustManagers =
getTrustManagers(KeyStore.getDefaultType(), null, trustStorePath,
--
Gitblit v1.10.0