From 781ab2712777f6d0cfd66d2c362b51a83d1036ca Mon Sep 17 00:00:00 2001
From: Tenebrius <magtemtenebrius@gmail.com>
Date: Mon, 14 Jun 2021 13:59:53 +0500
Subject: [PATCH] =?UTF-8?q?[Fix]=20=D0=A5=D0=B5=D1=88=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/password/DigestPasswordVerifier.java            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/DigestPasswordVerifier.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/DigestPasswordVerifier.java
index 7d3e0ea5..d144fe5f 100644
--- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/DigestPasswordVerifier.java
+++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/DigestPasswordVerifier.java
@@ -4,6 +4,8 @@
 import org.apache.logging.log4j.Logger;
 import pro.gravit.utils.helper.SecurityHelper;
 
+import javax.xml.bind.DatatypeConverter;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -17,8 +19,11 @@ public class DigestPasswordVerifier extends PasswordVerifier {
     public boolean check(String encryptedPassword, String password) {
         try {
             MessageDigest digest = MessageDigest.getInstance(algo);
-            byte[] bytes = SecurityHelper.fromHex(encryptedPassword);
-            return Arrays.equals(password.getBytes(StandardCharsets.UTF_8), digest.digest(bytes));
+            digest.update(password.getBytes(StandardCharsets.UTF_8));
+            byte[] bytes = digest.digest();
+            String myHash = DatatypeConverter
+                    .printHexBinary(bytes);
+            return myHash.equalsIgnoreCase(encryptedPassword);
         } catch (NoSuchAlgorithmException e) {
             logger.error("Digest algorithm {} not supported", algo);
             return false;