themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Added support for sha256 and md5.

Browse source
This commit is contained in:
high 2011-07-24 14:26:52 -04:00
parent 2c19e4467e
commit 7a829d347b
3 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
TShockAPI/Tools.cs
View file

@ -312,7 +312,7 @@ namespace TShockAPI
/// <param name="reason">string reason</param>
public static void ForceKickAll(string reason)
{
foreach(TSPlayer player in TShock.Players)
foreach (TSPlayer player in TShock.Players)
{
if (player != null && player.Active)
{
@ -486,6 +486,15 @@ namespace TShockAPI
return ip != null ? ip.ToString() : "";
}
public static HashAlgorithm HashAlgo = new MD5Cng();
public static readonly Dictionary<string, Type> HashTypes = new Dictionary<string, Type>()
{
{"sha512", typeof(SHA512Managed)},
{"sha256", typeof(SHA256Managed)},
{"md5", typeof(MD5Cng)},
};
/// <summary>
/// Returns a Sha256 string for a given string
/// </summary>
@ -493,15 +502,10 @@ namespace TShockAPI
/// <returns>string sha256</returns>
public static string HashPassword(string password)
{
using (var sha = new SHA512CryptoServiceProvider())
{
if (password == "")
{
return "nonexistent-password";
}
var bytes = sha.ComputeHash(Encoding.ASCII.GetBytes(password));
return bytes.Aggregate("", (s, b) => s + b.ToString("X2"));
}
if (string.IsNullOrEmpty(password))
throw new NullReferenceException("Password can not be null/empty");
var bytes = HashAlgo.ComputeHash(Encoding.ASCII.GetBytes(password));
return bytes.Aggregate("", (s, b) => s + b.ToString("X2"));
}
/// <summary>