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/RC4PasswordStorageScheme.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
index ba400ee..ec70b93 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.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.RC4PasswordStorageSchemeCfg;
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;
@@ -152,10 +152,8 @@
{
try
{
- ByteString decryptedPassword =
- ByteString.wrap(cryptoManager.decrypt(
- Base64.decode(storedPassword.toString())));
- return plaintextPassword.equals(decryptedPassword);
+ return plaintextPassword.equals(ByteString.wrap(
+ cryptoManager.decrypt(Base64.decode(storedPassword.toString()).toByteArray())));
}
catch (Exception e)
{
@@ -178,7 +176,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