Winify

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ 60  →  ?path2? @ 61
/trunk/Winify/Utilities/AES.cs
@@ -28,34 +28,26 @@
///////////////////////////////////////////////////////////////////////////
public static async Task<byte[]> Encrypt(byte[] plain, string password)
{
using (var rijndael = Rijndael.Create())
{
rijndael.BlockSize = 128;
rijndael.Mode = CipherMode.CBC;
rijndael.KeySize = 256;
rijndael.Padding = PaddingMode.PKCS7;
var salt = new byte[AESKeySaltBytes];
Rng.GetBytes(salt);
using (var pdb = new Rfc2898DeriveBytes(password, salt, 1000))
{
rijndael.Key = pdb.GetBytes(rijndael.KeySize / 8);
rijndael.IV = pdb.GetBytes(rijndael.BlockSize / 8);
using var rijndael = Rijndael.Create();
rijndael.BlockSize = 128;
rijndael.Mode = CipherMode.CBC;
rijndael.KeySize = 256;
rijndael.Padding = PaddingMode.PKCS7;
var salt = new byte[AESKeySaltBytes];
Rng.GetBytes(salt);
using var pdb = new Rfc2898DeriveBytes(password, salt, 1000);
rijndael.Key = pdb.GetBytes(rijndael.KeySize / 8);
rijndael.IV = pdb.GetBytes(rijndael.BlockSize / 8);
 
using (var memoryStream = new MemoryStream())
{
using (var cryptoStream =
new CryptoStream(memoryStream, rijndael.CreateEncryptor(), CryptoStreamMode.Write))
{
await cryptoStream.WriteAsync(plain, 0, plain.Length);
cryptoStream.Close();
using var memoryStream = new MemoryStream();
using var cryptoStream =
new CryptoStream(memoryStream, rijndael.CreateEncryptor(), CryptoStreamMode.Write);
await cryptoStream.WriteAsync(plain, 0, plain.Length);
cryptoStream.Close();
 
var ciphertext = memoryStream.ToArray();
var ciphertext = memoryStream.ToArray();
 
return salt.Concat(ciphertext).ToArray();
}
}
}
}
return salt.Concat(ciphertext).ToArray();
}
 
///////////////////////////////////////////////////////////////////////////
@@ -63,35 +55,27 @@
///////////////////////////////////////////////////////////////////////////
public static async Task<byte[]> Decrypt(byte[] cipher, string password)
{
using (var rijndael = Rijndael.Create())
{
rijndael.BlockSize = 128;
rijndael.Mode = CipherMode.CBC;
rijndael.KeySize = 256;
rijndael.Padding = PaddingMode.PKCS7;
using var rijndael = Rijndael.Create();
rijndael.BlockSize = 128;
rijndael.Mode = CipherMode.CBC;
rijndael.KeySize = 256;
rijndael.Padding = PaddingMode.PKCS7;
 
var salt = cipher.Take(AESKeySaltBytes).ToArray();
var salt = cipher.Take(AESKeySaltBytes).ToArray();
 
var ciphertext = cipher.Skip(AESKeySaltBytes).ToArray();
var ciphertext = cipher.Skip(AESKeySaltBytes).ToArray();
 
using (var pdb = new Rfc2898DeriveBytes(password, salt, 1000))
{
rijndael.Key = pdb.GetBytes(rijndael.KeySize / 8);
rijndael.IV = pdb.GetBytes(rijndael.BlockSize / 8);
using var pdb = new Rfc2898DeriveBytes(password, salt, 1000);
rijndael.Key = pdb.GetBytes(rijndael.KeySize / 8);
rijndael.IV = pdb.GetBytes(rijndael.BlockSize / 8);
 
using (var memoryStream = new MemoryStream())
{
using (var cryptoStream =
new CryptoStream(memoryStream, rijndael.CreateDecryptor(), CryptoStreamMode.Write))
{
await cryptoStream.WriteAsync(ciphertext, 0, ciphertext.Length);
cryptoStream.Close();
using var memoryStream = new MemoryStream();
using var cryptoStream =
new CryptoStream(memoryStream, rijndael.CreateDecryptor(), CryptoStreamMode.Write);
await cryptoStream.WriteAsync(ciphertext, 0, ciphertext.Length);
cryptoStream.Close();
 
return memoryStream.ToArray();
}
}
}
}
return memoryStream.ToArray();
}
 
#endregion