Migrate to .NET 8

harrison314 · harrison314 · commit 96339a4a3dbe · 2023-11-16T23:32:42.000+01:00
diff --git a/src/samples/SampleWebApiProject/SampleWebApiProject.csproj b/src/samples/SampleWebApiProject/SampleWebApiProject.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="34.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
-    <PackageReference Include="NSwag.AspNetCore" Version="13.14.7" />
+    <PackageReference Include="Bogus" Version="34.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+    <PackageReference Include="NSwag.AspNetCore" Version="14.0.0-preview010" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/samples/SampleWebApiProject/Startup.cs b/src/samples/SampleWebApiProject/Startup.cs
@@ -52,7 +52,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseAuthorization();
 
             app.UseOpenApi();
-            app.UseSwaggerUi3();
+            app.UseSwaggerUi();
 
             app.UseEndpoints(endpoints =>
             {
diff --git a/src/src/Harrison314.EntityFrameworkCore.Encryption.Contrib/Harrison314.EntityFrameworkCore.Encryption.Contrib.csproj b/src/src/Harrison314.EntityFrameworkCore.Encryption.Contrib/Harrison314.EntityFrameworkCore.Encryption.Contrib.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>1.2.0</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>1.3.0</Version>
     <Authors>harrison314</Authors>
     <Product>Harrison314.EntityFrameworkCore.Encryption</Product>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -33,7 +33,7 @@ PKCS#11 Data crypto provider.</Description>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="6.0.0" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/src/Harrison314.EntityFrameworkCore.Encryption/CryptoProviders/PasswordDbContextEncryptedCryptoProvider.cs b/src/src/Harrison314.EntityFrameworkCore.Encryption/CryptoProviders/PasswordDbContextEncryptedCryptoProvider.cs
@@ -50,7 +50,7 @@ public ValueTask<MasterKeyData> EncryptMasterKey(byte[] masterKey, CancellationT
 
             byte[] encryptedKey = new byte[masterKey.Length];
 
-            using AesGcm aes = new AesGcm(key);
+            using AesGcm aes = new AesGcm(key, passwordData.AesGcmTag.Length);
             aes.Encrypt(passwordData.AesGcmNonce, masterKey, encryptedKey, passwordData.AesGcmTag);
 
             MasterKeyData masterKeyData = new MasterKeyData()
@@ -76,15 +76,15 @@ public ValueTask<byte[]> DecryptMasterKey(MasterKeyData masterKeyData, Cancellat
             byte[] key = this.DerieveKey(passwordData);
 
             byte[] decryptedKey = new byte[masterKeyData.Data.Length];
-            using AesGcm aes = new AesGcm(key);
+            using AesGcm aes = new AesGcm(key, passwordData.AesGcmTag.Length);
             aes.Decrypt(passwordData.AesGcmNonce, masterKeyData.Data, passwordData.AesGcmTag, decryptedKey);
 
             return new ValueTask<byte[]>(decryptedKey);
         }
 
         private byte[] DerieveKey(PasswordData passwordData, int keySize = 32)
         {
-            using Rfc2898DeriveBytes pbkdf2 = new Rfc2898DeriveBytes(this.passwordData, passwordData.PasswordSalt, passwordData.Iterations);
+            using Rfc2898DeriveBytes pbkdf2 = new Rfc2898DeriveBytes(this.passwordData, passwordData.PasswordSalt, passwordData.Iterations, HashAlgorithmName.SHA1);
             return pbkdf2.GetBytes(keySize);
         }
 
diff --git a/src/src/Harrison314.EntityFrameworkCore.Encryption/EfEncryptionException.cs b/src/src/Harrison314.EntityFrameworkCore.Encryption/EfEncryptionException.cs
@@ -22,10 +22,5 @@ public EfEncryptionException(string message, Exception innerException)
             : base(message, innerException)
         {
         }
-
-        protected EfEncryptionException(SerializationInfo info, StreamingContext context) 
-            : base(info, context)
-        {
-        }
     }
 }
diff --git a/src/src/Harrison314.EntityFrameworkCore.Encryption/EfEncryptionScopeNotFoundException.cs b/src/src/Harrison314.EntityFrameworkCore.Encryption/EfEncryptionScopeNotFoundException.cs
@@ -21,10 +21,5 @@ public EfEncryptionScopeNotFoundException(string message, Exception innerExcepti
             : base(message, innerException)
         {
         }
-
-        protected EfEncryptionScopeNotFoundException(SerializationInfo info, StreamingContext context) 
-            : base(info, context)
-        {
-        }
     }
 }
