From 5f9c452b6e14d827280eafaa9f9f9bc789b02fa1 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 22 Nov 2017 14:04:04 +0100
Subject: [PATCH] Use centralized methods

---
 .../osgi/useradmin/AuthenticatingUser.java    | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AuthenticatingUser.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AuthenticatingUser.java
index 2689d34fc..6bf1441b5 100644
--- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AuthenticatingUser.java
+++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AuthenticatingUser.java
@@ -1,9 +1,5 @@
 package org.argeo.osgi.useradmin;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
@@ -38,7 +34,7 @@ public class AuthenticatingUser implements User {
 		this.name = name;
 		credentials = new Hashtable<>();
 		credentials.put(SHARED_STATE_NAME, name);
-		byte[] pwd = charsToBytes(password);
+		byte[] pwd = DigestUtils.charsToBytes(password);
 		credentials.put(SHARED_STATE_PWD, pwd);
 	}
 
@@ -69,22 +65,4 @@ public class AuthenticatingUser implements User {
 		throw new UnsupportedOperationException();
 	}
 
-	static byte[] charsToBytes(char[] chars) {
-		CharBuffer charBuffer = CharBuffer.wrap(chars);
-		ByteBuffer byteBuffer = Charset.forName("UTF-8").encode(charBuffer);
-		byte[] bytes = Arrays.copyOfRange(byteBuffer.array(), byteBuffer.position(), byteBuffer.limit());
-		Arrays.fill(charBuffer.array(), '\u0000'); // clear sensitive data
-		Arrays.fill(byteBuffer.array(), (byte) 0); // clear sensitive data
-		return bytes;
-	}
-
-	static char[] bytesToChars(byte[] bytes) {
-		ByteBuffer byteBuffer = ByteBuffer.wrap(bytes);
-		CharBuffer charBuffer = Charset.forName("UTF-8").decode(byteBuffer);
-		char[] chars = Arrays.copyOfRange(charBuffer.array(), charBuffer.position(), charBuffer.limit());
-		Arrays.fill(charBuffer.array(), '\u0000'); // clear sensitive data
-		Arrays.fill(byteBuffer.array(), (byte) 0); // clear sensitive data
-		return chars;
-	}
-
 }
-- 
2.30.2