From cd384f445c1581cd3391e1414a9ec452afb22904 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 12 Jul 2016 09:12:56 +0000
Subject: [PATCH] Sha2Crypt.java: Remove dependency to apache commons-codec by using StandardCharsets
---
opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java
index fdd907a..813f0fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java
@@ -30,6 +30,7 @@
*/
package org.opends.server.extensions;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
@@ -37,8 +38,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.codec.Charsets;
-
/**
* SHA2-based Unix crypt implementation.
* <p>
@@ -269,7 +268,7 @@
roundsCustom = true;
}
final String saltString = m.group(4);
- final byte[] saltBytes = saltString.getBytes(Charsets.UTF_8);
+ final byte[] saltBytes = saltString.getBytes(StandardCharsets.UTF_8);
final int saltLen = saltBytes.length;
// 1. start digest A
--
Gitblit v1.10.0