From 57a8bdff9fa1428a16dcf3528b82de26f796c331 Mon Sep 17 00:00:00 2001
From: Travis Burtrum <android@moparisthebest.org>
Date: Sat, 17 Mar 2012 23:56:04 -0400
Subject: [PATCH] Removed hex-string lib and scala class, can do it in 1 line
 of pure java. Also synchronized around md, since it can be accessed by
 multiple threads, right?

---
 .../moparscape/msc/gs/tools/DataConversions.java |  14 ++++++++++----
 .../org/moparscape/msc/gs/util/HexString.scala   |   7 -------
 LoginServer/lib/hex-string.jar                   | Bin 1685 -> 0 bytes
 3 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 GameServer/src/org/moparscape/msc/gs/util/HexString.scala
 delete mode 100644 LoginServer/lib/hex-string.jar

diff --git a/GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java b/GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java
index 1e8cffe..a8c30ca 100644
--- a/GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java
+++ b/GameServer/src/org/moparscape/msc/gs/tools/DataConversions.java
@@ -12,7 +12,6 @@ import java.util.Random;
 import org.moparscape.msc.gs.connection.RSCPacket;
 import org.moparscape.msc.gs.core.GameEngine;
 import org.moparscape.msc.gs.model.Point;
-import org.moparscape.msc.gs.util.HexString;
 import org.moparscape.msc.gs.util.Logger;
 
 public final class DataConversions {
@@ -258,9 +257,16 @@ public final class DataConversions {
 	 * returns the md5 hash of a string
 	 */
 	public static String md5(String s) {
-		md.reset();
-		md.update(s.getBytes());
-		return new HexString(md.digest()).toString();
+		synchronized (md){
+			md.reset();
+			md.update(s.getBytes());
+			return toHex(md.digest());
+		}
+	}
+
+	public static String toHex(byte[] bytes) {
+		// change below to lower or uppercase X to control case of output
+		return String.format("%0" + (bytes.length << 1) + "x", new BigInteger(1, bytes));
 	}
 
 	/**
diff --git a/GameServer/src/org/moparscape/msc/gs/util/HexString.scala b/GameServer/src/org/moparscape/msc/gs/util/HexString.scala
deleted file mode 100644
index 6b73e25..0000000
--- a/GameServer/src/org/moparscape/msc/gs/util/HexString.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.moparscape.msc.gs.util
-
-class HexString(bytes: Array[Byte]) {
-	lazy val string = bytes.map(0xFF & _).map { "%02x".format(_) }.foldLeft("") { _ + _ }
-	
-	override def toString = string
-}
\ No newline at end of file
diff --git a/LoginServer/lib/hex-string.jar b/LoginServer/lib/hex-string.jar
deleted file mode 100644
index 477c6ccc9672af7ac467893a9e7251df77e6e15f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1685
zcmWIWW@h1H0D-s7Gt9sYD8T}xlk;=+1K=v&qp1*rsz}PuO-igx$xP2INz6e~&(VTv
zq6Aj;Wr?LZC1715KzR-ZR-mqT`+eM(0v)i9oq<6ek1mhYir|u>%)E5H<ebFf;@*&G
z|Cmsbf8Wkn7PlRiyb;3}!j=+s+lXiSLWkw9d8s?Lge(Y^c-3GyXD7pDK4T7cC&Ozl
ztB*;@8yE)4_bip#V;j=TJdrKFm;YFNQjJO5mUXphT!L!HrsuESdp&ji-?dx6ukWwB
z#eAVFQ#3Rqc;TYhqrn#X3JV@IaY>3FUF4i`o@;He<Me_zVi%MbgdbF8t<~zf_{=5X
zL>(iu9}kyjqN{|~f*YrmPK&Z0=2~YYa%Y!N{OkGV)22!0T>i_`x6VZ?@teVoy<aEu
z1l3!KrEAD}E_sx!%{}qQr4~WYOMVYG?VRFq)^~~KyoYPbpDf#$^<%PI);asUNUPWV
z`GFBBsb$k9r5x7UbNS$&JoOU>Hgm2&kuvXnu{JRIqE^d~g-bqv+}c@kt=UmFru&%q
zSr@CVe~yT3;S+uSRI}L1BS)*EFG#w(`(sFt*X}%(6MJt-+dP}^dsTBsVVUb>%S~54
zemNCnVmC$Lib!D7n&QnJ*8-ZCoAxAx95%MleZVtylKsX4xyu)L_P1s4Sa-0UjjirV
z<PO{Q4_SM%XE<~${B}Y4_OgXvE;S{}1sn{h{Byv?NG(EB+HbAYNtZLuF_lT3J6m3^
zyll`Z%@ns}=Zb8x=dGqY0(HMFlkju9%>B=!N-^oqHl>~=^;aW2XZ>s5{eShV?1{5K
zuF!PT@z`_r=-CIk#(r-n?)jSJ{)sQTWfr@y&i7}z`*hgaY-CSXWSyI{eObwjX@RpI
z*cs3E;3?cTk;nIcwqCJMNmt+Z|I;JSPwzWb_?&;U8ms!ti=h{}(_35=GW{-Ps&Qmz
zhB{B0IHmS>!u`lTIj8omku6MK1zOLmrY-4R^6K;fvr8M8e>XGNU)^-&!sB&IC8V~*
z^stv{PrjV~{q0+as)8piZl{0yoU`Wa{MNWE_C(^&sygXD!}6~_4n^!KvDcRRPWe%?
zb8RO3so0shw*MAuGB5YY+#D1Zc`#PP#oVGQ^RD~R?}xe>wd4v8e&a~xdL{8&`f16g
z>1WJdr^sK`%nNvO+wtHDy(<NW&A9sS<#)aNF7(QCaz^|HXMUC0jY~7vH|XpawvL(}
zJ!|4*{<({T`fU|%GH;5Gn_}0TvwW#@`401sTm8#Z9&l;wIu!kG;T)IawL6Yzi527}
zc5T^Ly+XyXL_TIsQp{YzWpPmwk(YC>rPvtGz2_QOA%65>?uSd0c)Utgn>Sr5x@2@=
zd*H|7v&Tz1f+KHpctl?)^(@ajGvVHf(??e5`Ch4EYSo#v_xZYJiFr9TOTMRu2rcVu
zc3t#I^w;(20bQvtB9<Sln(Fq-^vc81A0OFFANa-`i*5NJrc^Oo>7L^2-9JR$CknrR
z9G&yPy{5sorX&8uCuzG)Q6c?@j!!wUaKS{)jHI5n6nV34{`<p1uiDw130)MER3EsU
z|Mr3|d2Ms2@RbvVP6pp!ylE9n{k_0zw|BRm>wdrGyGclT!6P^4-UEjd*Dug!obP;C
zykw?sm3sW88}+XGOP@ZNyCyoak>ff4(+zXCw;U3(7w0;?$5f>3!?u8khi?~dm^`1q
zb!Rg>hiF~ng_HV1VjuXNrhXR``=qe&*l*6*nuZM>{6b=%7hd3BVe^Y)zoJdL>B6t_
z0p5&EA`H08Twrkr1OgBWS^^_<U@L<mN<li5fEZL}qnF4C{n*N6g#I9``e7wB$Q0aV
gG{h7IAk~4#6togMz?+o~q>%*(c^MfPidaEB0OpIODF6Tf