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/PKCS5S2PasswordStorageScheme.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
index e7ff89b..9af5cfc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java
@@ -26,6 +26,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.Base64;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
@@ -34,7 +35,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
-import org.opends.server.util.Base64;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.extensions.ExtensionsConstants.*;
@@ -126,7 +126,7 @@
try
{
String stored = storedPassword.toString();
- byte[] decodedBytes = Base64.decode(stored);
+ byte[] decodedBytes = Base64.decode(stored).toByteArray();
if (decodedBytes.length != NUM_SALT_BYTES + SHA1_LENGTH)
{
@@ -183,8 +183,8 @@
throw new Exception();
}
int iterations = Integer.parseInt(authInfo.substring(0, pos));
- byte[] saltBytes = Base64.decode(authInfo.substring(pos + 1));
- byte[] digestBytes = Base64.decode(authValue);
+ byte[] saltBytes = Base64.decode(authInfo.substring(pos + 1)).toByteArray();
+ byte[] digestBytes = Base64.decode(authValue).toByteArray();
return encodeAndMatch(plaintextPassword, saltBytes, digestBytes, iterations);
}
catch (Exception e)
--
Gitblit v1.10.0