prehistoric-systems/Crypto-Notepad
1
0
Fork 0
mirror of https://github.com/Crypto-Notepad/Crypto-Notepad.git synced 2026-03-11 08:55:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use RijindaelManaged.GenerateIV method instead of manually generating random IV

Browse source
This commit is contained in:
h5p9sl 2018-11-29 16:21:45 -07:00
parent 5de4fb5563
commit ee87e94da0
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Crypto Notepad/AES.cs
View file

@ -87,7 +87,7 @@ public void GetMetadata(byte[] rawData)
class AES class AES
{ {
public static string Encrypt(string plainText, string password, byte[] initialVectorBytes, public static string Encrypt(string plainText, string password,
string salt = "Kosher", string hashAlgorithm = "SHA1", string salt = "Kosher", string hashAlgorithm = "SHA1",
int passwordIterations = 2, int keySize = 256) int passwordIterations = 2, int keySize = 256)
{ {
@ -103,19 +103,20 @@ public static string Encrypt(string plainText, string password, byte[] initialVe
byte[] keyBytes = derivedPassword.GetBytes(keySize / 8); byte[] keyBytes = derivedPassword.GetBytes(keySize / 8);
RijndaelManaged symmetricKey = new RijndaelManaged(); RijndaelManaged symmetricKey = new RijndaelManaged();
symmetricKey.Mode = CipherMode.CBC; symmetricKey.Mode = CipherMode.CBC;
symmetricKey.GenerateIV();
byte[] cipherTextBytes = null; byte[] cipherTextBytes = null;
using (MemoryStream memStream = new MemoryStream()) using (MemoryStream memStream = new MemoryStream())
{ {
byte[] nullByte = { 0 }; byte[] nullByte = { 0 };
memStream.Write(initialVectorBytes, 0, initialVectorBytes.Length); memStream.Write(symmetricKey.IV, 0, symmetricKey.IV.Length);
memStream.Write(nullByte, 0, 1); memStream.Write(nullByte, 0, 1);
memStream.Write(saltValueBytes, 0, saltValueBytes.Length); memStream.Write(saltValueBytes, 0, saltValueBytes.Length);
memStream.Write(nullByte, 0, 1); memStream.Write(nullByte, 0, 1);
using (ICryptoTransform encryptor = symmetricKey.CreateEncryptor using (ICryptoTransform encryptor = symmetricKey.CreateEncryptor
(keyBytes, initialVectorBytes)) (keyBytes, symmetricKey.IV))
{ {
using (CryptoStream cryptoStream = new CryptoStream using (CryptoStream cryptoStream = new CryptoStream
(memStream, encryptor, CryptoStreamMode.Write)) (memStream, encryptor, CryptoStreamMode.Write))

16
Crypto Notepad/Form1.cs
View file

@ -234,14 +234,8 @@ private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)
filename = SaveFile.FileName; filename = SaveFile.FileName;
// Generate random initialization vector
RandomNumberGenerator RandNumGen = RNGCryptoServiceProvider.Create();
byte[] RandInitVector = new byte[16];
RandNumGen.GetNonZeroBytes(RandInitVector);
string noenc = customRTB.Text; string noenc = customRTB.Text;
string en = AES.Encrypt(customRTB.Text, publicVar.encryptionKey, RandInitVector, ps.TheSalt, ps.HashAlgorithm, ps.PasswordIterations, ps.KeySize); string en = AES.Encrypt(customRTB.Text, publicVar.encryptionKey, ps.TheSalt, ps.HashAlgorithm, ps.PasswordIterations, ps.KeySize);
RandNumGen.Dispose();
customRTB.Text = en; customRTB.Text = en;
StreamWriter sw = new StreamWriter(filename); StreamWriter sw = new StreamWriter(filename);
@ -381,14 +375,8 @@ private void saveToolStripMenuItem1_Click_1(object sender, EventArgs e)
publicVar.okPressed = false; publicVar.okPressed = false;
} }
// Generate random initialization vector
RandomNumberGenerator RandNumGen = RNGCryptoServiceProvider.Create();
byte[] RandInitVector = new byte[16];
RandNumGen.GetNonZeroBytes(RandInitVector);
string noenc = customRTB.Text; string noenc = customRTB.Text;
string en = AES.Encrypt(customRTB.Text, publicVar.encryptionKey, RandInitVector, ps.TheSalt, ps.HashAlgorithm, ps.PasswordIterations, ps.KeySize); string en = AES.Encrypt(customRTB.Text, publicVar.encryptionKey, ps.TheSalt, ps.HashAlgorithm, ps.PasswordIterations, ps.KeySize);
RandNumGen.Dispose();
customRTB.Text = en; customRTB.Text = en;
StreamWriter sw = new StreamWriter(filename); StreamWriter sw = new StreamWriter(filename);