diff --git a/src/src/Harrison314.EntityFrameworkCore.Encryption/Harrison314.EntityFrameworkCore.Encryption.csproj b/src/src/Harrison314.EntityFrameworkCore.Encryption/Harrison314.EntityFrameworkCore.Encryption.csproj
@@ -1,9 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Authors>harrison314</Authors>
-    <Copyright>harrison314 (c) 2022</Copyright>
+    <Copyright>harrison314 (c) 2023</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/harrison314/Harrison314.EntityFrameworkCore.Encryption/</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>
@@ -12,19 +12,19 @@
 Work with any database and using standard cryptographic algorithms (AES, HMAC SHA, SP800-108, PBKDF-2,...).</Description>
     <PackageIcon>NugetIcon.png</PackageIcon>
     <Nullable>enable</Nullable>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
     <PackageTags>EF Core, Entity Framework core, Encryption, Database encryption, Transparent Encryption, AES, AEAD</PackageTags>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.0</FileVersion>
+    <AssemblyVersion>1.3.0.0</AssemblyVersion>
+    <FileVersion>1.3.0.0</FileVersion>
     <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="PkcsExtensions" Version="1.2.1" />
+    <PackageReference Include="PkcsExtensions" Version="1.3.0" />
     <PackageReference Include="SecurityCodeScan.VS2019" Version="5.1.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/src/Harrison314.EntityFrameworkCore.Encryption/Internal/PropertyEncryptors/AesGcmDeterministicPropertyEncryptor.cs b/src/src/Harrison314.EntityFrameworkCore.Encryption/Internal/PropertyEncryptors/AesGcmDeterministicPropertyEncryptor.cs
