Change X509CertificateLoader to wrap unsupported algorithms with a Cr…

…yptographicException
dotnet · Jun 27, 2024 · 2b4a4bc · 2b4a4bc
1 parent 3dc41eb
commit 2b4a4bc
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.../Common/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.Pkcs12.cs b/.../Common/src/System/Security/Cryptography/X509Certificates/X509CertificateLoader.Pkcs12.cs
@@ -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(