huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Retarget key derivation (#14633)

This commit is contained in:
Hao Kung 2019-10-10 13:41:21 -07:00 committed by GitHub
parent 9707c36b5c
commit bcc962a182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
View File

@ -1,13 +1,13 @@
<!-- This file is automatically generated. --> <!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp2.0</TargetFrameworks> <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<Compile Include="Microsoft.AspNetCore.Cryptography.KeyDerivation.netstandard2.0.cs" /> <Compile Include="Microsoft.AspNetCore.Cryptography.KeyDerivation.netstandard2.0.cs" />
<Reference Include="Microsoft.AspNetCore.Cryptography.Internal" /> <Reference Include="Microsoft.AspNetCore.Cryptography.Internal" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'"> <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<Compile Include="Microsoft.AspNetCore.Cryptography.KeyDerivation.netcoreapp.cs" /> <Compile Include="Microsoft.AspNetCore.Cryptography.KeyDerivation.netcoreapp.cs" />
<Reference Include="Microsoft.AspNetCore.Cryptography.Internal" /> <Reference Include="Microsoft.AspNetCore.Cryptography.Internal" />
</ItemGroup> </ItemGroup>

2
src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Description>ASP.NET Core utilities for key derivation.</Description> <Description>ASP.NET Core utilities for key derivation.</Description>
<TargetFrameworks>netstandard2.0;netcoreapp2.0</TargetFrameworks> <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<IsAspNetCoreApp>true</IsAspNetCoreApp> <IsAspNetCoreApp>true</IsAspNetCoreApp>
<IsShippingPackage>true</IsShippingPackage> <IsShippingPackage>true</IsShippingPackage>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

2
src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/NetCorePbkdf2Provider.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if NETCOREAPP2_0 #if NETCOREAPP
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Security.Cryptography; using System.Security.Cryptography;

2
src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs
View File

@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2
{ {
#if NETSTANDARD2_0 #if NETSTANDARD2_0
return new ManagedPbkdf2Provider(); return new ManagedPbkdf2Provider();
#elif NETCOREAPP2_0 #elif NETCOREAPP
// fastest implementation on .NET Core for Linux/macOS. // fastest implementation on .NET Core for Linux/macOS.
// Not supported on .NET Framework // Not supported on .NET Framework
return new NetCorePbkdf2Provider(); return new NetCorePbkdf2Provider();