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/crypto/CryptoManagerImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
index da83993..2a129b1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
@@ -470,7 +470,7 @@
static byte[] getInstanceKeyCertificateFromLocalTruststore()
throws CryptoManagerException {
// Construct the key entry DN.
- final ByteString distinguishedValue = ByteString.valueOf(ADS_CERTIFICATE_ALIAS);
+ final ByteString distinguishedValue = ByteString.valueOfUtf8(ADS_CERTIFICATE_ALIAS);
final DN entryDN = localTruststoreDN.child(RDN.create(attrKeyID, distinguishedValue));
// Construct the search filter.
final String FILTER_OC_INSTANCE_KEY = "(objectclass=" + ocInstanceKey.getNameOrOID() + ")";
@@ -594,7 +594,7 @@
final byte[] instanceKeyCertificate = getInstanceKeyCertificateFromLocalTruststore();
final String instanceKeyID = getInstanceKeyID(instanceKeyCertificate);
// Construct the key entry DN.
- final ByteString distinguishedValue = ByteString.valueOf(instanceKeyID);
+ final ByteString distinguishedValue = ByteString.valueOfUtf8(instanceKeyID);
final DN entryDN = instanceKeysDN.child(
RDN.create(attrKeyID, distinguishedValue));
@@ -1575,7 +1575,7 @@
{
// Construct the key entry DN.
ByteString distinguishedValue =
- ByteString.valueOf(keyEntry.getKeyID().getStringValue());
+ ByteString.valueOfUtf8(keyEntry.getKeyID().getStringValue());
DN entryDN = secretKeysDN.child(
RDN.create(attrKeyID, distinguishedValue));
@@ -2096,7 +2096,7 @@
{
// Construct the key entry DN.
ByteString distinguishedValue =
- ByteString.valueOf(keyEntry.getKeyID().getStringValue());
+ ByteString.valueOfUtf8(keyEntry.getKeyID().getStringValue());
DN entryDN = secretKeysDN.child(
RDN.create(attrKeyID, distinguishedValue));
--
Gitblit v1.10.0