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/PBKDF2PasswordStorageScheme.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
index ff5f40c..7a31d25 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java
@@ -27,6 +27,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.Base64;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ResultCode;
@@ -37,7 +38,6 @@
import org.forgerock.opendj.config.server.ConfigChangeResult;
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.*;
@@ -155,7 +155,7 @@
}
final int iterations = Integer.parseInt(stored.substring(0, pos));
- byte[] decodedBytes = Base64.decode(stored.substring(pos + 1));
+ byte[] decodedBytes = Base64.decode(stored.substring(pos + 1)).toByteArray();
final int saltLength = decodedBytes.length - SHA1_LENGTH;
if (saltLength <= 0)
@@ -214,8 +214,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