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

Changed to SHA512

Browse source
This commit is contained in:
high 2011-07-01 02:09:21 -04:00
parent 2c812dbb53
commit 4e87ceb84f
2 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.0.0630")] [assembly: AssemblyVersion("2.3.0.0701")]
[assembly: AssemblyFileVersion("2.3.0.0630")] [assembly: AssemblyFileVersion("2.3.0.0701")]

21
TShockAPI/Tools.cs
View file

@ -23,6 +23,7 @@ using System.Text;
using System.Net; using System.Net;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Terraria; using Terraria;
using System.Linq;
namespace TShockAPI namespace TShockAPI
{ {
@ -634,16 +635,7 @@ namespace TShockAPI
} }
return IP4Address; return IP4Address;
} }
/// <summary>
/// Returns a byte array for a given string
/// </summary>
/// <param name="str">string str</param>
/// <returns>byte[] string</returns>
public static byte[] StrToByteArray(string str)
{
System.Text.UTF8Encoding encoding = new System.Text.UTF8Encoding();
return encoding.GetBytes(str);
}
/// <summary> /// <summary>
/// Returns a Sha256 string for a given string /// Returns a Sha256 string for a given string
/// </summary> /// </summary>
@ -651,10 +643,11 @@ namespace TShockAPI
/// <returns>string sha256</returns> /// <returns>string sha256</returns>
public static string HashPassword(string password) public static string HashPassword(string password)
{ {
Encoding enc = System.Text.Encoding.UTF8; using (var sha = new SHA512CryptoServiceProvider())
byte[] buffer = enc.GetBytes(password); {
SHA1CryptoServiceProvider cryptoTransformSHA1 = new SHA1CryptoServiceProvider(); var bytes = sha.ComputeHash(Encoding.ASCII.GetBytes(password));
return BitConverter.ToString(cryptoTransformSHA1.ComputeHash(buffer)).Replace("-", ""); return bytes.Aggregate("", (s, b) => s + b.ToString("X2"));
}
} }
} }
} }