Merge pull request #32 from PandaTechAM/development

Provided new overload methods without optional arguments

Author: mnacmargaryan

src/Pandatech.Crypto/Helpers/Aes256Siv.cs

@@ -20,12 +20,22 @@ internal static void RegisterKey(string key)
       GlobalKey = key;
    }
 
+   public static byte[] Encrypt(string plaintext)
+   {
+      return Encrypt(plaintext, null);
+   }
+
    public static byte[] Encrypt(string plaintext, string? key = null)
    {
       var bytes = Encoding.UTF8.GetBytes(plaintext);
       return Encrypt(bytes, key);
    }
 
+   public static byte[] Encrypt(byte[] plaintext)
+   {
+      return Encrypt(plaintext, null);
+   }
+
    public static byte[] Encrypt(byte[] plaintext, string? key = null)
    {
       if (plaintext.Length == 0)
@@ -42,6 +52,11 @@ public static byte[] Encrypt(byte[] plaintext, string? key = null)
       return Arrays.Concatenate(siv, cipher);
    }
 
+   public static void Encrypt(Stream input, Stream output)
+   {
+      Encrypt(input, output, null);
+   }
+
    public static void Encrypt(Stream input, Stream output, string? key = null)
    {
       ArgumentNullException.ThrowIfNull(input);
@@ -53,12 +68,22 @@ public static void Encrypt(Stream input, Stream output, string? key = null)
       output.Write(encrypted, 0, encrypted.Length);
    }
 
+   public static string Decrypt(byte[] ciphertext)
+   {
+      return Decrypt(ciphertext, null);
+   }
+
    public static string Decrypt(byte[] ciphertext, string? key = null)
    {
       var plain = DecryptToBytes(ciphertext, key);
       return Encoding.UTF8.GetString(plain);
    }
 
+   public static byte[] DecryptToBytes(byte[] ciphertext)
+   {
+      return DecryptToBytes(ciphertext, null);
+   }
+
    public static byte[] DecryptToBytes(byte[] ciphertext, string? key = null)
    {
       var keyBytes = GetKeyBytes(key);
@@ -86,6 +111,11 @@ public static byte[] DecryptToBytes(byte[] ciphertext, string? key = null)
       return plain;
    }
 
+   public static void Decrypt(Stream input, Stream output)
+   {
+      Decrypt(input, output, null);
+   }
+
    public static void Decrypt(Stream input, Stream output, string? key = null)
    {
       ArgumentNullException.ThrowIfNull(input);

src/Pandatech.Crypto/Pandatech.Crypto.csproj

@@ -8,7 +8,7 @@
         <Copyright>MIT</Copyright>
         <PackageIcon>pandatech.png</PackageIcon>
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
-        <Version>5.0.0</Version>
+        <Version>5.0.1</Version>
         <Title>Pandatech.Crypto</Title>
         <PackageTags>Pandatech, library, encryption, hash, algorythms, security</PackageTags>
         <Description>PandaTech.Crypto is a .NET library simplifying common cryptograhic functions.</Description>

test/Pandatech.Crypto.Tests/Aes256SivTests.cs

@@ -12,6 +12,34 @@ private static string GenerateRandomAes256KeyString()
       return Random.GenerateAes256KeyString();
    }
 
+
+   [Theory]
+   [InlineData(" ")]
+   [InlineData("HelloWorld")]
+   [InlineData("Some special characters: ~!@#$%^&*()_+{}|:\"<>?")]
+   [InlineData("Tabs\tNewLine\nCarriageReturn\rMixed\n\rAll")]
+   [InlineData("Unicode test: 你好, мир, مرحبا, नमस्ते")]
+   [InlineData("Emoji test: \U0001F600 \U0001F31F \U0001F680")]
+   [InlineData("1234567890")]
+   [InlineData("😀😃😄😁😆")]
+   [InlineData("Line1\nLine2\r\nLine3")]
+   [InlineData("A string with a null char \0 in between")]
+   public void EncryptDecrypt_InlineData_WorksForAllKindOfStrings(string original)
+   {
+      // Arrange
+      var key = GenerateRandomAes256KeyString();
+
+      // Act
+      var encrypted = Aes256Siv.Encrypt(original, key);
+      var decrypted = Aes256Siv.Decrypt(encrypted, key);
+
+      var encryptedBytesToString = Encoding.UTF8.GetString(encrypted);
+      // Assert
+   
+      Assert.NotEqual(original, encryptedBytesToString);
+      Assert.Equal(original, decrypted);
+   }
+
    [Fact]
    public void EncryptDecrypt_ReturnsOriginalString()
    {
@@ -23,7 +51,7 @@ public void EncryptDecrypt_ReturnsOriginalString()
       var encrypted = Aes256Siv.Encrypt(original, key);
       var decrypted = Aes256Siv.Decrypt(encrypted, key);
 
-     
+
       Assert.Equal(original, decrypted);
    }