Windows CNG virtualization-based security#102495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krwq merged 2 commits into from
Jul 17, 2024
Merged

Windows CNG virtualization-based security #102495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acb9b32
Windows CNG virtualization-based security
krwq May 21, 2024
2ab4ca8
Add missing change in Microsoft.Bcl.Cryptography.Tests
krwq Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/Net/Configuration.Certificates.Dynamic.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using Test.Cryptography;

namespace System.Net.Test.Common
{
Expand Down
1 change: 0 additions & 1 deletion src/libraries/Common/tests/System/Net/Configuration.Certificates.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using Test.Cryptography;
using Xunit;

namespace System.Net.Test.Common
Expand Down
75 changes: 75 additions & 0 deletions src/libraries/Common/tests/System/Security/Cryptography/CngKeyWrapper.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using Xunit;
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;

namespace Test.Cryptography
{
internal sealed class CngKeyWrapper : IDisposable
{
private CngKeyWrapper(
CngAlgorithm algorithm,
CngKeyCreationParameters cngCreationParameters,
string? keySuffix = null,
[CallerMemberName] string? testName = null)
{
Key = CngKey.Create(algorithm, $"{testName}{algorithm.Algorithm}{keySuffix}", cngCreationParameters);
}

public static CngKeyWrapper CreateMicrosoftPlatformCryptoProvider(
CngAlgorithm algorithm,
string? keySuffix = null,
[CallerMemberName] string? testName = null,
CngKeyCreationOptions creationOption = CngKeyCreationOptions.None,
params CngProperty[] additionalParameters)
{
const string MicrosoftPlatformCryptoProvider = "Microsoft Platform Crypto Provider";

#if NETFRAMEWORK
CngProvider cngProvider = new(MicrosoftPlatformCryptoProvider);
#else
Assert.Equal(MicrosoftPlatformCryptoProvider, CngProvider.MicrosoftPlatformCryptoProvider.Provider);
CngProvider cngProvider = CngProvider.MicrosoftPlatformCryptoProvider;
#endif
CngKeyCreationParameters cngCreationParameters = new()
{
Provider = cngProvider,
KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
};

foreach (CngProperty parameter in additionalParameters)
{
cngCreationParameters.Parameters.Add(parameter);
}

return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
}

public static CngKeyWrapper CreateMicrosoftSoftwareKeyStorageProvider(
CngAlgorithm algorithm,
CngKeyCreationOptions creationOption,
string? keySuffix = null,
[CallerMemberName] string? testName = null)
{
CngKeyCreationParameters cngCreationParameters = new()
{
Provider = CngProvider.MicrosoftSoftwareKeyStorageProvider,
KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
};

return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
}

public CngKey Key { get; }

public void Dispose()
{
Key.Delete();
}
}
}
39 changes: 0 additions & 39 deletions src/libraries/Common/tests/System/Security/Cryptography/CngPlatformProviderKey.cs
View file
Open in desktop

This file was deleted.

48 changes: 34 additions & 14 deletions src/libraries/Common/tests/System/Security/Cryptography/PlatformSupport.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,47 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
return false;
}
#endif

CngKey key = null;

try
{
key = CngKey.Create(
using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
algorithm,
$"{nameof(PlatformCryptoProviderFunctional)}{algorithm.Algorithm}Key",
new CngKeyCreationParameters
{
Provider = new CngProvider("Microsoft Platform Crypto Provider"),
KeyCreationOptions = CngKeyCreationOptions.OverwriteExistingKey,
});
keySuffix: $"{algorithm.Algorithm}Key");

return true;
}
catch (CryptographicException)
{
return false;
}
finally
{
key?.Delete();
}
}
}

private static bool CheckIfVbsAvailable()
{
#if !NETFRAMEWORK
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return false;
}
#endif

try
{
const CngKeyCreationOptions RequireVbs = (CngKeyCreationOptions)0x00020000;
#if !NETFRAMEWORK
Assert.Equal(CngKeyCreationOptions.RequireVbs, RequireVbs);
#endif

using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftSoftwareKeyStorageProvider(
CngAlgorithm.ECDsaP256,
RequireVbs,
keySuffix: $"{CngAlgorithm.ECDsaP256.Algorithm}Key");

return true;
}
catch (CryptographicException)
{
return false;
}
}

Expand All@@ -83,5 +100,8 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
internal static bool PlatformCryptoProviderFunctionalP256 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP256);
internal static bool PlatformCryptoProviderFunctionalP384 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP384);
internal static bool PlatformCryptoProviderFunctionalRsa => PlatformCryptoProviderFunctional(CngAlgorithm.Rsa);

