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/SaltedMD5PasswordStorageScheme.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index 794e991..d19fd89 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -21,6 +21,7 @@
import java.util.Random;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.Base64;
import org.forgerock.opendj.server.config.server.SaltedMD5PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.forgerock.opendj.config.server.ConfigException;
@@ -30,7 +31,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 static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
@@ -222,7 +222,7 @@
int saltLength = 0;
try
{
- byte[] decodedBytes = Base64.decode(storedPassword.toString());
+ byte[] decodedBytes = Base64.decode(storedPassword.toString()).toByteArray();
saltLength = decodedBytes.length - MD5_LENGTH;
if (saltLength <= 0)
@@ -343,8 +343,8 @@
byte[] digestBytes;
try
{
- saltBytes = Base64.decode(authInfo);
- digestBytes = Base64.decode(authValue);
+ saltBytes = Base64.decode(authInfo).toByteArray();
+ digestBytes = Base64.decode(authValue).toByteArray();
}
catch (Exception e)
{
--
Gitblit v1.10.0