Skip to content

[release/6.0] Fix Windows 8 detection in Pbkdf2 #58823

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

[release/6.0] Fix Windows 8 detection in Pbkdf2 #58823

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2315e4a
Fix Windows 8 detection.
teo-tsirpanis Sep 6, 2021
e6df394
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
Next Next commit
Fix Windows 8 detection. 
Windows 8's actual version is 6.2, not 8. The test would succeed only on Windows 10+.
  • Loading branch information
@teo-tsirpanis
teo-tsirpanis authored and github-actions committed Sep 8, 2021
commit 2315e4acf9fe2cce9a130d2806264977bfa2b0b7
2 changes: 1 addition & 1 deletion ...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 @@ -18,7 +18,7 @@ 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);
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