From 3ba4a8a412fa60c947ecb3cee9d90fb24e590d54 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Wed, 18 Nov 2015 15:24:16 +0000
Subject: [PATCH] OPENDJ-2399: Start server fails if the jvm used does not contains an elliptic curve certificate provider.
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
index 1113555..3e4a065 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
@@ -39,6 +39,7 @@
import java.io.File;
import java.security.KeyStoreException;
import java.util.ArrayList;
+import java.util.Arrays;
import javax.swing.Box;
import javax.swing.ButtonGroup;
@@ -215,27 +216,27 @@
ops = SecurityOptions.createJKSCertificateOptions(
tfKeystorePath.getText(),
String.valueOf(tfKeystorePwd.getPassword()), enableSSL,
- enableStartTLS, sslPort, selectedAlias);
+ enableStartTLS, sslPort, Arrays.asList(selectedAlias));
}
else if (rbJCEKS.isSelected())
{
ops = SecurityOptions.createJCEKSCertificateOptions(
tfKeystorePath.getText(),
String.valueOf(tfKeystorePwd.getPassword()), enableSSL,
- enableStartTLS, sslPort, selectedAlias);
+ enableStartTLS, sslPort, Arrays.asList(selectedAlias));
}
else if (rbPKCS11.isSelected())
{
ops = SecurityOptions.createPKCS11CertificateOptions(
String.valueOf(tfKeystorePwd.getPassword()), enableSSL,
- enableStartTLS, sslPort, selectedAlias);
+ enableStartTLS, sslPort, Arrays.asList(selectedAlias));
}
else if (rbPKCS12.isSelected())
{
ops = SecurityOptions.createPKCS12CertificateOptions(
tfKeystorePath.getText(),
String.valueOf(tfKeystorePwd.getPassword()), enableSSL,
- enableStartTLS, sslPort, selectedAlias);
+ enableStartTLS, sslPort, Arrays.asList(selectedAlias));
}
else
{
--
Gitblit v1.10.0