From 4b1bcd45a69d24170872af32154801883a424090 Mon Sep 17 00:00:00 2001
From: Maxim Thomas <maxim.thomas@gmail.com>
Date: Thu, 27 Jan 2022 14:52:49 +0000
Subject: [PATCH] move fips functions to separate class (#206)
---
opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
index f9e3344..345c0ed 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
@@ -29,7 +29,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.net.InetAddress;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -48,6 +47,7 @@
import javax.net.ssl.X509KeyManager;
import javax.net.ssl.X509TrustManager;
+import com.forgerock.opendj.util.FipsStaticUtils;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ConnectionFactory;
@@ -66,8 +66,6 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.util.Options;
-import com.forgerock.opendj.util.StaticUtils;
-
/** A connection factory designed for use with command line tools. */
public final class ConnectionFactoryProvider {
/** The Logger. */
@@ -723,7 +721,7 @@
keyStorePIN = keyStorePass.toCharArray();
}
- boolean isFips = StaticUtils.isFips();
+ boolean isFips = FipsStaticUtils.isFips();
final String keyStoreType = KeyStore.getDefaultType();
final KeyStore keystore = KeyStore.getInstance(keyStoreType);
if (isFips) {
@@ -831,7 +829,7 @@
return TrustManagers.trustAll();
}
- boolean isFips = StaticUtils.isFips();
+ boolean isFips = FipsStaticUtils.isFips();
X509TrustManager tm = null;
if (trustStorePathArg.isPresent() && trustStorePathArg.getValue().length() > 0) {
if (isFips) {
--
Gitblit v1.10.0