diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs
index 3019f38a..8d55d6aa 100644
--- a/TShockAPI/Properties/AssemblyInfo.cs
+++ b/TShockAPI/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.0.0630")]
-[assembly: AssemblyFileVersion("2.3.0.0630")]
+[assembly: AssemblyVersion("2.3.0.0701")]
+[assembly: AssemblyFileVersion("2.3.0.0701")]
diff --git a/TShockAPI/Tools.cs b/TShockAPI/Tools.cs
index e19de963..deac461e 100755
--- a/TShockAPI/Tools.cs
+++ b/TShockAPI/Tools.cs
@@ -23,6 +23,7 @@ using System.Text;
using System.Net;
using Microsoft.Xna.Framework;
using Terraria;
+using System.Linq;
namespace TShockAPI
{
@@ -634,16 +635,7 @@ namespace TShockAPI
}
return IP4Address;
}
- ///
- /// Returns a byte array for a given string
- ///
- /// string str
- /// byte[] string
- public static byte[] StrToByteArray(string str)
- {
- System.Text.UTF8Encoding encoding = new System.Text.UTF8Encoding();
- return encoding.GetBytes(str);
- }
+
///
/// Returns a Sha256 string for a given string
///
@@ -651,10 +643,11 @@ namespace TShockAPI
/// string sha256
public static string HashPassword(string password)
{
- Encoding enc = System.Text.Encoding.UTF8;
- byte[] buffer = enc.GetBytes(password);
- SHA1CryptoServiceProvider cryptoTransformSHA1 = new SHA1CryptoServiceProvider();
- return BitConverter.ToString(cryptoTransformSHA1.ComputeHash(buffer)).Replace("-", "");
+ using (var sha = new SHA512CryptoServiceProvider())
+ {
+ var bytes = sha.ComputeHash(Encoding.ASCII.GetBytes(password));
+ return bytes.Aggregate("", (s, b) => s + b.ToString("X2"));
+ }
}
}
}
\ No newline at end of file