From 9841a0f16e01daded9d0ea1d48eccd06bbca6429 Mon Sep 17 00:00:00 2001 From: h5p9sl Date: Wed, 5 Dec 2018 18:30:35 -0700 Subject: [PATCH] Added AESMetadata.WriteMetadata() --- Crypto Notepad/AES.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Crypto Notepad/AES.cs b/Crypto Notepad/AES.cs index 8a5298a..37b919e 100644 --- a/Crypto Notepad/AES.cs +++ b/Crypto Notepad/AES.cs @@ -53,6 +53,15 @@ private bool ReadData(byte[] rawData, int offset, ref byte[] dataOut) return false; } + public static void WriteMetadata(MemoryStream stream, byte[] IV, byte[] salt) + { + byte[] nullByte = { 0 }; + stream.Write(IV, 0, IV.Length); + stream.Write(nullByte, 0, 1); + stream.Write(salt, 0, salt.Length); + stream.Write(nullByte, 0, 1); + } + public bool GetMetadata(byte[] rawData) { int offset = 0; @@ -114,11 +123,7 @@ public static string Encrypt(string plainText, string password, using (MemoryStream memStream = new MemoryStream()) { - byte[] nullByte = { 0 }; - memStream.Write(symmetricKey.IV, 0, symmetricKey.IV.Length); - memStream.Write(nullByte, 0, 1); - memStream.Write(saltValueBytes, 0, saltValueBytes.Length); - memStream.Write(nullByte, 0, 1); + AESMetadata.WriteMetadata(memStream, symmetricKey.IV, saltValueBytes); using (ICryptoTransform encryptor = symmetricKey.CreateEncryptor (keyBytes, symmetricKey.IV))