Address feedback

dotnet · Aug 12, 2021 · 6300e70 · 6300e70
1 parent a919367
commit 6300e70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/...hy.X509Certificates/src/Internal/Cryptography/Pal.iOS/AppleCertificatePal.ImportExport.cs b/...hy.X509Certificates/src/Internal/Cryptography/Pal.iOS/AppleCertificatePal.ImportExport.cs
@@ -114,14 +114,11 @@ internal static ICertificatePal FromDerBlob(
 
             if (contentType == X509ContentType.Pkcs12)
             {
-                // TODO:
-                // We ignore keyStorageFlags which is tracked in https://github.com/dotnet/runtime/issues/52434.
-                // The keys are always imported as ephemeral and never persisted. Exportability is ignored for
-                // the moment and it needs to be investigated how to map it to iOS keychain primitives.
                 if ((keyStorageFlags & X509KeyStorageFlags.Exportable) == X509KeyStorageFlags.Exportable)
                 {
                     throw new PlatformNotSupportedException(SR.Cryptography_X509_PKCS12_ExportableNotSupported);
                 }
+
                 if ((keyStorageFlags & X509KeyStorageFlags.PersistKeySet) == X509KeyStorageFlags.PersistKeySet)
                 {
                     throw new PlatformNotSupportedException(SR.Cryptography_X509_PKCS12_PersistKeySetNotSupported);

diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx b/src/libraries/System.Security.Cryptography.X509Certificates/src/Resources/Strings.resx
@@ -296,10 +296,10 @@
     <value>PKCS#7 certificate format is not supported on this platform.</value>
   </data>
   <data name="Cryptography_X509_PKCS12_PersistKeySetNotSupported" xml:space="preserve">
-    <value>PKCS#12 persist key set flag is not supported on this platform.</value>
+    <value>The PKCS#12 PersistKeySet flag is not supported on this platform.</value>
   </data>
   <data name="Cryptography_X509_PKCS12_ExportableNotSupported" xml:space="preserve">
-    <value>PKCS#12 exportable flag is not supported on this platform.</value>
+    <value>The PKCS#12 Exportable flag is not supported on this platform.</value>
   </data>
   <data name="Cryptography_X509_StoreAddFailure" xml:space="preserve">
     <value>The X509 certificate could not be added to the store.</value>