Merge pull request #16 from selfmadecode/dev_raphael_aes

selfmadecode · web-flow · commit 338bb6320c1b · 2023-12-15T10:28:41.000+01:00
restructure folder structure
diff --git a/src/Encryption/AesEncryption/AesEncryption.cs b/src/Encryption/AesEncryption/AesEncryption.cs
@@ -1,8 +1,10 @@
 ﻿using System;
 using System.Text;
 using System.Security.Cryptography;
+using SafeCrypt.src.Helpers;
+using SafeCrypt.src.Encryption.AesEncryption.Models;
 
-namespace SafeCrypt
+namespace SafeCrypt.src.Encrypt.AesEncryption
 {
     public class AesEncryption : BaseAesEncryption
     {
@@ -116,12 +118,7 @@ private void NullChecks(string data, string secretKey)
 
             if (secretKey == null || secretKey.Length <= 0)
                 throw new ArgumentNullException(nameof(secretKey));
-        }   
+        }
     }
 
-    public class AesEncryptionData
-    {
-        public byte[] Data { get; set; }
-        public byte[] Iv { get; set; }
-    }
 }
diff --git a/src/Encryption/AesEncryption/BaseAesEncryption.cs b/src/Encryption/AesEncryption/BaseAesEncryption.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Security.Cryptography;
 
-namespace SafeCrypt
+namespace SafeCrypt.src.Encrypt.AesEncryption
 {
     public class BaseAesEncryption
     {
@@ -56,10 +56,10 @@ public static byte[] DecryptAES(byte[] encryptedData, byte[] key, byte[] iv)
             }
         }
 
-            // Method to generate a random byte array of given length
-            // Used to get the IV
-            // Generate a random 16-byte IV for AES in CBC mode
-            public static byte[] GenerateRandomBytes(int length)
+        // Method to generate a random byte array of given length
+        // Used to get the IV
+        // Generate a random 16-byte IV for AES in CBC mode
+        public static byte[] GenerateRandomBytes(int length)
         {
             byte[] randomBytes = new byte[length];
             using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
diff --git a/src/Encryption/AesEncryption/Models/AesEncryptionData.cs b/src/Encryption/AesEncryption/Models/AesEncryptionData.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SafeCrypt.src.Encryption.AesEncryption.Models
+{
+    public class AesEncryptionData
+    {
+        public byte[] Data { get; set; }
+        public byte[] Iv { get; set; }
+    }
+}
diff --git a/src/Enums/ReturnType.cs b/src/Enums/ReturnType.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SafeCrypt
+namespace SafeCrypt.src.Enums
 {
     public enum ReturnType
     {
diff --git a/src/Helpers/Converters.cs b/src/Helpers/Converters.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Text;
 
-namespace SafeCrypt
+namespace SafeCrypt.src.Helpers
 {
     public static class Converters
     {

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Text;`
`3`	`3`	`using System.Security.Cryptography;`
	`4`	`+using SafeCrypt.src.Helpers;`
	`5`	`+using SafeCrypt.src.Encryption.AesEncryption.Models;`
`4`	`6`
`5`		`-namespace SafeCrypt`
	`7`	`+namespace SafeCrypt.src.Encrypt.AesEncryption`
`6`	`8`	`{`
`7`	`9`	`public class AesEncryption : BaseAesEncryption`
`8`	`10`	`{`
`@@ -116,12 +118,7 @@ private void NullChecks(string data, string secretKey)`
`116`	`118`
`117`	`119`	`if (secretKey == null \|\| secretKey.Length <= 0)`
`118`	`120`	`throw new ArgumentNullException(nameof(secretKey));`
`119`		`- }`
	`121`	`+ }`
`120`	`122`	`}`
`121`	`123`
`122`		`- public class AesEncryptionData`
`123`		`- {`
`124`		`- public byte[] Data { get; set; }`
`125`		`- public byte[] Iv { get; set; }`
`126`		`- }`
`127`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.IO;`
`3`	`3`	`using System.Security.Cryptography;`
`4`	`4`
`5`		`-namespace SafeCrypt`
	`5`	`+namespace SafeCrypt.src.Encrypt.AesEncryption`
`6`	`6`	`{`
`7`	`7`	`public class BaseAesEncryption`
`8`	`8`	`{`
`@@ -56,10 +56,10 @@ public static byte[] DecryptAES(byte[] encryptedData, byte[] key, byte[] iv)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- // Method to generate a random byte array of given length`
`60`		`- // Used to get the IV`
`61`		`- // Generate a random 16-byte IV for AES in CBC mode`
`62`		`- public static byte[] GenerateRandomBytes(int length)`
	`59`	`+ // Method to generate a random byte array of given length`
	`60`	`+ // Used to get the IV`
	`61`	`+ // Generate a random 16-byte IV for AES in CBC mode`
	`62`	`+ public static byte[] GenerateRandomBytes(int length)`
`63`	`63`	`{`
`64`	`64`	`byte[] randomBytes = new byte[length];`
`65`	`65`	`using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Text;`
`4`	`4`
`5`		`-namespace SafeCrypt`
	`5`	`+namespace SafeCrypt.src.Enums`
`6`	`6`	`{`
`7`	`7`	`public enum ReturnType`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Text;`
`5`	`5`
`6`		`-namespace SafeCrypt`
	`6`	`+namespace SafeCrypt.src.Helpers`
`7`	`7`	`{`
`8`	`8`	`public static class Converters`
`9`	`9`	`{`