Skip to content

Fix Windows 8 detection. #58736

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
jeffhandley merged 2 commits into from
Sep 8, 2021
Merged

Fix Windows 8 detection. #58736

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
016b9de
Fix Windows 8 detection.
teo-tsirpanis Sep 6, 2021
13fbffb
Explain that Windows 8's version is 6.2.
teo-tsirpanis Sep 7, 2021
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
6 changes: 3 additions & 3 deletions ...ecurity.Cryptography.Algorithms/src/Internal/Cryptography/Pbkdf2Implementation.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ namespace Internal.Cryptography
{
internal static partial class Pbkdf2Implementation
{
// For Windows 7 we will use BCryptDeriveKeyPBKDF2. For Windows 8+ we will use BCryptKeyDerivation
// since it has better performance.
private static readonly bool s_useKeyDerivation = OperatingSystem.IsWindowsVersionAtLeast(8, 0, 0);
// For Windows 7 we will use BCryptDeriveKeyPBKDF2. For Windows 8+ (seen as version 6.2.0) we will
// use BCryptKeyDerivation since it has better performance.
private static readonly bool s_useKeyDerivation = OperatingSystem.IsWindowsVersionAtLeast(6, 2);

// A cached instance of PBKDF2 for Windows 8, where pseudo handles are not supported.
private static SafeBCryptAlgorithmHandle? s_pbkdf2AlgorithmHandle;
Expand Down