From 08a8540072a370b4e7e9604eb97818dcfd4d74c6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 14:00:38 +0000
Subject: [PATCH] OPENDJ-2773 Remove duplicated server tools
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
index 81ca447..41ef8fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
@@ -17,6 +17,7 @@
package org.opends.server.extensions;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.Base64;
import org.forgerock.opendj.server.config.server.AESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
@@ -26,7 +27,6 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
-import org.opends.server.util.Base64;
import java.util.Arrays;
@@ -153,7 +153,7 @@
{
ByteString decryptedPassword =
ByteString.wrap(cryptoManager.decrypt(
- Base64.decode(storedPassword.toString())));
+ Base64.decode(storedPassword.toString()).toByteArray()));
return plaintextPassword.equals(decryptedPassword);
}
catch (Exception e)
@@ -177,7 +177,7 @@
try
{
byte[] decryptedPassword =
- cryptoManager.decrypt(Base64.decode(storedPassword.toString()));
+ cryptoManager.decrypt(Base64.decode(storedPassword.toString()).toByteArray());
return ByteString.wrap(decryptedPassword);
}
catch (Exception e)
--
Gitblit v1.10.0