Fix compilation of Apple native shim on newer Clang

Newer versions of Clang warn when you are doing enum comparisons of different enum types.
jtschuster · Oct 17, 2024 · 2532006 · 2532006
1 parent 85d9100
commit 2532006
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_symmetric.c b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_symmetric.c
@@ -6,21 +6,21 @@
 
 #include <assert.h>
 
-c_static_assert(PAL_OperationEncrypt == kCCEncrypt);
-c_static_assert(PAL_OperationDecrypt == kCCDecrypt);
+c_static_assert((uint32_t)PAL_OperationEncrypt == (uint32_t)kCCEncrypt);
+c_static_assert((uint32_t)PAL_OperationDecrypt == (uint32_t)kCCDecrypt);
 
-c_static_assert(PAL_AlgorithmAES == kCCAlgorithmAES128);
-c_static_assert(PAL_AlgorithmDES == kCCAlgorithmDES);
-c_static_assert(PAL_Algorithm3DES == kCCAlgorithm3DES);
-c_static_assert(PAL_AlgorithmRC2 == kCCAlgorithmRC2);
+c_static_assert((uint32_t)PAL_AlgorithmAES == (uint32_t)kCCAlgorithmAES128);
+c_static_assert((uint32_t)PAL_AlgorithmDES == (uint32_t)kCCAlgorithmDES);
+c_static_assert((uint32_t)PAL_Algorithm3DES == (uint32_t)kCCAlgorithm3DES);
+c_static_assert((uint32_t)PAL_AlgorithmRC2 == (uint32_t)kCCAlgorithmRC2);
 
-c_static_assert(PAL_ChainingModeECB == kCCModeECB);
-c_static_assert(PAL_ChainingModeCBC == kCCModeCBC);
-c_static_assert(PAL_ChainingModeCFB == kCCModeCFB);
-c_static_assert(PAL_ChainingModeCFB8 == kCCModeCFB8);
+c_static_assert((uint32_t)PAL_ChainingModeECB == (uint32_t)kCCModeECB);
+c_static_assert((uint32_t)PAL_ChainingModeCBC == (uint32_t)kCCModeCBC);
+c_static_assert((uint32_t)PAL_ChainingModeCFB == (uint32_t)kCCModeCFB);
+c_static_assert((uint32_t)PAL_ChainingModeCFB8 == (uint32_t)kCCModeCFB8);
 
-c_static_assert(PAL_PaddingModeNone == ccNoPadding);
-c_static_assert(PAL_PaddingModePkcs7 == ccPKCS7Padding);
+c_static_assert((uint32_t)PAL_PaddingModeNone == (uint32_t)ccNoPadding);
+c_static_assert((uint32_t)PAL_PaddingModePkcs7 == (uint32_t)ccPKCS7Padding);
 
 // No PAL_SymmetricOptions are currently mapped, so no asserts required.
 

diff --git a/src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509.c b/src/native/libs/System.Security.Cryptography.Native.Apple/pal_x509.c
@@ -151,7 +151,7 @@ int32_t AppleCryptoNative_X509GetRawData(SecCertificateRef cert, CFDataRef* ppDa
     }
 
     *ppDataOut = SecCertificateCopyData(cert);
-    *pOSStatus = *ppDataOut == NULL ? errSecParam : noErr;
+    *pOSStatus = *ppDataOut == NULL ? errSecParam : (OSStatus)noErr;
     return (*pOSStatus == noErr);
 }