wasSharpNET

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ 10  →  ?path2? @ 11
/Cryptography/AES.cs
@@ -43,8 +43,8 @@
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))
@@ -81,7 +81,7 @@
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));
var segments = new List<string>(data.Split(new[] { separator }, StringSplitOptions.None));
if (!segments.Count.Equals(2))
throw new ArgumentException("Invalid data.");
 
@@ -95,8 +95,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))
{
@@ -115,4 +115,4 @@
return plaintext;
}
}
}
}
/Cryptography/SHA1.cs
@@ -22,7 +22,6 @@
return BitConverter.ToString(sha1.ComputeHash(data)).Replace("-", "");
}
 
 
public static string ToHex(this System.Security.Cryptography.SHA1 sha1, string data)
{
return BitConverter.ToString(sha1.ComputeHash(Encoding.UTF8.GetBytes(data))).Replace("-", "");
@@ -62,4 +61,4 @@
}
}
}
}
}