From 0505fc5833dfc17b69bcb12e2c28e4e07a7b339f Mon Sep 17 00:00:00 2001
From: Yuriy Movchan <Yuriy.Movchan@gmail.com>
Date: Fri, 29 Jul 2022 16:59:10 +0000
Subject: [PATCH] Revert "Check if BC FIPS provider exists before loading it"
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
index f46da3c..8bb16e8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
@@ -79,7 +79,6 @@
BooleanArgument generateSelfSignedCertificateArg;
StringArgument hostNameArg;
BooleanArgument usePkcs11Arg;
- StringArgument useBcfksArg;
private FileBasedArgument directoryManagerPwdFileArg;
private FileBasedArgument keyStorePasswordFileArg;
IntegerArgument ldapPortArg;
@@ -343,13 +342,6 @@
.buildArgument();
addArgument(usePkcs11Arg);
- useBcfksArg =
- StringArgument.builder("useBcfksKeystore")
- .description(INFO_INSTALLDS_DESCRIPTION_USE_BCFKS.get())
- .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get())
- .buildArgument();
- addArgument(useBcfksArg);
-
useJavaKeyStoreArg =
StringArgument.builder("useJavaKeystore")
.description(INFO_INSTALLDS_DESCRIPTION_USE_JAVAKEYSTORE.get())
@@ -619,10 +611,6 @@
{
certificateType++;
}
- if (useBcfksArg.isPresent())
- {
- certificateType++;
- }
if (certificateType > 1)
{
--
Gitblit v1.10.0