From 4baece95779dd46a3a59d59d1b7aa5958cf6117d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 05 Nov 2015 12:25:29 +0000
Subject: [PATCH] OPENDJ-1802 Make ByteString methods more intentional
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 3478ced..a4c0188 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
@@ -146,7 +146,7 @@
byte[] digestBytes = encodeWithRandomSalt(plaintext, saltBytes, iterations,random);
byte[] hashPlusSalt = concatenateHashPlusSalt(saltBytes, digestBytes);
- return ByteString.valueOf(iterations + ":" + Base64.encode(hashPlusSalt));
+ return ByteString.valueOfUtf8(iterations + ":" + Base64.encode(hashPlusSalt));
}
/** {@inheritDoc} */
@@ -154,7 +154,7 @@
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
{
- return ByteString.valueOf('{' + STORAGE_SCHEME_NAME_PBKDF2 + '}' + encodePassword(plaintext));
+ return ByteString.valueOfUtf8('{' + STORAGE_SCHEME_NAME_PBKDF2 + '}' + encodePassword(plaintext));
}
/** {@inheritDoc} */
@@ -219,7 +219,7 @@
byte[] digestBytes = encodeWithRandomSalt(plaintext, saltBytes, iterations,random);
// Encode and return the value.
- return ByteString.valueOf(AUTH_PASSWORD_SCHEME_NAME_PBKDF2 + '$'
+ return ByteString.valueOfUtf8(AUTH_PASSWORD_SCHEME_NAME_PBKDF2 + '$'
+ iterations + ':' + Base64.encode(saltBytes) + '$' + Base64.encode(digestBytes));
}
--
Gitblit v1.10.0