Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 1562a74

Browse files
committed
Make Linux/libcrypto/Interop.HMAC.cs shared between FreeBSD and Linux
This change moves the current Linux libcrypto/Interop.HMAC.cs to the common Unix folder and updates the System.Security.Cryptography.Hashing.Algorithms assembly to reference the new position for both FreeBSD and Linux builds.
1 parent f1d6d81 commit 1562a74

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

src/System.Security.Cryptography.Hashing.Algorithms/System.Security.Cryptography.Hashing.Algorithms.sln

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
13+
FreeBSD_Debug|Any CPU = FreeBSD_Debug|Any CPU
14+
FreeBSD_Release|Any CPU = FreeBSD_Release|Any CPU
1315
Linux_Debug|Any CPU = Linux_Debug|Any CPU
1416
Linux_Release|Any CPU = Linux_Release|Any CPU
1517
OSX_Debug|Any CPU = OSX_Debug|Any CPU
@@ -21,6 +23,10 @@ Global
2123
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2224
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
2325
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
26+
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.FreeBSD_Debug|Any CPU.ActiveCfg = FreeBSD_Debug|Any CPU
27+
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.FreeBSD_Debug|Any CPU.Build.0 = FreeBSD_Debug|Any CPU
28+
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.FreeBSD_Release|Any CPU.ActiveCfg = FreeBSD_Release|Any CPU
29+
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.FreeBSD_Release|Any CPU.Build.0 = FreeBSD_Release|Any CPU
2430
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU
2531
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU
2632
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU
@@ -37,6 +43,10 @@ Global
3743
{ACECDE06-FFFD-4E14-B651-11C189CBF4B8}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
3844
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3945
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.FreeBSD_Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.FreeBSD_Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.FreeBSD_Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.FreeBSD_Release|Any CPU.Build.0 = Release|Any CPU
4050
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU
4151
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU
4252
{F94007FF-0FBC-4817-B5F6-C8C8F1550AC6}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU

src/System.Security.Cryptography.Hashing.Algorithms/src/System.Security.Cryptography.Hashing.Algorithms.csproj

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1212
<CLSCompliant>false</CLSCompliant>
1313
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU' " />
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FreeBSD_Release|AnyCPU' " />
1416
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux_Debug|AnyCPU' " />
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux_Release|AnyCPU' " />
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'OSX_Debug|AnyCPU' " />
@@ -59,9 +61,14 @@
5961
<Link>Common\Microsoft\Win32\SafeHandles\SafeEvpMdCtxHandle.Unix.cs</Link>
6062
</Compile>
6163
</ItemGroup>
64+
<ItemGroup Condition=" '$(TargetsFreeBSD)' == 'true' ">
65+
<Compile Include="$(CommonPath)\Interop\Unix\libcrypto\Interop.HMAC.cs">
66+
<Link>Common\Interop\Unix\libcrypto\Interop.HMAC.cs</Link>
67+
</Compile>
68+
</ItemGroup>
6269
<ItemGroup Condition=" '$(TargetsLinux)' == 'true' ">
63-
<Compile Include="$(CommonPath)\Interop\Linux\libcrypto\Interop.HMAC.cs">
64-
<Link>Common\Interop\Linux\libcrypto\Interop.HMAC.cs</Link>
70+
<Compile Include="$(CommonPath)\Interop\Unix\libcrypto\Interop.HMAC.cs">
71+
<Link>Common\Interop\Unix\libcrypto\Interop.HMAC.cs</Link>
6572
</Compile>
6673
</ItemGroup>
6774
<ItemGroup Condition=" '$(TargetsOSX)' == 'true' ">

0 commit comments

Comments
 (0)