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/PKCS5S2PasswordStorageScheme.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 471aa75..48700c2 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
@@ -122,7 +122,7 @@
byte[] digestBytes = encodeWithRandomSalt(plaintext, saltBytes,random);
byte[] hashPlusSalt = concatenateSaltPlusHash(saltBytes, digestBytes);
- return ByteString.valueOf(Base64.encode(hashPlusSalt));
+ return ByteString.valueOfUtf8(Base64.encode(hashPlusSalt));
}
/** {@inheritDoc} */
@@ -130,7 +130,7 @@
public ByteString encodePasswordWithScheme(ByteSequence plaintext)
throws DirectoryException
{
- return ByteString.valueOf('{' + STORAGE_SCHEME_NAME_PKCS5S2 + '}' + encodePassword(plaintext));
+ return ByteString.valueOfUtf8('{' + STORAGE_SCHEME_NAME_PKCS5S2 + '}' + encodePassword(plaintext));
}
/** {@inheritDoc} */
@@ -186,7 +186,7 @@
byte[] saltBytes = new byte[NUM_SALT_BYTES];
byte[] digestBytes = encodeWithRandomSalt(plaintext, saltBytes,random);
// Encode and return the value.
- return ByteString.valueOf(AUTH_PASSWORD_SCHEME_NAME_PKCS5S2 + '$' + iterations
+ return ByteString.valueOfUtf8(AUTH_PASSWORD_SCHEME_NAME_PKCS5S2 + '$' + iterations
+ ':' + Base64.encode(saltBytes) + '$' + Base64.encode(digestBytes));
}
--
Gitblit v1.10.0