@@ -32,7 +32,7 @@ public AesGcmDeterministicPropertyEncryptor(byte[] key, byte[] masterKey, byte[]
         {
             byte[] reult = new byte[data.Length + TagLen];
 
-            using AesGcm aesgcm = new AesGcm(this.key);
+            using AesGcm aesgcm = new AesGcm(this.key, TagLen);
             aesgcm.Encrypt(this.nonce.AsSpan(),
                 data,
                 reult.AsSpan(TagLen),
@@ -46,7 +46,7 @@ public AesGcmDeterministicPropertyEncryptor(byte[] key, byte[] masterKey, byte[]
         {
             byte[] plaintext = new byte[data.Length - TagLen];
 
-            using AesGcm aesgcm = new AesGcm(this.key);
+            using AesGcm aesgcm = new AesGcm(this.key, TagLen);
 
             try
             {
diff --git a/src/src/Harrison314.EntityFrameworkCore.Encryption/Internal/PropertyEncryptors/AesGcmRandomizedPropertyEncryptor.cs b/src/src/Harrison314.EntityFrameworkCore.Encryption/Internal/PropertyEncryptors/AesGcmRandomizedPropertyEncryptor.cs
@@ -34,7 +34,7 @@ public AesGcmRandomizedPropertyEncryptor(byte[] key)
                 seed,
                 derivedOutput: internalKey);
 
-            using AesGcm aesgcm = new AesGcm(internalKey);
+            using AesGcm aesgcm = new AesGcm(internalKey, TagLen);
 
             aesgcm.Encrypt(reult.AsSpan(SeedLen, NonceLen),
                 data,
@@ -57,7 +57,7 @@ public AesGcmRandomizedPropertyEncryptor(byte[] key)
 
             byte[] plaintext = new byte[data.Length - (SeedLen + NonceLen + TagLen)];
 
-            using AesGcm aesgcm = new AesGcm(internalKey);
+            using AesGcm aesgcm = new AesGcm(internalKey, TagLen);
             try
             {
                 aesgcm.Decrypt(data.AsSpan(SeedLen, NonceLen),
diff --git a/src/test/Harrison314.EntityFrameworkCore.Contrib.Tests/Harrison314.EntityFrameworkCore.Contrib.Tests.csproj b/src/test/Harrison314.EntityFrameworkCore.Contrib.Tests/Harrison314.EntityFrameworkCore.Contrib.Tests.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/test/Harrison314.EntityFrameworkCore.Encryption.Tests/Harrison314.EntityFrameworkCore.Encryption.Tests.csproj b/src/test/Harrison314.EntityFrameworkCore.Encryption.Tests/Harrison314.EntityFrameworkCore.Encryption.Tests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`52`	`52`	`app.UseAuthorization();`
`53`	`53`
`54`	`54`	`app.UseOpenApi();`
`55`		`- app.UseSwaggerUi3();`
	`55`	`+ app.UseSwaggerUi();`
`56`	`56`
`57`	`57`	`app.UseEndpoints(endpoints =>`
`58`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public ValueTask<MasterKeyData> EncryptMasterKey(byte[] masterKey, CancellationT`
`50`	`50`
`51`	`51`	`byte[] encryptedKey = new byte[masterKey.Length];`
`52`	`52`
`53`		`- using AesGcm aes = new AesGcm(key);`
	`53`	`+ using AesGcm aes = new AesGcm(key, passwordData.AesGcmTag.Length);`
`54`	`54`	`aes.Encrypt(passwordData.AesGcmNonce, masterKey, encryptedKey, passwordData.AesGcmTag);`
`55`	`55`
`56`	`56`	`MasterKeyData masterKeyData = new MasterKeyData()`
`@@ -76,15 +76,15 @@ public ValueTask<byte[]> DecryptMasterKey(MasterKeyData masterKeyData, Cancellat`
`76`	`76`	`byte[] key = this.DerieveKey(passwordData);`
`77`	`77`
`78`	`78`	`byte[] decryptedKey = new byte[masterKeyData.Data.Length];`
`79`		`- using AesGcm aes = new AesGcm(key);`
	`79`	`+ using AesGcm aes = new AesGcm(key, passwordData.AesGcmTag.Length);`
`80`	`80`	`aes.Decrypt(passwordData.AesGcmNonce, masterKeyData.Data, passwordData.AesGcmTag, decryptedKey);`
`81`	`81`
`82`	`82`	`return new ValueTask<byte[]>(decryptedKey);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`private byte[] DerieveKey(PasswordData passwordData, int keySize = 32)`
`86`	`86`	`{`
`87`		`- using Rfc2898DeriveBytes pbkdf2 = new Rfc2898DeriveBytes(this.passwordData, passwordData.PasswordSalt, passwordData.Iterations);`
	`87`	`+ using Rfc2898DeriveBytes pbkdf2 = new Rfc2898DeriveBytes(this.passwordData, passwordData.PasswordSalt, passwordData.Iterations, HashAlgorithmName.SHA1);`
`88`	`88`	`return pbkdf2.GetBytes(keySize);`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,5 @@ public EfEncryptionException(string message, Exception innerException)`
`22`	`22`	`: base(message, innerException)`
`23`	`23`	`{`
`24`	`24`	`}`
`25`		`-`
`26`		`- protected EfEncryptionException(SerializationInfo info, StreamingContext context)`
`27`		`- : base(info, context)`
`28`		`- {`
`29`		`- }`
`30`	`25`	`}`
`31`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,5 @@ public EfEncryptionScopeNotFoundException(string message, Exception innerExcepti`
`21`	`21`	`: base(message, innerException)`
`22`	`22`	`{`
`23`	`23`	`}`
`24`		`-`
`25`		`- protected EfEncryptionScopeNotFoundException(SerializationInfo info, StreamingContext context)`
`26`		`- : base(info, context)`
`27`		`- {`
`28`		`- }`
`29`	`24`	`}`
`30`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public AesGcmDeterministicPropertyEncryptor(byte[] key, byte[] masterKey, byte[]`
`32`	`32`	`{`
`33`	`33`	`byte[] reult = new byte[data.Length + TagLen];`
`34`	`34`
`35`		`- using AesGcm aesgcm = new AesGcm(this.key);`
	`35`	`+ using AesGcm aesgcm = new AesGcm(this.key, TagLen);`
`36`	`36`	`aesgcm.Encrypt(this.nonce.AsSpan(),`
`37`	`37`	`data,`
`38`	`38`	`reult.AsSpan(TagLen),`
`@@ -46,7 +46,7 @@ public AesGcmDeterministicPropertyEncryptor(byte[] key, byte[] masterKey, byte[]`
`46`	`46`	`{`
`47`	`47`	`byte[] plaintext = new byte[data.Length - TagLen];`
`48`	`48`
`49`		`- using AesGcm aesgcm = new AesGcm(this.key);`
	`49`	`+ using AesGcm aesgcm = new AesGcm(this.key, TagLen);`
`50`	`50`
`51`	`51`	`try`
`52`	`52`	`{`