Restore previous TFMs.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

Directory.Packages.props

@@ -9,6 +9,7 @@
     <PackageVersion Include="Dapper.StrongName" Version="2.1.35" />
     <PackageVersion Include="IndexRange" Version="1.0.3" />
     <PackageVersion Include="log4net" Version="2.0.17" />
+    <PackageVersion Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.16" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />

src/MySqlConnector.Authentication.Ed25519/CompatibilitySuppressions.xml

@@ -5,8 +5,4 @@
     <DiagnosticId>PKV006</DiagnosticId>
     <Target>.NETFramework,Version=v4.5</Target>
   </Suppression>
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>.NETStandard,Version=v2.0</Target>
-  </Suppression>
 </Suppressions>

src/MySqlConnector.Authentication.Ed25519/MySqlConnector.Authentication.Ed25519.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net462;net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
     <Title>MySqlConnector Ed25519 Authentication Plugin</Title>
     <Description>Implements the client_ed25519 and parsec authentication plugins for MariaDB.</Description>
     <Copyright>Copyright 2019–2024 Bradley Grainger</Copyright>
@@ -15,6 +15,10 @@
     <ProjectReference Include="..\MySqlConnector\MySqlConnector.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <Compile Remove="Chaos.NaCl\CryptoBytes.cs" />
   </ItemGroup>

src/MySqlConnector.Authentication.Ed25519/ParsecAuthenticationPlugin.cs

@@ -66,9 +66,13 @@ public void CreateResponseAndPasswordHash(string password, ReadOnlySpan<byte> au
 		byte[] privateKeySeed;
 #if NET6_0_OR_GREATER
 		privateKeySeed = Rfc2898DeriveBytes.Pbkdf2(Encoding.UTF8.GetBytes(password), salt, iterationCount, HashAlgorithmName.SHA512, 32);
-#else
+#elif NET472_OR_GREATER || NETSTANDARD2_1_OR_GREATER
 		using (var pbkdf2 = new Rfc2898DeriveBytes(Encoding.UTF8.GetBytes(password), salt.ToArray(), iterationCount, HashAlgorithmName.SHA512))
 			privateKeySeed = pbkdf2.GetBytes(32);
+#else
+		privateKeySeed = Microsoft.AspNetCore.Cryptography.KeyDerivation.KeyDerivation.Pbkdf2(
+			password, salt.ToArray(), Microsoft.AspNetCore.Cryptography.KeyDerivation.KeyDerivationPrf.HMACSHA512,
+			iterationCount, numBytesRequested: 32);
 #endif
 		Chaos.NaCl.Ed25519.KeyPairFromSeed(out var publicKey, out var privateKey, privateKeySeed);
 

tests/IntegrationTests/IntegrationTests.csproj

@@ -53,11 +53,8 @@
 
   <ItemGroup Condition=" '$(Configuration)' != 'MySqlData' ">
     <ProjectReference Include="..\..\src\MySqlConnector\MySqlConnector.csproj" />
-    <Using Include="MySqlConnector" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(Configuration)' != 'MySqlData' and ($([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net472')) or $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0')))">
     <ProjectReference Include="..\..\src\MySqlConnector.Authentication.Ed25519\MySqlConnector.Authentication.Ed25519.csproj" />
+    <Using Include="MySqlConnector" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(Configuration)' == 'MySqlData' ">