Returns error code rather than asserting

dotnet · Jul 9, 2018 · 9366919 · 9366919
1 parent b67bfdf
commit 9366919
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.c b/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509.c
@@ -61,7 +61,7 @@ AppleCryptoNative_X509GetPublicKey(SecCertificateRef cert, SecKeyRef* pPublicKey
         *pOSStatusOut = noErr;
 
     if (cert == NULL || pPublicKeyOut == NULL || pOSStatusOut == NULL)
-        return kErrorBadInput;
+        return kErrorUnknownState;
 
     pthread_once (&once, InitCertificateCopy);
     // SecCertificateCopyPublicKey was deprecated in 10.14, so use SecCertificateCopyKey on the systems that have it (10.14+),
@@ -70,11 +70,14 @@ AppleCryptoNative_X509GetPublicKey(SecCertificateRef cert, SecKeyRef* pPublicKey
     {
         *pPublicKeyOut = (*secCertificateCopyKey)(cert);
     }
-    else
+    else if (secCertificateCopyPublicKey != NULL)
     {
-        assert(secCertificateCopyPublicKey != NULL);
         *pOSStatusOut = (*secCertificateCopyPublicKey)(cert, pPublicKeyOut);
     }
+    else
+    {
+        return kErrorBadInput;
+    }
     return (*pOSStatusOut == noErr);
 }