Skip to content
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

[Android][libraries] Throw PNSE for PersistKeySet flags #57494

Merged
merged 2 commits into from
Aug 17, 2021
Merged

[Android][libraries] Throw PNSE for PersistKeySet flags #57494

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45246c9
[Android][libraries] Throw PNSE for Exportable and PersistKeySet flags
Aug 16, 2021
34b8aa9
Ignore exportable flag
Aug 17, 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
5 changes: 5 additions & 0 deletions ...ptography.X509Certificates/src/Internal/Cryptography/Pal.Android/AndroidCertificatePal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ public static ICertificatePal FromBlob(ReadOnlySpan<byte> rawData, SafePasswordH
// We don't support determining this on Android right now, so we throw.
throw new CryptographicException(SR.Cryptography_X509_PKCS7_NoSigner);
case X509ContentType.Pkcs12:
if ((keyStorageFlags & X509KeyStorageFlags.PersistKeySet) == X509KeyStorageFlags.PersistKeySet)
{
throw new PlatformNotSupportedException(SR.Cryptography_X509_PKCS12_PersistKeySetNotSupported);
}

return ReadPkcs12(rawData, password, ephemeralSpecified);
case X509ContentType.Cert:
default:
Expand Down