private static bool? s_isVbsAvailable;
internal static bool IsVbsAvailable => s_isVbsAvailable ??= CheckIfVbsAvailable();
}
}
2 changes: 2 additions & 0 deletions src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs"
Link="CommonTest\System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.Functional.cs"
Expand Down
1 change: 0 additions & 1 deletion ...s/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
<Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs" Link="Common\System\Net\Http\LoopbackServer.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs" Link="Common\System\Net\Http\TestHelper.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions ...nHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,8 +133,6 @@
Link="Common\System\Net\Http\SyncBlockingContent.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\ThrowingContent.cs"
Link="Common\System\Net\Http\ThrowingContent.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
<Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs"
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,6 @@
Link="Common\System\IO\DelegatingStream.cs" />
<Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs"
Link="Common\System\Net\RemoteServerQuery.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs"
Link="Common\System\Net\Configuration.Certificates.cs" />
<Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.Dynamic.cs"
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
<Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
<Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs" Link="Common\System\Net\Configuration.Sockets.cs" />
<Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs" Link="Common\System\Net\RemoteExecutorExtensions.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@
Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
Link="Common\System\Net\Http\TestHelper.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
</ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,6 @@
Link="Common\System\Net\EventSourceTestLogging.cs" />
<Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs"
Link="Common\System\Net\RemoteExecutorExtensions.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs"
Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs"
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,6 @@
Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
Link="Common\System\Net\Http\TestHelper.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@
<Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs" Link="Common\System\Net\Http\HuffmanEncoder.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs" Link="Common\System\Net\Http\HPackEncoder.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
<Compile Include="AbortTest.cs" />
<Compile Include="AbortTest.Loopback.cs" />
Expand Down
2 changes: 0 additions & 2 deletions ...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@
Link="Common\System\Net\Http\LoopbackServer.cs" />
<Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs"
Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
<Compile Include="..\ClientWebSocketTestBase.cs" />
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Security.Cryptography.Cng/tests/ECDiffieHellmanCngTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -193,8 +193,8 @@ public static void HashAlgorithm_SupportsOtherECDHImplementations()
[OuterLoop("Hardware backed key generation takes several seconds.")]
public static void PlatformCryptoProvider_DeriveKeyMaterial()
{
using (CngPlatformProviderKey platformKey1 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key1"))
using (CngPlatformProviderKey platformKey2 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key2"))
using (CngKeyWrapper platformKey1 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key1"))
using (CngKeyWrapper platformKey2 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key2"))
using (ECDiffieHellmanCng ecdhCng1 = new ECDiffieHellmanCng(platformKey1.Key))
using (ECDiffieHellmanCng ecdhCng2 = new ECDiffieHellmanCng(platformKey2.Key))
{
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Security.Cryptography.Cng/tests/PropertyTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P256(string algorith
{
CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
{
Assert.Equal(256, platformKey.Key.KeySize);
}
Expand All@@ -31,7 +31,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
{
CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
{
Assert.Equal(384, platformKey.Key.KeySize);
}
Expand All@@ -44,7 +44,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
public static void CreatePersisted_PlatformRsaKeyHasKeySize(int keySize)
{
CngProperty keyLengthProperty = new CngProperty("Length", BitConverter.GetBytes(keySize), CngPropertyOptions.None);
CngPlatformProviderKey platformKey = new CngPlatformProviderKey(
CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
CngAlgorithm.Rsa,
keySuffix: keySize.ToString(),
additionalParameters: keyLengthProperty);
Expand Down
4 changes: 2 additions & 2 deletions ...ries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,8 @@
Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\CngPlatformProviderKey.cs"
Link="CommonTest\System\Security\Cryptography\CngPlatformProviderKey.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
Link="CommonTest\System\Security\Cryptography\CngKeyWrapper.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs"
Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Expand Down
2 changes: 2 additions & 0 deletions ...ries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs"
Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
Expand Down
2 changes: 2 additions & 0 deletions ...tem.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@
Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs"
Expand Down
2 changes: 2 additions & 0 deletions ...es/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
<Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
<Compile Include="Certificates.cs" />
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Windows CNG virtualization-based security#102495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

krwq
merged 2 commits into

from

Jul 17, 2024
 Merged


Windows CNG virtualization-based security
#102495
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
acb9b32

Windows CNG virtualization-based security


krwq May 21, 2024
2ab4ca8

Add missing change in Microsoft.Bcl.Cryptography.Tests


krwq Jul 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.Dynamic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using Test.Cryptography;

namespace System.Net.Test.Common
{
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using Test.Cryptography;
using Xunit;

namespace System.Net.Test.Common
Expand Down

75 changes: 75 additions & 0 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngKeyWrapper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using Xunit;
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;

namespace Test.Cryptography
{
 internal sealed class CngKeyWrapper : IDisposable
 {
 private CngKeyWrapper(
 CngAlgorithm algorithm,
 CngKeyCreationParameters cngCreationParameters,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 Key = CngKey.Create(algorithm, $"{testName}{algorithm.Algorithm}{keySuffix}", cngCreationParameters);
 }

 public static CngKeyWrapper CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm algorithm,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null,
 CngKeyCreationOptions creationOption = CngKeyCreationOptions.None,
 params CngProperty[] additionalParameters)
 {
 const string MicrosoftPlatformCryptoProvider = "Microsoft Platform Crypto Provider";

#if NETFRAMEWORK
 CngProvider cngProvider = new(MicrosoftPlatformCryptoProvider);
#else
 Assert.Equal(MicrosoftPlatformCryptoProvider, CngProvider.MicrosoftPlatformCryptoProvider.Provider);
 CngProvider cngProvider = CngProvider.MicrosoftPlatformCryptoProvider;
#endif
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = cngProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 foreach (CngProperty parameter in additionalParameters)
 {
 cngCreationParameters.Parameters.Add(parameter);
 }

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public static CngKeyWrapper CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm algorithm,
 CngKeyCreationOptions creationOption,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = CngProvider.MicrosoftSoftwareKeyStorageProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public CngKey Key { get; }

 public void Dispose()
 {
 Key.Delete();
 }
 }
}

39 changes: 0 additions & 39 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngPlatformProviderKey.cs

View file


Open in desktop


This file was deleted.


48 changes: 34 additions & 14 deletions
src/libraries/Common/tests/System/Security/Cryptography/PlatformSupport.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,47 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 return false;
 }
#endif

 CngKey key = null;

 try
 {
 key = CngKey.Create(
using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 algorithm,
 $"{nameof(PlatformCryptoProviderFunctional)}{algorithm.Algorithm}Key",
 new CngKeyCreationParameters
 {
 Provider = new CngProvider("Microsoft Platform Crypto Provider"),
 KeyCreationOptions = CngKeyCreationOptions.OverwriteExistingKey,
 });
 keySuffix: $"{algorithm.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 finally
 {
 key?.Delete();
 }
 }
 }

 private static bool CheckIfVbsAvailable()
 {
#if !NETFRAMEWORK
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
 return false;
 }
#endif

 try
 {
 const CngKeyCreationOptions RequireVbs = (CngKeyCreationOptions)0x00020000;
#if !NETFRAMEWORK
 Assert.Equal(CngKeyCreationOptions.RequireVbs, RequireVbs);
#endif

 using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm.ECDsaP256,
 RequireVbs,
 keySuffix: $"{CngAlgorithm.ECDsaP256.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 }

Expand All@@ -83,5 +100,8 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 internal static bool PlatformCryptoProviderFunctionalP256 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP256);
 internal static bool PlatformCryptoProviderFunctionalP384 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP384);
 internal static bool PlatformCryptoProviderFunctionalRsa => PlatformCryptoProviderFunctional(CngAlgorithm.Rsa);

 private static bool? s_isVbsAvailable;
 internal static bool IsVbsAvailable => s_isVbsAvailable ??= CheckIfVbsAvailable();
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs"
 Link="CommonTest\System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.Functional.cs"
Expand Down

1 change: 0 additions & 1 deletion
...s/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs" Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs" Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>

Expand Down

2 changes: 0 additions & 2 deletions
...nHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,8 +133,6 @@
 Link="Common\System\Net\Http\SyncBlockingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\ThrowingContent.cs"
 Link="Common\System\Net\Http\ThrowingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,6 @@
 Link="Common\System\IO\DelegatingStream.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs"
 Link="Common\System\Net\RemoteServerQuery.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs"
 Link="Common\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.Dynamic.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs" Link="Common\System\Net\Configuration.Sockets.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs" Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,6 @@
 Link="Common\System\Net\EventSourceTestLogging.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs"
 Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs"
 Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs" Link="Common\System\Net\Http\HuffmanEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs" Link="Common\System\Net\Http\HPackEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="AbortTest.cs" />
 <Compile Include="AbortTest.Loopback.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@
 Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs"
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\ClientWebSocketTestBase.cs" />
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Security.Cryptography.Cng/tests/ECDiffieHellmanCngTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,8 +193,8 @@ public static void HashAlgorithm_SupportsOtherECDHImplementations()
 [OuterLoop("Hardware backed key generation takes several seconds.")]
 public static void PlatformCryptoProvider_DeriveKeyMaterial()
 {
 using (CngPlatformProviderKey platformKey1 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngPlatformProviderKey platformKey2 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (CngKeyWrapper platformKey1 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngKeyWrapper platformKey2 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (ECDiffieHellmanCng ecdhCng1 = new ECDiffieHellmanCng(platformKey1.Key))
 using (ECDiffieHellmanCng ecdhCng2 = new ECDiffieHellmanCng(platformKey2.Key))
 {
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Security.Cryptography.Cng/tests/PropertyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P256(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(256, platformKey.Key.KeySize);
 }
Expand All@@ -31,7 +31,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(384, platformKey.Key.KeySize);
 }
Expand All@@ -44,7 +44,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 public static void CreatePersisted_PlatformRsaKeyHasKeySize(int keySize)
 {
 CngProperty keyLengthProperty = new CngProperty("Length", BitConverter.GetBytes(keySize), CngPropertyOptions.None);
CngPlatformProviderKey platformKey = new CngPlatformProviderKey(
CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm.Rsa,
 keySuffix: keySize.ToString(),
 additionalParameters: keyLengthProperty);
Expand Down

4 changes: 2 additions & 2 deletions
...ries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,8 @@
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngPlatformProviderKey.cs"
 Link="CommonTest\System\Security\Cryptography\CngPlatformProviderKey.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="CommonTest\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs"
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...ries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs"
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...tem.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...es/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="Certificates.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Windows CNG virtualization-based security#102495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

krwq
merged 2 commits into

from

Jul 17, 2024
 Merged


Windows CNG virtualization-based security
#102495
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
acb9b32

Windows CNG virtualization-based security


krwq May 21, 2024
2ab4ca8

Add missing change in Microsoft.Bcl.Cryptography.Tests


krwq Jul 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.Dynamic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using Test.Cryptography;

namespace System.Net.Test.Common
{
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using Test.Cryptography;
using Xunit;

namespace System.Net.Test.Common
Expand Down

75 changes: 75 additions & 0 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngKeyWrapper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using Xunit;
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;

namespace Test.Cryptography
{
 internal sealed class CngKeyWrapper : IDisposable
 {
 private CngKeyWrapper(
 CngAlgorithm algorithm,
 CngKeyCreationParameters cngCreationParameters,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 Key = CngKey.Create(algorithm, $"{testName}{algorithm.Algorithm}{keySuffix}", cngCreationParameters);
 }

 public static CngKeyWrapper CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm algorithm,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null,
 CngKeyCreationOptions creationOption = CngKeyCreationOptions.None,
 params CngProperty[] additionalParameters)
 {
 const string MicrosoftPlatformCryptoProvider = "Microsoft Platform Crypto Provider";

#if NETFRAMEWORK
 CngProvider cngProvider = new(MicrosoftPlatformCryptoProvider);
#else
 Assert.Equal(MicrosoftPlatformCryptoProvider, CngProvider.MicrosoftPlatformCryptoProvider.Provider);
 CngProvider cngProvider = CngProvider.MicrosoftPlatformCryptoProvider;
#endif
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = cngProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 foreach (CngProperty parameter in additionalParameters)
 {
 cngCreationParameters.Parameters.Add(parameter);
 }

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public static CngKeyWrapper CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm algorithm,
 CngKeyCreationOptions creationOption,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = CngProvider.MicrosoftSoftwareKeyStorageProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public CngKey Key { get; }

 public void Dispose()
 {
 Key.Delete();
 }
 }
}

39 changes: 0 additions & 39 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngPlatformProviderKey.cs

View file


Open in desktop


This file was deleted.


48 changes: 34 additions & 14 deletions
src/libraries/Common/tests/System/Security/Cryptography/PlatformSupport.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,47 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 return false;
 }
#endif

 CngKey key = null;

 try
 {
 key = CngKey.Create(
using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 algorithm,
 $"{nameof(PlatformCryptoProviderFunctional)}{algorithm.Algorithm}Key",
 new CngKeyCreationParameters
 {
 Provider = new CngProvider("Microsoft Platform Crypto Provider"),
 KeyCreationOptions = CngKeyCreationOptions.OverwriteExistingKey,
 });
 keySuffix: $"{algorithm.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 finally
 {
 key?.Delete();
 }
 }
 }

 private static bool CheckIfVbsAvailable()
 {
#if !NETFRAMEWORK
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
 return false;
 }
#endif

 try
 {
 const CngKeyCreationOptions RequireVbs = (CngKeyCreationOptions)0x00020000;
#if !NETFRAMEWORK
 Assert.Equal(CngKeyCreationOptions.RequireVbs, RequireVbs);
#endif

 using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm.ECDsaP256,
 RequireVbs,
 keySuffix: $"{CngAlgorithm.ECDsaP256.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 }

Expand All@@ -83,5 +100,8 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 internal static bool PlatformCryptoProviderFunctionalP256 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP256);
 internal static bool PlatformCryptoProviderFunctionalP384 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP384);
 internal static bool PlatformCryptoProviderFunctionalRsa => PlatformCryptoProviderFunctional(CngAlgorithm.Rsa);

 private static bool? s_isVbsAvailable;
 internal static bool IsVbsAvailable => s_isVbsAvailable ??= CheckIfVbsAvailable();
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs"
 Link="CommonTest\System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.Functional.cs"
Expand Down

1 change: 0 additions & 1 deletion
...s/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs" Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs" Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>

Expand Down

2 changes: 0 additions & 2 deletions
...nHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,8 +133,6 @@
 Link="Common\System\Net\Http\SyncBlockingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\ThrowingContent.cs"
 Link="Common\System\Net\Http\ThrowingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,6 @@
 Link="Common\System\IO\DelegatingStream.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs"
 Link="Common\System\Net\RemoteServerQuery.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs"
 Link="Common\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.Dynamic.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs" Link="Common\System\Net\Configuration.Sockets.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs" Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,6 @@
 Link="Common\System\Net\EventSourceTestLogging.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs"
 Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs"
 Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs" Link="Common\System\Net\Http\HuffmanEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs" Link="Common\System\Net\Http\HPackEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="AbortTest.cs" />
 <Compile Include="AbortTest.Loopback.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@
 Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs"
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\ClientWebSocketTestBase.cs" />
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Security.Cryptography.Cng/tests/ECDiffieHellmanCngTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,8 +193,8 @@ public static void HashAlgorithm_SupportsOtherECDHImplementations()
 [OuterLoop("Hardware backed key generation takes several seconds.")]
 public static void PlatformCryptoProvider_DeriveKeyMaterial()
 {
 using (CngPlatformProviderKey platformKey1 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngPlatformProviderKey platformKey2 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (CngKeyWrapper platformKey1 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngKeyWrapper platformKey2 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (ECDiffieHellmanCng ecdhCng1 = new ECDiffieHellmanCng(platformKey1.Key))
 using (ECDiffieHellmanCng ecdhCng2 = new ECDiffieHellmanCng(platformKey2.Key))
 {
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Security.Cryptography.Cng/tests/PropertyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P256(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(256, platformKey.Key.KeySize);
 }
Expand All@@ -31,7 +31,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(384, platformKey.Key.KeySize);
 }
Expand All@@ -44,7 +44,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 public static void CreatePersisted_PlatformRsaKeyHasKeySize(int keySize)
 {
 CngProperty keyLengthProperty = new CngProperty("Length", BitConverter.GetBytes(keySize), CngPropertyOptions.None);
CngPlatformProviderKey platformKey = new CngPlatformProviderKey(
CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm.Rsa,
 keySuffix: keySize.ToString(),
 additionalParameters: keyLengthProperty);
Expand Down

4 changes: 2 additions & 2 deletions
...ries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,8 @@
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngPlatformProviderKey.cs"
 Link="CommonTest\System\Security\Cryptography\CngPlatformProviderKey.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="CommonTest\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs"
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...ries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs"
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...tem.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...es/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="Certificates.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Windows CNG virtualization-based security#102495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

krwq
merged 2 commits into

from

Jul 17, 2024
 Merged


Windows CNG virtualization-based security
#102495
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
acb9b32

Windows CNG virtualization-based security


krwq May 21, 2024
2ab4ca8

Add missing change in Microsoft.Bcl.Cryptography.Tests


krwq Jul 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.Dynamic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using Test.Cryptography;

namespace System.Net.Test.Common
{
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using Test.Cryptography;
using Xunit;

namespace System.Net.Test.Common
Expand Down

75 changes: 75 additions & 0 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngKeyWrapper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using Xunit;
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;

namespace Test.Cryptography
{
 internal sealed class CngKeyWrapper : IDisposable
 {
 private CngKeyWrapper(
 CngAlgorithm algorithm,
 CngKeyCreationParameters cngCreationParameters,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 Key = CngKey.Create(algorithm, $"{testName}{algorithm.Algorithm}{keySuffix}", cngCreationParameters);
 }

 public static CngKeyWrapper CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm algorithm,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null,
 CngKeyCreationOptions creationOption = CngKeyCreationOptions.None,
 params CngProperty[] additionalParameters)
 {
 const string MicrosoftPlatformCryptoProvider = "Microsoft Platform Crypto Provider";

#if NETFRAMEWORK
 CngProvider cngProvider = new(MicrosoftPlatformCryptoProvider);
#else
 Assert.Equal(MicrosoftPlatformCryptoProvider, CngProvider.MicrosoftPlatformCryptoProvider.Provider);
 CngProvider cngProvider = CngProvider.MicrosoftPlatformCryptoProvider;
#endif
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = cngProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 foreach (CngProperty parameter in additionalParameters)
 {
 cngCreationParameters.Parameters.Add(parameter);
 }

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public static CngKeyWrapper CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm algorithm,
 CngKeyCreationOptions creationOption,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = CngProvider.MicrosoftSoftwareKeyStorageProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public CngKey Key { get; }

 public void Dispose()
 {
 Key.Delete();
 }
 }
}

39 changes: 0 additions & 39 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngPlatformProviderKey.cs

View file


Open in desktop


This file was deleted.


48 changes: 34 additions & 14 deletions
src/libraries/Common/tests/System/Security/Cryptography/PlatformSupport.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,47 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 return false;
 }
#endif

 CngKey key = null;

 try
 {
 key = CngKey.Create(
using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 algorithm,
 $"{nameof(PlatformCryptoProviderFunctional)}{algorithm.Algorithm}Key",
 new CngKeyCreationParameters
 {
 Provider = new CngProvider("Microsoft Platform Crypto Provider"),
 KeyCreationOptions = CngKeyCreationOptions.OverwriteExistingKey,
 });
 keySuffix: $"{algorithm.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 finally
 {
 key?.Delete();
 }
 }
 }

 private static bool CheckIfVbsAvailable()
 {
#if !NETFRAMEWORK
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
 return false;
 }
#endif

 try
 {
 const CngKeyCreationOptions RequireVbs = (CngKeyCreationOptions)0x00020000;
#if !NETFRAMEWORK
 Assert.Equal(CngKeyCreationOptions.RequireVbs, RequireVbs);
#endif

 using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm.ECDsaP256,
 RequireVbs,
 keySuffix: $"{CngAlgorithm.ECDsaP256.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 }

Expand All@@ -83,5 +100,8 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 internal static bool PlatformCryptoProviderFunctionalP256 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP256);
 internal static bool PlatformCryptoProviderFunctionalP384 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP384);
 internal static bool PlatformCryptoProviderFunctionalRsa => PlatformCryptoProviderFunctional(CngAlgorithm.Rsa);

 private static bool? s_isVbsAvailable;
 internal static bool IsVbsAvailable => s_isVbsAvailable ??= CheckIfVbsAvailable();
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs"
 Link="CommonTest\System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.Functional.cs"
Expand Down

1 change: 0 additions & 1 deletion
...s/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs" Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs" Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>

Expand Down

2 changes: 0 additions & 2 deletions
...nHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,8 +133,6 @@
 Link="Common\System\Net\Http\SyncBlockingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\ThrowingContent.cs"
 Link="Common\System\Net\Http\ThrowingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,6 @@
 Link="Common\System\IO\DelegatingStream.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs"
 Link="Common\System\Net\RemoteServerQuery.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs"
 Link="Common\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.Dynamic.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs" Link="Common\System\Net\Configuration.Sockets.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs" Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,6 @@
 Link="Common\System\Net\EventSourceTestLogging.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs"
 Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs"
 Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs" Link="Common\System\Net\Http\HuffmanEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs" Link="Common\System\Net\Http\HPackEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="AbortTest.cs" />
 <Compile Include="AbortTest.Loopback.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@
 Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs"
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\ClientWebSocketTestBase.cs" />
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Security.Cryptography.Cng/tests/ECDiffieHellmanCngTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,8 +193,8 @@ public static void HashAlgorithm_SupportsOtherECDHImplementations()
 [OuterLoop("Hardware backed key generation takes several seconds.")]
 public static void PlatformCryptoProvider_DeriveKeyMaterial()
 {
 using (CngPlatformProviderKey platformKey1 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngPlatformProviderKey platformKey2 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (CngKeyWrapper platformKey1 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngKeyWrapper platformKey2 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (ECDiffieHellmanCng ecdhCng1 = new ECDiffieHellmanCng(platformKey1.Key))
 using (ECDiffieHellmanCng ecdhCng2 = new ECDiffieHellmanCng(platformKey2.Key))
 {
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Security.Cryptography.Cng/tests/PropertyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P256(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(256, platformKey.Key.KeySize);
 }
Expand All@@ -31,7 +31,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(384, platformKey.Key.KeySize);
 }
Expand All@@ -44,7 +44,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 public static void CreatePersisted_PlatformRsaKeyHasKeySize(int keySize)
 {
 CngProperty keyLengthProperty = new CngProperty("Length", BitConverter.GetBytes(keySize), CngPropertyOptions.None);
CngPlatformProviderKey platformKey = new CngPlatformProviderKey(
CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm.Rsa,
 keySuffix: keySize.ToString(),
 additionalParameters: keyLengthProperty);
Expand Down

4 changes: 2 additions & 2 deletions
...ries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,8 @@
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngPlatformProviderKey.cs"
 Link="CommonTest\System\Security\Cryptography\CngPlatformProviderKey.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="CommonTest\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs"
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...ries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs"
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...tem.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...es/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="Certificates.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Windows CNG virtualization-based security#102495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

krwq
merged 2 commits into

from

Jul 17, 2024
 Merged


Windows CNG virtualization-based security
#102495
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
acb9b32

Windows CNG virtualization-based security


krwq May 21, 2024
2ab4ca8

Add missing change in Microsoft.Bcl.Cryptography.Tests


krwq Jul 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.Dynamic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using Test.Cryptography;

namespace System.Net.Test.Common
{
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using Test.Cryptography;
using Xunit;

namespace System.Net.Test.Common
Expand Down

75 changes: 75 additions & 0 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngKeyWrapper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using Xunit;
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;

namespace Test.Cryptography
{
 internal sealed class CngKeyWrapper : IDisposable
 {
 private CngKeyWrapper(
 CngAlgorithm algorithm,
 CngKeyCreationParameters cngCreationParameters,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 Key = CngKey.Create(algorithm, $"{testName}{algorithm.Algorithm}{keySuffix}", cngCreationParameters);
 }

 public static CngKeyWrapper CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm algorithm,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null,
 CngKeyCreationOptions creationOption = CngKeyCreationOptions.None,
 params CngProperty[] additionalParameters)
 {
 const string MicrosoftPlatformCryptoProvider = "Microsoft Platform Crypto Provider";

#if NETFRAMEWORK
 CngProvider cngProvider = new(MicrosoftPlatformCryptoProvider);
#else
 Assert.Equal(MicrosoftPlatformCryptoProvider, CngProvider.MicrosoftPlatformCryptoProvider.Provider);
 CngProvider cngProvider = CngProvider.MicrosoftPlatformCryptoProvider;
#endif
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = cngProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 foreach (CngProperty parameter in additionalParameters)
 {
 cngCreationParameters.Parameters.Add(parameter);
 }

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public static CngKeyWrapper CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm algorithm,
 CngKeyCreationOptions creationOption,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = CngProvider.MicrosoftSoftwareKeyStorageProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public CngKey Key { get; }

 public void Dispose()
 {
 Key.Delete();
 }
 }
}

39 changes: 0 additions & 39 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngPlatformProviderKey.cs

View file


Open in desktop


This file was deleted.


48 changes: 34 additions & 14 deletions
src/libraries/Common/tests/System/Security/Cryptography/PlatformSupport.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,47 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 return false;
 }
#endif

 CngKey key = null;

 try
 {
 key = CngKey.Create(
using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 algorithm,
 $"{nameof(PlatformCryptoProviderFunctional)}{algorithm.Algorithm}Key",
 new CngKeyCreationParameters
 {
 Provider = new CngProvider("Microsoft Platform Crypto Provider"),
 KeyCreationOptions = CngKeyCreationOptions.OverwriteExistingKey,
 });
 keySuffix: $"{algorithm.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 finally
 {
 key?.Delete();
 }
 }
 }

 private static bool CheckIfVbsAvailable()
 {
#if !NETFRAMEWORK
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
 return false;
 }
#endif

 try
 {
 const CngKeyCreationOptions RequireVbs = (CngKeyCreationOptions)0x00020000;
#if !NETFRAMEWORK
 Assert.Equal(CngKeyCreationOptions.RequireVbs, RequireVbs);
#endif

 using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm.ECDsaP256,
 RequireVbs,
 keySuffix: $"{CngAlgorithm.ECDsaP256.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 }

Expand All@@ -83,5 +100,8 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 internal static bool PlatformCryptoProviderFunctionalP256 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP256);
 internal static bool PlatformCryptoProviderFunctionalP384 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP384);
 internal static bool PlatformCryptoProviderFunctionalRsa => PlatformCryptoProviderFunctional(CngAlgorithm.Rsa);

 private static bool? s_isVbsAvailable;
 internal static bool IsVbsAvailable => s_isVbsAvailable ??= CheckIfVbsAvailable();
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs"
 Link="CommonTest\System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.Functional.cs"
Expand Down

1 change: 0 additions & 1 deletion
...s/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs" Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs" Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>

Expand Down

2 changes: 0 additions & 2 deletions
...nHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,8 +133,6 @@
 Link="Common\System\Net\Http\SyncBlockingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\ThrowingContent.cs"
 Link="Common\System\Net\Http\ThrowingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,6 @@
 Link="Common\System\IO\DelegatingStream.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs"
 Link="Common\System\Net\RemoteServerQuery.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs"
 Link="Common\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.Dynamic.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs" Link="Common\System\Net\Configuration.Sockets.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs" Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,6 @@
 Link="Common\System\Net\EventSourceTestLogging.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs"
 Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs"
 Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs" Link="Common\System\Net\Http\HuffmanEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs" Link="Common\System\Net\Http\HPackEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="AbortTest.cs" />
 <Compile Include="AbortTest.Loopback.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@
 Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs"
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\ClientWebSocketTestBase.cs" />
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Security.Cryptography.Cng/tests/ECDiffieHellmanCngTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,8 +193,8 @@ public static void HashAlgorithm_SupportsOtherECDHImplementations()
 [OuterLoop("Hardware backed key generation takes several seconds.")]
 public static void PlatformCryptoProvider_DeriveKeyMaterial()
 {
 using (CngPlatformProviderKey platformKey1 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngPlatformProviderKey platformKey2 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (CngKeyWrapper platformKey1 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngKeyWrapper platformKey2 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (ECDiffieHellmanCng ecdhCng1 = new ECDiffieHellmanCng(platformKey1.Key))
 using (ECDiffieHellmanCng ecdhCng2 = new ECDiffieHellmanCng(platformKey2.Key))
 {
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Security.Cryptography.Cng/tests/PropertyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P256(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(256, platformKey.Key.KeySize);
 }
Expand All@@ -31,7 +31,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(384, platformKey.Key.KeySize);
 }
Expand All@@ -44,7 +44,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 public static void CreatePersisted_PlatformRsaKeyHasKeySize(int keySize)
 {
 CngProperty keyLengthProperty = new CngProperty("Length", BitConverter.GetBytes(keySize), CngPropertyOptions.None);
CngPlatformProviderKey platformKey = new CngPlatformProviderKey(
CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm.Rsa,
 keySuffix: keySize.ToString(),
 additionalParameters: keyLengthProperty);
Expand Down

4 changes: 2 additions & 2 deletions
...ries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,8 @@
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngPlatformProviderKey.cs"
 Link="CommonTest\System\Security\Cryptography\CngPlatformProviderKey.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="CommonTest\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs"
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...ries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs"
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...tem.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...es/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="Certificates.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Windows CNG virtualization-based security#102495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

krwq
merged 2 commits into

from

Jul 17, 2024
 Merged


Windows CNG virtualization-based security
#102495
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
acb9b32

Windows CNG virtualization-based security


krwq May 21, 2024
2ab4ca8

Add missing change in Microsoft.Bcl.Cryptography.Tests


krwq Jul 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.Dynamic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using Test.Cryptography;

namespace System.Net.Test.Common
{
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using Test.Cryptography;
using Xunit;

namespace System.Net.Test.Common
Expand Down

75 changes: 75 additions & 0 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngKeyWrapper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using Xunit;
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;

namespace Test.Cryptography
{
 internal sealed class CngKeyWrapper : IDisposable
 {
 private CngKeyWrapper(
 CngAlgorithm algorithm,
 CngKeyCreationParameters cngCreationParameters,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 Key = CngKey.Create(algorithm, $"{testName}{algorithm.Algorithm}{keySuffix}", cngCreationParameters);
 }

 public static CngKeyWrapper CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm algorithm,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null,
 CngKeyCreationOptions creationOption = CngKeyCreationOptions.None,
 params CngProperty[] additionalParameters)
 {
 const string MicrosoftPlatformCryptoProvider = "Microsoft Platform Crypto Provider";

#if NETFRAMEWORK
 CngProvider cngProvider = new(MicrosoftPlatformCryptoProvider);
#else
 Assert.Equal(MicrosoftPlatformCryptoProvider, CngProvider.MicrosoftPlatformCryptoProvider.Provider);
 CngProvider cngProvider = CngProvider.MicrosoftPlatformCryptoProvider;
#endif
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = cngProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 foreach (CngProperty parameter in additionalParameters)
 {
 cngCreationParameters.Parameters.Add(parameter);
 }

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public static CngKeyWrapper CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm algorithm,
 CngKeyCreationOptions creationOption,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = CngProvider.MicrosoftSoftwareKeyStorageProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public CngKey Key { get; }

 public void Dispose()
 {
 Key.Delete();
 }
 }
}

39 changes: 0 additions & 39 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngPlatformProviderKey.cs

View file


Open in desktop


This file was deleted.


48 changes: 34 additions & 14 deletions
src/libraries/Common/tests/System/Security/Cryptography/PlatformSupport.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,47 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 return false;
 }
#endif

 CngKey key = null;

 try
 {
 key = CngKey.Create(
using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 algorithm,
 $"{nameof(PlatformCryptoProviderFunctional)}{algorithm.Algorithm}Key",
 new CngKeyCreationParameters
 {
 Provider = new CngProvider("Microsoft Platform Crypto Provider"),
 KeyCreationOptions = CngKeyCreationOptions.OverwriteExistingKey,
 });
 keySuffix: $"{algorithm.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 finally
 {
 key?.Delete();
 }
 }
 }

 private static bool CheckIfVbsAvailable()
 {
#if !NETFRAMEWORK
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
 return false;
 }
#endif

 try
 {
 const CngKeyCreationOptions RequireVbs = (CngKeyCreationOptions)0x00020000;
#if !NETFRAMEWORK
 Assert.Equal(CngKeyCreationOptions.RequireVbs, RequireVbs);
#endif

 using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm.ECDsaP256,
 RequireVbs,
 keySuffix: $"{CngAlgorithm.ECDsaP256.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 }

Expand All@@ -83,5 +100,8 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 internal static bool PlatformCryptoProviderFunctionalP256 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP256);
 internal static bool PlatformCryptoProviderFunctionalP384 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP384);
 internal static bool PlatformCryptoProviderFunctionalRsa => PlatformCryptoProviderFunctional(CngAlgorithm.Rsa);

 private static bool? s_isVbsAvailable;
 internal static bool IsVbsAvailable => s_isVbsAvailable ??= CheckIfVbsAvailable();
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs"
 Link="CommonTest\System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.Functional.cs"
Expand Down

1 change: 0 additions & 1 deletion
...s/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs" Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs" Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>

Expand Down

2 changes: 0 additions & 2 deletions
...nHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,8 +133,6 @@
 Link="Common\System\Net\Http\SyncBlockingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\ThrowingContent.cs"
 Link="Common\System\Net\Http\ThrowingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,6 @@
 Link="Common\System\IO\DelegatingStream.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs"
 Link="Common\System\Net\RemoteServerQuery.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs"
 Link="Common\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.Dynamic.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs" Link="Common\System\Net\Configuration.Sockets.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs" Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,6 @@
 Link="Common\System\Net\EventSourceTestLogging.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs"
 Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs"
 Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs" Link="Common\System\Net\Http\HuffmanEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs" Link="Common\System\Net\Http\HPackEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="AbortTest.cs" />
 <Compile Include="AbortTest.Loopback.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@
 Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs"
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\ClientWebSocketTestBase.cs" />
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Security.Cryptography.Cng/tests/ECDiffieHellmanCngTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,8 +193,8 @@ public static void HashAlgorithm_SupportsOtherECDHImplementations()
 [OuterLoop("Hardware backed key generation takes several seconds.")]
 public static void PlatformCryptoProvider_DeriveKeyMaterial()
 {
 using (CngPlatformProviderKey platformKey1 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngPlatformProviderKey platformKey2 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (CngKeyWrapper platformKey1 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngKeyWrapper platformKey2 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (ECDiffieHellmanCng ecdhCng1 = new ECDiffieHellmanCng(platformKey1.Key))
 using (ECDiffieHellmanCng ecdhCng2 = new ECDiffieHellmanCng(platformKey2.Key))
 {
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Security.Cryptography.Cng/tests/PropertyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P256(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(256, platformKey.Key.KeySize);
 }
Expand All@@ -31,7 +31,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(384, platformKey.Key.KeySize);
 }
Expand All@@ -44,7 +44,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 public static void CreatePersisted_PlatformRsaKeyHasKeySize(int keySize)
 {
 CngProperty keyLengthProperty = new CngProperty("Length", BitConverter.GetBytes(keySize), CngPropertyOptions.None);
CngPlatformProviderKey platformKey = new CngPlatformProviderKey(
CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm.Rsa,
 keySuffix: keySize.ToString(),
 additionalParameters: keyLengthProperty);
Expand Down

4 changes: 2 additions & 2 deletions
...ries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,8 @@
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngPlatformProviderKey.cs"
 Link="CommonTest\System\Security\Cryptography\CngPlatformProviderKey.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="CommonTest\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs"
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...ries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs"
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...tem.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...es/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="Certificates.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Windows CNG virtualization-based security#102495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

krwq
merged 2 commits into

from

Jul 17, 2024
 Merged


Windows CNG virtualization-based security
#102495
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
acb9b32

Windows CNG virtualization-based security


krwq May 21, 2024
2ab4ca8

Add missing change in Microsoft.Bcl.Cryptography.Tests


krwq Jul 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.Dynamic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using Test.Cryptography;

namespace System.Net.Test.Common
{
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using Test.Cryptography;
using Xunit;

namespace System.Net.Test.Common
Expand Down

75 changes: 75 additions & 0 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngKeyWrapper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using Xunit;
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;

namespace Test.Cryptography
{
 internal sealed class CngKeyWrapper : IDisposable
 {
 private CngKeyWrapper(
 CngAlgorithm algorithm,
 CngKeyCreationParameters cngCreationParameters,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 Key = CngKey.Create(algorithm, $"{testName}{algorithm.Algorithm}{keySuffix}", cngCreationParameters);
 }

 public static CngKeyWrapper CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm algorithm,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null,
 CngKeyCreationOptions creationOption = CngKeyCreationOptions.None,
 params CngProperty[] additionalParameters)
 {
 const string MicrosoftPlatformCryptoProvider = "Microsoft Platform Crypto Provider";

#if NETFRAMEWORK
 CngProvider cngProvider = new(MicrosoftPlatformCryptoProvider);
#else
 Assert.Equal(MicrosoftPlatformCryptoProvider, CngProvider.MicrosoftPlatformCryptoProvider.Provider);
 CngProvider cngProvider = CngProvider.MicrosoftPlatformCryptoProvider;
#endif
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = cngProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 foreach (CngProperty parameter in additionalParameters)
 {
 cngCreationParameters.Parameters.Add(parameter);
 }

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public static CngKeyWrapper CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm algorithm,
 CngKeyCreationOptions creationOption,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = CngProvider.MicrosoftSoftwareKeyStorageProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public CngKey Key { get; }

 public void Dispose()
 {
 Key.Delete();
 }
 }
}

39 changes: 0 additions & 39 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngPlatformProviderKey.cs

View file


Open in desktop


This file was deleted.


48 changes: 34 additions & 14 deletions
src/libraries/Common/tests/System/Security/Cryptography/PlatformSupport.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,47 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 return false;
 }
#endif

 CngKey key = null;

 try
 {
 key = CngKey.Create(
using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 algorithm,
 $"{nameof(PlatformCryptoProviderFunctional)}{algorithm.Algorithm}Key",
 new CngKeyCreationParameters
 {
 Provider = new CngProvider("Microsoft Platform Crypto Provider"),
 KeyCreationOptions = CngKeyCreationOptions.OverwriteExistingKey,
 });
 keySuffix: $"{algorithm.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 finally
 {
 key?.Delete();
 }
 }
 }

 private static bool CheckIfVbsAvailable()
 {
#if !NETFRAMEWORK
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
 return false;
 }
#endif

 try
 {
 const CngKeyCreationOptions RequireVbs = (CngKeyCreationOptions)0x00020000;
#if !NETFRAMEWORK
 Assert.Equal(CngKeyCreationOptions.RequireVbs, RequireVbs);
#endif

 using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm.ECDsaP256,
 RequireVbs,
 keySuffix: $"{CngAlgorithm.ECDsaP256.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 }

Expand All@@ -83,5 +100,8 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 internal static bool PlatformCryptoProviderFunctionalP256 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP256);
 internal static bool PlatformCryptoProviderFunctionalP384 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP384);
 internal static bool PlatformCryptoProviderFunctionalRsa => PlatformCryptoProviderFunctional(CngAlgorithm.Rsa);

 private static bool? s_isVbsAvailable;
 internal static bool IsVbsAvailable => s_isVbsAvailable ??= CheckIfVbsAvailable();
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs"
 Link="CommonTest\System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.Functional.cs"
Expand Down

1 change: 0 additions & 1 deletion
...s/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs" Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs" Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>

Expand Down

2 changes: 0 additions & 2 deletions
...nHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,8 +133,6 @@
 Link="Common\System\Net\Http\SyncBlockingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\ThrowingContent.cs"
 Link="Common\System\Net\Http\ThrowingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,6 @@
 Link="Common\System\IO\DelegatingStream.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs"
 Link="Common\System\Net\RemoteServerQuery.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs"
 Link="Common\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.Dynamic.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs" Link="Common\System\Net\Configuration.Sockets.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs" Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,6 @@
 Link="Common\System\Net\EventSourceTestLogging.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs"
 Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs"
 Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs" Link="Common\System\Net\Http\HuffmanEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs" Link="Common\System\Net\Http\HPackEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="AbortTest.cs" />
 <Compile Include="AbortTest.Loopback.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@
 Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs"
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\ClientWebSocketTestBase.cs" />
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Security.Cryptography.Cng/tests/ECDiffieHellmanCngTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,8 +193,8 @@ public static void HashAlgorithm_SupportsOtherECDHImplementations()
 [OuterLoop("Hardware backed key generation takes several seconds.")]
 public static void PlatformCryptoProvider_DeriveKeyMaterial()
 {
 using (CngPlatformProviderKey platformKey1 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngPlatformProviderKey platformKey2 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (CngKeyWrapper platformKey1 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngKeyWrapper platformKey2 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (ECDiffieHellmanCng ecdhCng1 = new ECDiffieHellmanCng(platformKey1.Key))
 using (ECDiffieHellmanCng ecdhCng2 = new ECDiffieHellmanCng(platformKey2.Key))
 {
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Security.Cryptography.Cng/tests/PropertyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P256(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(256, platformKey.Key.KeySize);
 }
Expand All@@ -31,7 +31,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(384, platformKey.Key.KeySize);
 }
Expand All@@ -44,7 +44,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 public static void CreatePersisted_PlatformRsaKeyHasKeySize(int keySize)
 {
 CngProperty keyLengthProperty = new CngProperty("Length", BitConverter.GetBytes(keySize), CngPropertyOptions.None);
CngPlatformProviderKey platformKey = new CngPlatformProviderKey(
CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm.Rsa,
 keySuffix: keySize.ToString(),
 additionalParameters: keyLengthProperty);
Expand Down

4 changes: 2 additions & 2 deletions
...ries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,8 @@
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngPlatformProviderKey.cs"
 Link="CommonTest\System\Security\Cryptography\CngPlatformProviderKey.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="CommonTest\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs"
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...ries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs"
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...tem.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...es/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="Certificates.cs" />
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Windows CNG virtualization-based security#102495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

krwq
merged 2 commits into

from

Jul 17, 2024
 Merged


Windows CNG virtualization-based security
#102495
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
acb9b32

Windows CNG virtualization-based security


krwq May 21, 2024
2ab4ca8

Add missing change in Microsoft.Bcl.Cryptography.Tests


krwq Jul 12, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.Dynamic.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates.Tests.Common;
using Test.Cryptography;

namespace System.Net.Test.Common
{
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/tests/System/Net/Configuration.Certificates.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using Test.Cryptography;
using Xunit;

namespace System.Net.Test.Common
Expand Down

75 changes: 75 additions & 0 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngKeyWrapper.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#nullable enable

using Xunit;
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;

namespace Test.Cryptography
{
 internal sealed class CngKeyWrapper : IDisposable
 {
 private CngKeyWrapper(
 CngAlgorithm algorithm,
 CngKeyCreationParameters cngCreationParameters,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 Key = CngKey.Create(algorithm, $"{testName}{algorithm.Algorithm}{keySuffix}", cngCreationParameters);
 }

 public static CngKeyWrapper CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm algorithm,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null,
 CngKeyCreationOptions creationOption = CngKeyCreationOptions.None,
 params CngProperty[] additionalParameters)
 {
 const string MicrosoftPlatformCryptoProvider = "Microsoft Platform Crypto Provider";

#if NETFRAMEWORK
 CngProvider cngProvider = new(MicrosoftPlatformCryptoProvider);
#else
 Assert.Equal(MicrosoftPlatformCryptoProvider, CngProvider.MicrosoftPlatformCryptoProvider.Provider);
 CngProvider cngProvider = CngProvider.MicrosoftPlatformCryptoProvider;
#endif
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = cngProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 foreach (CngProperty parameter in additionalParameters)
 {
 cngCreationParameters.Parameters.Add(parameter);
 }

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public static CngKeyWrapper CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm algorithm,
 CngKeyCreationOptions creationOption,
 string? keySuffix = null,
 [CallerMemberName] string? testName = null)
 {
 CngKeyCreationParameters cngCreationParameters = new()
 {
 Provider = CngProvider.MicrosoftSoftwareKeyStorageProvider,
 KeyCreationOptions = creationOption | CngKeyCreationOptions.OverwriteExistingKey,
 };

 return new CngKeyWrapper(algorithm, cngCreationParameters, keySuffix, testName);
 }

 public CngKey Key { get; }

 public void Dispose()
 {
 Key.Delete();
 }
 }
}

39 changes: 0 additions & 39 deletions
src/libraries/Common/tests/System/Security/Cryptography/CngPlatformProviderKey.cs

View file


Open in desktop


This file was deleted.


48 changes: 34 additions & 14 deletions
src/libraries/Common/tests/System/Security/Cryptography/PlatformSupport.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,30 +37,47 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 return false;
 }
#endif

 CngKey key = null;

 try
 {
 key = CngKey.Create(
using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 algorithm,
 $"{nameof(PlatformCryptoProviderFunctional)}{algorithm.Algorithm}Key",
 new CngKeyCreationParameters
 {
 Provider = new CngProvider("Microsoft Platform Crypto Provider"),
 KeyCreationOptions = CngKeyCreationOptions.OverwriteExistingKey,
 });
 keySuffix: $"{algorithm.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 finally
 {
 key?.Delete();
 }
 }
 }

 private static bool CheckIfVbsAvailable()
 {
#if !NETFRAMEWORK
 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 {
 return false;
 }
#endif

 try
 {
 const CngKeyCreationOptions RequireVbs = (CngKeyCreationOptions)0x00020000;
#if !NETFRAMEWORK
 Assert.Equal(CngKeyCreationOptions.RequireVbs, RequireVbs);
#endif

 using CngKeyWrapper key = CngKeyWrapper.CreateMicrosoftSoftwareKeyStorageProvider(
 CngAlgorithm.ECDsaP256,
 RequireVbs,
 keySuffix: $"{CngAlgorithm.ECDsaP256.Algorithm}Key");

 return true;
 }
 catch (CryptographicException)
 {
 return false;
 }
 }

Expand All@@ -83,5 +100,8 @@ static bool DetermineAlgorithmFunctional(CngAlgorithm algorithm)
 internal static bool PlatformCryptoProviderFunctionalP256 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP256);
 internal static bool PlatformCryptoProviderFunctionalP384 => PlatformCryptoProviderFunctional(CngAlgorithm.ECDsaP384);
 internal static bool PlatformCryptoProviderFunctionalRsa => PlatformCryptoProviderFunctional(CngAlgorithm.Rsa);

 private static bool? s_isVbsAvailable;
 internal static bool IsVbsAvailable => s_isVbsAvailable ??= CheckIfVbsAvailable();
 }
}

2 changes: 2 additions & 0 deletions
src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs"
 Link="CommonTest\System\Security\Cryptography\SP800108HmacCounterKdfTests.ArgValidation.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SP800108HmacCounterKdfTests.Functional.cs"
Expand Down

1 change: 0 additions & 1 deletion
...s/System.Net.Http.Json/tests/FunctionalTests/System.Net.Http.Json.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs" Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs" Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>

Expand Down

2 changes: 0 additions & 2 deletions
...nHttpHandler/tests/FunctionalTests/System.Net.Http.WinHttpHandler.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,8 +133,6 @@
 Link="Common\System\Net\Http\SyncBlockingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\ThrowingContent.cs"
 Link="Common\System\Net\Http\ThrowingContent.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\TrackingSynchronizationContext.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,8 +69,6 @@
 Link="Common\System\IO\DelegatingStream.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteServerQuery.cs"
 Link="Common\System\Net\RemoteServerQuery.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.cs"
 Link="Common\System\Net\Configuration.Certificates.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Certificates.Dynamic.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.Quic/tests/FunctionalTests/System.Net.Quic.Functional.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs" Link="Common\System\Net\Configuration.Security.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Configuration.Sockets.cs" Link="Common\System\Net\Configuration.Sockets.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs" Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="TestCommon\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs" Link="CommonTest\System\Security\Cryptography\X509Certificates\RevocationResponder.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="TestCommon\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,8 +89,6 @@
 Link="Common\System\Net\EventSourceTestLogging.cs" />
 <Compile Include="$(CommonTestPath)System\Net\RemoteExecutorExtensions.cs"
 Link="Common\System\Net\RemoteExecutorExtensions.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\CertificateAuthority.cs"
 Link="CommonTest\System\Security\Cryptography\X509Certificates\CertificateAuthority.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\X509Certificates\RevocationResponder.cs"
Expand Down

2 changes: 0 additions & 2 deletions
src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,6 @@
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\TestHelper.cs"
 Link="Common\System\Net\Http\TestHelper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 </ItemGroup>
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@
 <Compile Include="$(CommonTestPath)System\Net\Http\HuffmanEncoder.cs" Link="Common\System\Net\Http\HuffmanEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\HPackEncoder.cs" Link="Common\System\Net\Http\HPackEncoder.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs" Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs" Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs" Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="AbortTest.cs" />
 <Compile Include="AbortTest.Loopback.cs" />
Expand Down

2 changes: 0 additions & 2 deletions
...es/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,8 +40,6 @@
 Link="Common\System\Net\Http\LoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Net\Http\GenericLoopbackServer.cs"
 Link="Common\System\Net\Http\GenericLoopbackServer.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
 Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
 <Compile Include="..\ClientWebSocketTestBase.cs" />
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Security.Cryptography.Cng/tests/ECDiffieHellmanCngTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,8 +193,8 @@ public static void HashAlgorithm_SupportsOtherECDHImplementations()
 [OuterLoop("Hardware backed key generation takes several seconds.")]
 public static void PlatformCryptoProvider_DeriveKeyMaterial()
 {
 using (CngPlatformProviderKey platformKey1 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngPlatformProviderKey platformKey2 = new CngPlatformProviderKey(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (CngKeyWrapper platformKey1 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key1"))
 using (CngKeyWrapper platformKey2 = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(CngAlgorithm.ECDiffieHellmanP256, "key2"))
 using (ECDiffieHellmanCng ecdhCng1 = new ECDiffieHellmanCng(platformKey1.Key))
 using (ECDiffieHellmanCng ecdhCng2 = new ECDiffieHellmanCng(platformKey2.Key))
 {
Expand Down

6 changes: 3 additions & 3 deletions
src/libraries/System.Security.Cryptography.Cng/tests/PropertyTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P256(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(256, platformKey.Key.KeySize);
 }
Expand All@@ -31,7 +31,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 {
 CngAlgorithm cngAlgorithm = new CngAlgorithm(algorithm);

 using (CngPlatformProviderKey platformKey = new CngPlatformProviderKey(cngAlgorithm))
 using (CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(cngAlgorithm))
 {
 Assert.Equal(384, platformKey.Key.KeySize);
 }
Expand All@@ -44,7 +44,7 @@ public static void CreatePersisted_PlatformEccKeyHasKeySize_P384(string algorith
 public static void CreatePersisted_PlatformRsaKeyHasKeySize(int keySize)
 {
 CngProperty keyLengthProperty = new CngProperty("Length", BitConverter.GetBytes(keySize), CngPropertyOptions.None);
CngPlatformProviderKey platformKey = new CngPlatformProviderKey(
CngKeyWrapper platformKey = CngKeyWrapper.CreateMicrosoftPlatformCryptoProvider(
 CngAlgorithm.Rsa,
 keySuffix: keySize.ToString(),
 additionalParameters: keyLengthProperty);
Expand Down

4 changes: 2 additions & 2 deletions
...ries/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,8 +39,8 @@
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\ECDiffieHellman\ECDiffieHellmanFactory.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\ByteUtils.cs"
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngPlatformProviderKey.cs"
 Link="CommonTest\System\Security\Cryptography\CngPlatformProviderKey.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="CommonTest\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CryptoUtils.cs"
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...ries/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@
 Link="CommonTest\System\Security\Cryptography\CryptoUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs"
 Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\EncryptDecrypt.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...tem.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RC2\RC2Factory.cs"
Expand Down

2 changes: 2 additions & 0 deletions
...es/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@
 Link="CommonTest\System\Security\Cryptography\ByteUtils.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\PlatformSupport.cs"
 Link="CommonTest\System\Security\Cryptography\PlatformSupport.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\CngKeyWrapper.cs"
 Link="TestCommon\System\Security\Cryptography\CngKeyWrapper.cs" />
 <Compile Include="$(CommonTestPath)System\Security\Cryptography\SignatureSupport.cs"
 Link="CommonTest\System\Security\Cryptography\SignatureSupport.cs" />
 <Compile Include="Certificates.cs" />
Expand Down
Loading