From 09d35a9488ad77844ff7645fede52dcb216fbaa1 Mon Sep 17 00:00:00 2001
From: sgrampone <sgrampone@genexus.com>
Date: Thu, 23 Apr 2020 17:08:09 -0300
Subject: [PATCH] Fix encodings for hexadecimal functions

---
 .../encoders/HexaEncoder.java                 | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/encoders/HexaEncoder.java b/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/encoders/HexaEncoder.java
index 5d529f0..6e7e0b7 100644
--- a/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/encoders/HexaEncoder.java
+++ b/SecurityAPICommons/src/main/java/com/genexus/securityapicommons/encoders/HexaEncoder.java
@@ -1,9 +1,9 @@
 package com.genexus.securityapicommons.encoders;
 
-import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.encoders.Hex;
 
 import com.genexus.securityapicommons.commons.SecurityAPIObject;
+import com.genexus.securityapicommons.config.EncodingUtil;
 
 /**
  * @author sgrampone
@@ -24,8 +24,12 @@ public HexaEncoder() {
 	 * @return String Hexa hexadecimal representation of plainText
 	 */
 	public String toHexa(String plainText) {
-
-		byte[] stringBytes = Strings.toByteArray(plainText);
+		EncodingUtil eu = new EncodingUtil();
+		byte[] stringBytes = eu.getBytes(plainText);
+		if (eu.hasError()) {
+			this.error = eu.getError();
+			return "";
+		}
 		StringBuilder sb = new StringBuilder();
 		for (byte b : stringBytes) {
 			sb.append(String.format("%02X ", b));
@@ -47,7 +51,12 @@ public String toHexa(String plainText) {
 	public String fromHexa(String stringHexa) {
 
 		byte[] resBytes = Hex.decode(stringHexa);
-		String result = Strings.fromByteArray(resBytes);
+		EncodingUtil eu = new EncodingUtil();
+		String result = eu.getString(resBytes);
+		if (eu.hasError()) {
+			this.error = eu.getError();
+			return "";
+		}
 		if (result == null || result.length() == 0) {
 			this.error.setError("HE002", "Error decoding hexa");
 			return "";
@@ -56,4 +65,4 @@ public String fromHexa(String stringHexa) {
 		return result;
 	}
 
-}
+}
\ No newline at end of file