From b44aafba23fc601d71d2b64a1b2bcda9bac62001 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Tue, 3 Nov 2015 15:04:47 -0600
Subject: [PATCH] Fixed password_salt in OnlineInterfaceService

---
 src/services/admin/OnlineInterfaceService.java | 7 +++----
 src/services/player/LoginService.java          | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/services/admin/OnlineInterfaceService.java b/src/services/admin/OnlineInterfaceService.java
index 94a972c6d..87da980aa 100644
--- a/src/services/admin/OnlineInterfaceService.java
+++ b/src/services/admin/OnlineInterfaceService.java
@@ -15,7 +15,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import network.encryption.MD5;
+import resources.common.BCrypt;
 import resources.config.ConfigFile;
 import resources.control.Intent;
 import resources.control.Service;
@@ -200,10 +200,9 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac
 		if (set.getBoolean("banned"))
 			return false;
 		String psqlPass = set.getString("password");
-		String psqlSalt = set.getString("password_salt");
-		if (psqlPass.length() != 32 && psqlSalt.length() == 0)
+		if (psqlPass.length() != 60 && !psqlPass.startsWith("$2"))
 			return psqlPass.equals(password);
-		password = MD5.digest(MD5.digest(psqlSalt) + MD5.digest(password));
+		password = BCrypt.hashpw(BCrypt.hashpw(password, psqlPass), psqlPass);
 		return psqlPass.equals(password);
 	}
 	
diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java
index 089c43b72..e2c59d5d3 100644
--- a/src/services/player/LoginService.java
+++ b/src/services/player/LoginService.java
@@ -41,7 +41,6 @@ import java.util.Locale;
 import java.util.Random;
 
 import main.ProjectSWG;
-import network.encryption.MD5;
 import network.packets.Packet;
 import network.packets.soe.SessionRequest;
 import network.packets.swg.ErrorMessage;