From 1d3e017a32b66435660ddb12d2902fe1135b9a80 Mon Sep 17 00:00:00 2001 From: "eanolue@sbsc.com" Date: Mon, 18 Dec 2023 04:47:52 +0100 Subject: [PATCH 1/3] removed unnecessary using statements --- src/Encryption/AesEncryption/BaseAesEncryption.cs | 2 -- .../AesEncryption/Models/ByteEncryptionParameters.cs | 5 +---- .../AesEncryption/Models/Decrypt/DecryptionData.cs | 4 +--- .../AesEncryption/Models/Encrypt/EncryptionData.cs | 4 +--- .../AesEncryption/Models/Encrypt/EncryptionParameters.cs | 6 ++---- src/Enums/ReturnType.cs | 6 +----- src/Helpers/Validators.cs | 2 -- 7 files changed, 6 insertions(+), 23 deletions(-) diff --git a/src/Encryption/AesEncryption/BaseAesEncryption.cs b/src/Encryption/AesEncryption/BaseAesEncryption.cs index 9a35ca9..d44a5fd 100644 --- a/src/Encryption/AesEncryption/BaseAesEncryption.cs +++ b/src/Encryption/AesEncryption/BaseAesEncryption.cs @@ -1,9 +1,7 @@ using SafeCrypt.Models; using System; using System.IO; -using System.Reflection; using System.Security.Cryptography; -using System.Text; namespace SafeCrypt.AesEncryption { diff --git a/src/Encryption/AesEncryption/Models/ByteEncryptionParameters.cs b/src/Encryption/AesEncryption/Models/ByteEncryptionParameters.cs index f5be539..0f05841 100644 --- a/src/Encryption/AesEncryption/Models/ByteEncryptionParameters.cs +++ b/src/Encryption/AesEncryption/Models/ByteEncryptionParameters.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text; +using System.ComponentModel.DataAnnotations; namespace SafeCrypt.Models { diff --git a/src/Encryption/AesEncryption/Models/Decrypt/DecryptionData.cs b/src/Encryption/AesEncryption/Models/Decrypt/DecryptionData.cs index 55f62d4..2f318cb 100644 --- a/src/Encryption/AesEncryption/Models/Decrypt/DecryptionData.cs +++ b/src/Encryption/AesEncryption/Models/Decrypt/DecryptionData.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; namespace SafeCrypt.Models { diff --git a/src/Encryption/AesEncryption/Models/Encrypt/EncryptionData.cs b/src/Encryption/AesEncryption/Models/Encrypt/EncryptionData.cs index dcc6f13..1196ebf 100644 --- a/src/Encryption/AesEncryption/Models/Encrypt/EncryptionData.cs +++ b/src/Encryption/AesEncryption/Models/Encrypt/EncryptionData.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; namespace SafeCrypt.Models { diff --git a/src/Encryption/AesEncryption/Models/Encrypt/EncryptionParameters.cs b/src/Encryption/AesEncryption/Models/Encrypt/EncryptionParameters.cs index fd2363a..e329366 100644 --- a/src/Encryption/AesEncryption/Models/Encrypt/EncryptionParameters.cs +++ b/src/Encryption/AesEncryption/Models/Encrypt/EncryptionParameters.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text; +using System.ComponentModel.DataAnnotations; + namespace SafeCrypt.Models { diff --git a/src/Enums/ReturnType.cs b/src/Enums/ReturnType.cs index 2a7007a..4352d34 100644 --- a/src/Enums/ReturnType.cs +++ b/src/Enums/ReturnType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace SafeCrypt.Enums +namespace SafeCrypt.Enums { public enum ReturnType { diff --git a/src/Helpers/Validators.cs b/src/Helpers/Validators.cs index a677b3d..2fad05f 100644 --- a/src/Helpers/Validators.cs +++ b/src/Helpers/Validators.cs @@ -1,7 +1,5 @@ using SafeCrypt.Models; using System; -using System.Collections.Generic; -using System.Text; namespace SafeCrypt.Helpers { From dc7eccc7fc6c40cef5e28a0a0e0355c04da1d62b Mon Sep 17 00:00:00 2001 From: "eanolue@sbsc.com" Date: Mon, 18 Dec 2023 04:52:07 +0100 Subject: [PATCH 2/3] clean up --- src/Encryption/AesEncryption/BaseAesEncryption.cs | 5 ++--- .../AesEncryption/Models/Encrypt/EncryptionData.cs | 1 + src/Helpers/Converters.cs | 1 + src/Helpers/Validators.cs | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Encryption/AesEncryption/BaseAesEncryption.cs b/src/Encryption/AesEncryption/BaseAesEncryption.cs index d44a5fd..a9d46ce 100644 --- a/src/Encryption/AesEncryption/BaseAesEncryption.cs +++ b/src/Encryption/AesEncryption/BaseAesEncryption.cs @@ -52,7 +52,7 @@ internal static byte[] EncryptAES(ByteEncryptionParameters param) } } } - catch (Exception ex) + catch (Exception) { throw; } @@ -102,9 +102,8 @@ internal static byte[] DecryptAES(ByteDecryptionParameters param) } } } - catch (Exception ex) + catch (Exception) { - throw; } } diff --git a/src/Encryption/AesEncryption/Models/Encrypt/EncryptionData.cs b/src/Encryption/AesEncryption/Models/Encrypt/EncryptionData.cs index 1196ebf..8af7b78 100644 --- a/src/Encryption/AesEncryption/Models/Encrypt/EncryptionData.cs +++ b/src/Encryption/AesEncryption/Models/Encrypt/EncryptionData.cs @@ -23,6 +23,7 @@ public class EncryptionData public string SecretKey { get; set; } public bool HasError { get; set; } + public List Errors { get; set; } = new List(); } } diff --git a/src/Helpers/Converters.cs b/src/Helpers/Converters.cs index 57a6e3d..d254060 100644 --- a/src/Helpers/Converters.cs +++ b/src/Helpers/Converters.cs @@ -37,6 +37,7 @@ public static byte[] HexadecimalStringToByteArray(this string input) } return output; } + /// /// Converts a string to its hexadecimal representation. /// diff --git a/src/Helpers/Validators.cs b/src/Helpers/Validators.cs index 2fad05f..19d8702 100644 --- a/src/Helpers/Validators.cs +++ b/src/Helpers/Validators.cs @@ -35,6 +35,7 @@ public static void ValidateNotNull(EncryptionParameters parameters) throw new ArgumentNullException(nameof(parameters.IV), "IV property cannot be null."); } } + public static void ValidateNotNull(DecryptionParameters parameters) { if (parameters == null) From a8c76e0c26424e3d9a5814b99e993f2da22f2d7b Mon Sep 17 00:00:00 2001 From: "eanolue@sbsc.com" Date: Thu, 21 Dec 2023 11:16:24 +0100 Subject: [PATCH 3/3] reverted the ex based on discussion with Raph --- src/Encryption/AesEncryption/BaseAesEncryption.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Encryption/AesEncryption/BaseAesEncryption.cs b/src/Encryption/AesEncryption/BaseAesEncryption.cs index a9d46ce..a17a6b9 100644 --- a/src/Encryption/AesEncryption/BaseAesEncryption.cs +++ b/src/Encryption/AesEncryption/BaseAesEncryption.cs @@ -52,7 +52,7 @@ internal static byte[] EncryptAES(ByteEncryptionParameters param) } } } - catch (Exception) + catch (Exception ex) { throw; } @@ -102,7 +102,7 @@ internal static byte[] DecryptAES(ByteDecryptionParameters param) } } } - catch (Exception) + catch (Exception ex) { throw; }