From 60f5dfd7eaa64aa931033c0e5266391ecbbc96fa Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 25 Sep 2013 07:31:13 +0000
Subject: [PATCH] Fix OPENDJ-18 - keystore import failes due to empty PIN Review CR-2353
---
opends/src/server/org/opends/server/util/CertificateManager.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/CertificateManager.java b/opends/src/server/org/opends/server/util/CertificateManager.java
index 08818da..1593737 100644
--- a/opends/src/server/org/opends/server/util/CertificateManager.java
+++ b/opends/src/server/org/opends/server/util/CertificateManager.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.server.util;
@@ -81,7 +82,6 @@
//Error message strings.
private static final String KEYSTORE_PATH_MSG = "key store path";
private static final String KEYSTORE_TYPE_MSG = "key store type";
- private static final String KEYSTORE_PWD_MSG = "key store password";
private static final String SUBJECT_DN_MSG = "subject DN";
private static final String CERT_ALIAS_MSG = "certificate alias";
private static final String CERT_REQUEST_FILE_MSG =
@@ -136,7 +136,6 @@
throws IllegalArgumentException {
ensureValid(keyStorePath, KEYSTORE_PATH_MSG);
ensureValid(keyStoreType, KEYSTORE_TYPE_MSG);
- ensureValid(keyStorePassword, KEYSTORE_PWD_MSG);
if (keyStoreType.equals(KEY_STORE_TYPE_PKCS11)) {
if (! keyStorePath.equals(KEY_STORE_PATH_PKCS11)) {
Message msg =
@@ -168,7 +167,8 @@
}
this.keyStorePath = keyStorePath;
this.keyStoreType = keyStoreType;
- this.password = keyStorePassword.toCharArray();
+ this.password =
+ keyStorePassword == null ? null : keyStorePassword.toCharArray();
keyStore = null;
}
--
Gitblit v1.10.0