/trunk/Winify/MainForm.cs |
@@ -291,7 +291,8 @@ |
}; |
foreach (var server in servers.Server) |
{ |
var encrypted = AES.Encrypt(Encoding.UTF8.GetBytes(server.Password), deviceId); |
var password = Encoding.UTF8.GetBytes(server.Password); |
var encrypted = await AES.Encrypt(password, deviceId); |
var armored = Convert.ToBase64String(encrypted); |
|
@protected.Server.Add(new Server(server.Name, server.Url, server.Username, armored)); |
@@ -349,7 +350,8 @@ |
foreach (var server in serializationSuccess.Result.Server) |
{ |
var unarmored = Convert.FromBase64String(server.Password); |
var decrypted = Encoding.UTF8.GetString(AES.Decrypt(unarmored, deviceId)); |
var result = await AES.Decrypt(unarmored, deviceId); |
var decrypted = Encoding.UTF8.GetString(result); |
|
@protected.Server.Add(new Server(server.Name, server.Url, server.Username, decrypted)); |
} |
/trunk/Winify/Utilities/AES.cs |
@@ -7,6 +7,7 @@ |
using System.IO; |
using System.Linq; |
using System.Security.Cryptography; |
using System.Threading.Tasks; |
|
namespace Winify.Utilities |
{ |
@@ -25,7 +26,7 @@ |
/////////////////////////////////////////////////////////////////////////// |
// Copyright (C) Wizardry and Steamworks 2016 - License: GNU GPLv3 // |
/////////////////////////////////////////////////////////////////////////// |
public static byte[] Encrypt(byte[] plain, string password) |
public static async Task<byte[]> Encrypt(byte[] plain, string password) |
{ |
using (var rijndael = Rijndael.Create()) |
{ |
@@ -35,22 +36,23 @@ |
rijndael.Padding = PaddingMode.PKCS7; |
var salt = new byte[AESKeySaltBytes]; |
Rng.GetBytes(salt); |
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.CreateEncryptor(), CryptoStreamMode.Write)) |
using (var memoryStream = new MemoryStream()) |
{ |
cryptoStream.Write(plain, 0, plain.Length); |
cryptoStream.Close(); |
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(); |
} |
} |
} |
} |
@@ -59,7 +61,7 @@ |
/////////////////////////////////////////////////////////////////////////// |
// Copyright (C) Wizardry and Steamworks 2016 - License: GNU GPLv3 // |
/////////////////////////////////////////////////////////////////////////// |
public static byte[] Decrypt(byte[] cipher, string password) |
public static async Task<byte[]> Decrypt(byte[] cipher, string password) |
{ |
using (var rijndael = Rijndael.Create()) |
{ |
@@ -68,25 +70,25 @@ |
rijndael.KeySize = 256; |
rijndael.Padding = PaddingMode.PKCS7; |
|
var salt = cipher.Take(16) |
.ToArray(); |
var salt = cipher.Take(AESKeySaltBytes).ToArray(); |
|
var ciphertext = cipher.Skip(16) |
.ToArray(); |
var ciphertext = cipher.Skip(AESKeySaltBytes).ToArray(); |
|
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)) |
using (var memoryStream = new MemoryStream()) |
{ |
cryptoStream.Write(ciphertext, 0, ciphertext.Length); |
cryptoStream.Close(); |
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(); |
} |
} |
} |
} |