Skip to content

Change X509CertificateLoader to wrap unsupported algorithms with a CryptographicException #104040

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
bartonjs merged 1 commit into from
Jun 27, 2024
Merged

Change X509CertificateLoader to wrap unsupported algorithms with a CryptographicException #104040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions .../Common/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.Pkcs12.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,12 @@ internal ReadOnlyMemory<byte> DecryptSafeContents(
saveOffset,
written);
}
catch (PlatformNotSupportedException pnse)
{
// May be thrown by PBE decryption if the platform does not support the algorithm.
ThrowWithHResult(SR.Cryptography_Pfx_BadPassword, ERROR_INVALID_PASSWORD, pnse);
throw; // This is unreachable because of the throw helper, but the compiler does not know that.
}
catch (CryptographicException e)
{
CryptographicOperations.ZeroMemory(
Expand Down