Remoive secure string support

Author: Eastrall

src/EntityFrameworkCore.DataEncryption/Internal/EncryptionConverter.cs

@@ -1,7 +1,6 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using System;
 using System.ComponentModel.DataAnnotations;
-using System.Security;
 using System.Text;
 
 namespace Microsoft.EntityFrameworkCore.DataEncryption.Internal;
@@ -33,7 +32,6 @@ private static TOutput Encrypt<TInput, TOutput>(TInput input, IEncryptionProvide
         {
             string => Encoding.UTF8.GetBytes(input.ToString()),
             byte[] => input as byte[],
-            SecureString => null,
             _ => null,
         };
 
@@ -69,10 +67,6 @@ private static TModel Decrypt<TInput, TOupout>(TProvider input, IEncryptionProvi
         {
             decryptedData = decryptedRawBytes;
         }
-        else if (destinationType == typeof(SecureString))
-        {
-            // TODO
-        }
 
         return (TModel)Convert.ChangeType(decryptedData, typeof(TModel));
     }

src/EntityFrameworkCore.DataEncryption/ModelBuilderExtensions.cs

@@ -7,7 +7,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Reflection;
-using System.Security;
 
 namespace Microsoft.EntityFrameworkCore.DataEncryption;
 
@@ -80,10 +79,6 @@ private static ValueConverter GetValueConverter(Type propertyType, IEncryptionPr
                 _ => throw new NotImplementedException()
             };
         }
-        else if (propertyType == typeof(SecureString))
-        {
-            // TODO
-        }
 
         return null;
     }
@@ -93,20 +88,17 @@ private static IEnumerable<EncryptedProperty> GetEntityEncryptedProperties(IMuta
         return entity.GetProperties()
             .Select(p => new { Property = p, EncryptedAttribute = p.PropertyInfo?.GetCustomAttribute<EncryptedAttribute>(false) })
             .Where(x => x.EncryptedAttribute != null)
-            .Select(x => new EncryptedProperty(entity, x.Property, x.EncryptedAttribute.Format));
+            .Select(x => new EncryptedProperty(x.Property, x.EncryptedAttribute.Format));
     }
 
     internal struct EncryptedProperty
     {
-        public IMutableEntityType EntityType { get; }
-
         public IMutableProperty Property { get; }
 
         public StorageFormat StorageFormat { get; }
 
-        public EncryptedProperty(IMutableEntityType entityType, IMutableProperty property, StorageFormat storageFormat)
+        public EncryptedProperty(IMutableProperty property, StorageFormat storageFormat)
         {
-            EntityType = entityType;
             Property = property;
             StorageFormat = storageFormat;
         }

src/EntityFrameworkCore.DataEncryption/ModelExtensions.cs

@@ -1,5 +1,4 @@
-using Microsoft.EntityFrameworkCore.DataEncryption.Internal.Extensions;
-using System.IO;
+using System.IO;
 using System.Security.Cryptography;
 
 namespace Microsoft.EntityFrameworkCore.DataEncryption.Providers;

src/EntityFrameworkCore.DataEncryption/PropertyBuilderExtensions.cs

@@ -1,6 +1,7 @@
 using Bogus;
 using Microsoft.EntityFrameworkCore.DataEncryption.Providers;
 using Microsoft.EntityFrameworkCore.DataEncryption.Test.Context;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -12,6 +13,26 @@ public class AesProviderTest
 {
     private readonly Faker _faker = new();
 
+    [Fact]
+    public void EncryptNullOrEmptyDataTest()
+    {
+        AesKeyInfo encryptionKeyInfo = AesProvider.GenerateKey(AesKeySize.AES256Bits);
+        var provider = new AesProvider(encryptionKeyInfo.Key, encryptionKeyInfo.IV);
+
+        Assert.Null(provider.Encrypt(null));
+        Assert.Null(provider.Encrypt(Array.Empty<byte>()));
+    }
+
+    [Fact]
+    public void DecryptNullOrEmptyDataTest()
+    {
+        AesKeyInfo encryptionKeyInfo = AesProvider.GenerateKey(AesKeySize.AES256Bits);
+        var provider = new AesProvider(encryptionKeyInfo.Key, encryptionKeyInfo.IV);
+
+        Assert.Null(provider.Decrypt(null));
+        Assert.Null(provider.Decrypt(Array.Empty<byte>()));
+    }
+
     [Theory]
     [InlineData(AesKeySize.AES128Bits)]
     [InlineData(AesKeySize.AES192Bits)]
@@ -31,6 +52,25 @@ public void EncryptDecryptByteArrayTest(AesKeySize keySize)
         Assert.Equal(input, decryptedData);
     }
 
+    [Theory]
+    [InlineData(AesKeySize.AES128Bits)]
+    [InlineData(AesKeySize.AES192Bits)]
+    [InlineData(AesKeySize.AES256Bits)]
+    public void EncryptDecryptByteArrayWithoutIVTest(AesKeySize keySize)
+    {
+        byte[] input = _faker.Random.Bytes(_faker.Random.Int(10, 30));
+        AesKeyInfo encryptionKeyInfo = AesProvider.GenerateKey(keySize);
+        var provider = new AesProvider(encryptionKeyInfo.Key, null);
+
+        byte[] encryptedData = provider.Encrypt(input);
+        Assert.NotNull(encryptedData);
+
+        byte[] decryptedData = provider.Decrypt(encryptedData);
+        Assert.NotNull(decryptedData);
+
+        Assert.Equal(input, decryptedData);
+    }
+
     [Theory]
     [InlineData(AesKeySize.AES128Bits)]
     [InlineData(AesKeySize.AES192Bits)]