From 99ce86bb3593a209121053736d30cda5a9350fb5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Jun 2020 19:59:00 -0500 Subject: [PATCH] Convert bytes to hex manually instead of using random xml lib to do it. Fixes running on java 11+ --- .../common/core/helper/StringObfuscator.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/StringObfuscator.java b/src/main/java/vazkii/botania/common/core/helper/StringObfuscator.java index 300461ca9..f54444d22 100644 --- a/src/main/java/vazkii/botania/common/core/helper/StringObfuscator.java +++ b/src/main/java/vazkii/botania/common/core/helper/StringObfuscator.java @@ -8,8 +8,6 @@ */ package vazkii.botania.common.core.helper; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; - import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -21,11 +19,21 @@ public final class StringObfuscator { return getHash(str).equals(hash); } + private static final char[] HEX_CHARS = "0123456789ABCDEF".toCharArray(); + private static String getHash(String str) { if (str != null) { try { MessageDigest md = MessageDigest.getInstance("SHA-256"); - return new HexBinaryAdapter().marshal(md.digest(dontRainbowTableMeOrMySonEverAgain(str).getBytes(StandardCharsets.UTF_8))); + StringBuilder ret = new StringBuilder(); + byte[] bytes = md.digest(dontRainbowTableMeOrMySonEverAgain(str).getBytes(StandardCharsets.UTF_8)); + + for (byte b : bytes) { + ret.append(HEX_CHARS[(b >> 4) & 0xF]); + ret.append(HEX_CHARS[b & 0xF]); + } + + return ret.toString(); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); }