From a9bbf17ba3b41d3940efaeb98caf4da2ef344f23 Mon Sep 17 00:00:00 2001
From: Yuriy Movchan <Yuriy.Movchan@gmail.com>
Date: Fri, 29 Jul 2022 16:57:31 +0000
Subject: [PATCH] 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, 12 insertions(+), 0 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 8bb16e8..f46da3c 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,6 +79,7 @@
BooleanArgument generateSelfSignedCertificateArg;
StringArgument hostNameArg;
BooleanArgument usePkcs11Arg;
+ StringArgument useBcfksArg;
private FileBasedArgument directoryManagerPwdFileArg;
private FileBasedArgument keyStorePasswordFileArg;
IntegerArgument ldapPortArg;
@@ -342,6 +343,13 @@
.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())
@@ -611,6 +619,10 @@
{
certificateType++;
}
+ if (useBcfksArg.isPresent())
+ {
+ certificateType++;
+ }
if (certificateType > 1)
{
--
Gitblit v1.10.0