From 3b3af1b0963d975191c74723c71c80bdde9e5c38 Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Wed, 26 Jan 2022 15:08:48 +0000
Subject: [PATCH] move fips functions to separate class
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 5c36610..e3f39d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -27,7 +27,6 @@
import static org.opends.admin.ads.ServerDescriptor.ServerProperty.*;
import static org.opends.admin.ads.util.ConnectionUtils.*;
import static org.opends.admin.ads.util.PreferredConnection.Type.*;
-import static org.opends.messages.AdminMessages.WARN_ADMIN_SET_PERMISSIONS_FAILED;
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.quicksetup.Step.*;
import static org.opends.quicksetup.installer.DataReplicationOptions.Type.*;
@@ -42,7 +41,6 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintStream;
-import java.io.PrintWriter;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -59,10 +57,9 @@
import java.util.Set;
import javax.naming.ldap.Rdn;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
import javax.swing.JPanel;
+import com.forgerock.opendj.util.FipsStaticUtils;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.LocalizableMessageDescriptor.Arg0;
@@ -133,8 +130,6 @@
import org.opends.server.backends.task.TaskState;
import org.opends.server.tools.BackendTypeHelper;
import org.opends.server.tools.BackendTypeHelper.BackendTypeUIAdapter;
-import org.opends.server.types.DirectoryException;
-import org.opends.server.types.FilePermission;
import org.opends.server.types.HostPort;
import org.opends.server.util.CertificateManager;
import org.opends.server.util.CollectionUtils;
@@ -1422,7 +1417,7 @@
}
// Set default trustManager to allow check server startup status
- if (com.forgerock.opendj.util.StaticUtils.isFips()) {
+ if (FipsStaticUtils.isFips()) {
KeyStore truststore = null;
try (final FileInputStream fis = new FileInputStream(trustStorePath))
{
--
Gitblit v1.10.0