From 2cf46088b7e69b4f424a821291607afe6faa7e4f Mon Sep 17 00:00:00 2001
From: Yuriy Movchan <Yuriy.Movchan@gmail.com>
Date: Fri, 30 Jul 2021 14:08:39 +0000
Subject: [PATCH] Add FIPS support (#176)
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
index 487bfe5..8410788 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
@@ -825,7 +825,7 @@
certType = SecurityOptions.CertificateType.NO_CERTIFICATE;
}
- Collection<String> certNicknames = argParser.certNicknameArg.getValues();
+ Collection<String> certNicknames = getCertNickNames();
if (pathToCertificat != null)
{
checkCertificateInKeystore(certType, pathToCertificat, pwd, certNicknames, errorMessages, keystoreAliases);
@@ -840,6 +840,20 @@
uData.setSecurityOptions(securityOptions);
}
+ private List<String> getCertNickNames() {
+ List<String> certNicknames = argParser.certNicknameArg.getValues();
+ if ((certNicknames == null) || (certNicknames.size() == 0)) {
+ return certNicknames;
+ }
+
+ List<String> splitedCertNicknames = new ArrayList<>();
+ for (String certNickname : certNicknames) {
+ splitedCertNicknames.addAll(StaticUtils.splittedStringAsList(certNickname, " "));
+ }
+
+ return splitedCertNicknames;
+ }
+
private void checkCanUsePort(int port, List<LocalizableMessage> errorMessages)
{
if (!SetupUtils.canUseAsPort(port))
@@ -1943,7 +1957,7 @@
boolean enableStartTLS, int ldapsPort) throws UserDataException, ClientException
{
String path;
- Collection<String> certNicknames = argParser.certNicknameArg.getValues();
+ Collection<String> certNicknames = getCertNickNames();
String pwd = argParser.getKeyStorePassword();
if (pwd != null && pwd.length() == 0)
{
--
Gitblit v1.10.0