From bfd88a117dbf40a69c3553f0c3c15606df0d73c8 Mon Sep 17 00:00:00 2001 From: Raphael Anyanwu Date: Sat, 15 Apr 2023 23:21:34 +0100 Subject: [PATCH 1/3] Add CovertKeys method --- Encrypt/AesEncryption/AesEncryption.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Encrypt/AesEncryption/AesEncryption.cs b/Encrypt/AesEncryption/AesEncryption.cs index 91d1323..7939c30 100644 --- a/Encrypt/AesEncryption/AesEncryption.cs +++ b/Encrypt/AesEncryption/AesEncryption.cs @@ -81,6 +81,13 @@ private void NullChecks(string data, string secretKey, string iv) throw new ArgumentNullException(nameof(iv)); } + private (byte[], byte[]) ConvertKeysToBytes(string secretKey, string ivKey) + { + var secret = Encoding.UTF8.GetBytes(secretKey); + var iv = Encoding.UTF8.GetBytes(ivKey); + + return (secret, iv); + } private void NullChecks(string data, string secretKey) { if (data == null || data.Length <= 0) From bc41ff67682b91dd9037a7e7e28462bf4f1bb2fa Mon Sep 17 00:00:00 2001 From: Raphael Anyanwu Date: Sat, 15 Apr 2023 23:24:11 +0100 Subject: [PATCH 2/3] Refactored method to use convertted keys method --- Encrypt/AesEncryption/AesEncryption.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Encrypt/AesEncryption/AesEncryption.cs b/Encrypt/AesEncryption/AesEncryption.cs index 7939c30..603d8db 100644 --- a/Encrypt/AesEncryption/AesEncryption.cs +++ b/Encrypt/AesEncryption/AesEncryption.cs @@ -14,10 +14,13 @@ public byte[] AesDecrypt(byte[] data, byte[] secretKey, byte[] iv) public byte[] AesEncrypt(string data, string secretKey, string iv) { - NullChecks(data, secretKey, iv); + NullChecks(data, secretKey, iv); + + var convertedKeys = ConvertKeysToBytes(secretKey, iv); + + var aesKey = convertedKeys.Item1; + var aesIv = convertedKeys.Item2; - var aesKey = Encoding.UTF8.GetBytes(secretKey); - var aesIv = Encoding.UTF8.GetBytes(iv); var aesData = data.HexadecimalStringToByteArray(); return EncryptAES(aesData, aesKey, aesIv); From 6bd00283dbc9b0500b894a2bfaa8731df80713e1 Mon Sep 17 00:00:00 2001 From: Raphael Anyanwu Date: Sat, 15 Apr 2023 23:24:38 +0100 Subject: [PATCH 3/3] updated method --- Encrypt/AesEncryption/AesEncryption.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Encrypt/AesEncryption/AesEncryption.cs b/Encrypt/AesEncryption/AesEncryption.cs index 603d8db..d4c017c 100644 --- a/Encrypt/AesEncryption/AesEncryption.cs +++ b/Encrypt/AesEncryption/AesEncryption.cs @@ -14,15 +14,13 @@ public byte[] AesDecrypt(byte[] data, byte[] secretKey, byte[] iv) public byte[] AesEncrypt(string data, string secretKey, string iv) { - NullChecks(data, secretKey, iv); - + NullChecks(data, secretKey, iv); var convertedKeys = ConvertKeysToBytes(secretKey, iv); var aesKey = convertedKeys.Item1; var aesIv = convertedKeys.Item2; var aesData = data.HexadecimalStringToByteArray(); - return EncryptAES(aesData, aesKey, aesIv); }