wasSharpNET

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ HEAD  →  ?path2? @ 1
File deleted
\ No newline at end of file
/Cryptography/SHA1.cs
/Cryptography/AES.cs
@@ -8,18 +8,18 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Security.Cryptography;
using System.Text;
 
namespace wasSharpNET.Cryptography
{
public static class AES
public class AES
{
private static readonly RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
private const int AES_BLOCK_SIZE = 128;
private const CipherMode AES_CIPHER_MODE = CipherMode.CBC;
private const PaddingMode AES_PADDING_MODE = PaddingMode.PKCS7;
private const int AES_KEY_SALT_BYTES = 16;
private static readonly RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
 
///////////////////////////////////////////////////////////////////////////
// Copyright (C) Wizardry and Steamworks 2016 - License: GNU GPLv3 //
@@ -31,7 +31,7 @@
/// <param name="key">the encryption key</param>
/// <param name="separator">the separator to use between the cyphertext and the IV</param>
/// <returns>Base64 encoded encrypted data</returns>
public static async Task<string> Encrypt(string data, string key, string separator = ":")
public string wasAESEncrypt(string data, string key, string separator = ":")
{
using (var rijdanelManaged = new RijndaelManaged())
{
@@ -44,9 +44,10 @@
var salt = new byte[AES_KEY_SALT_BYTES];
rng.GetBytes(salt);
var derivedKey = new Rfc2898DeriveBytes(key, salt);
rijdanelManaged.Key = derivedKey.GetBytes(rijdanelManaged.KeySize / 8);
rijdanelManaged.IV = derivedKey.GetBytes(rijdanelManaged.BlockSize / 8);
rijdanelManaged.Key = derivedKey.GetBytes(rijdanelManaged.KeySize/8);
rijdanelManaged.IV = derivedKey.GetBytes(rijdanelManaged.BlockSize/8);
 
byte[] encryptedData;
using (var encryptor = rijdanelManaged.CreateEncryptor(rijdanelManaged.Key, rijdanelManaged.IV))
{
using (var memoryStream = new MemoryStream())
@@ -55,12 +56,13 @@
{
using (var streamWriter = new StreamWriter(cryptoStream))
{
await streamWriter.WriteAsync(data);
return string.Join(separator, Convert.ToBase64String(salt), Convert.ToBase64String(memoryStream.ToArray()));
streamWriter.Write(data);
}
}
encryptedData = memoryStream.ToArray();
}
}
return string.Join(separator, Convert.ToBase64String(salt), Convert.ToBase64String(encryptedData));
}
}
 
@@ -77,13 +79,14 @@
/// <param name="key">the encryption key</param>
/// <param name="separator">the separator to use between the cyphertext and the IV</param>
/// <returns>the decrypted data</returns>
public static async Task<string> Decrypt(string data, string key, string separator = ":")
public string wasAESDecrypt(string data, string key, string separator = ":")
{
// retrieve the salt from the data.
var segments = new List<string>(data.Split(new[] {separator}, StringSplitOptions.None));
if (!segments.Count().Equals(2))
if (!segments.Count.Equals(2))
throw new ArgumentException("Invalid data.");
 
string plaintext;
using (var rijdanelManaged = new RijndaelManaged())
{
// FIPS-197 / CBC
@@ -93,8 +96,8 @@
 
// Retrieve the key and the IV from the salt.
var derivedKey = new Rfc2898DeriveBytes(key, Convert.FromBase64String(segments.First().Trim()));
rijdanelManaged.Key = derivedKey.GetBytes(rijdanelManaged.KeySize / 8);
rijdanelManaged.IV = derivedKey.GetBytes(rijdanelManaged.BlockSize / 8);
rijdanelManaged.Key = derivedKey.GetBytes(rijdanelManaged.KeySize/8);
rijdanelManaged.IV = derivedKey.GetBytes(rijdanelManaged.BlockSize/8);
 
using (var decryptor = rijdanelManaged.CreateDecryptor(rijdanelManaged.Key, rijdanelManaged.IV))
{
@@ -104,12 +107,13 @@
{
using (var streamReader = new StreamReader(cryptoStream))
{
return await streamReader.ReadToEndAsync();
plaintext = streamReader.ReadToEnd();
}
}
}
}
}
return plaintext;
}
}
}