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

Jump to bottom

Fix missing entrypoints and add build-time validation #54785

Merged
merged 3 commits into from
Jun 28, 2021
Merged

Fix missing entrypoints and add build-time validation #54785

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c75b22f
Fix missing entrypoints and add build-time validation
vcsjones Jun 27, 2021
cff95cf
Fix missing include
vcsjones Jun 27, 2021
46f470e
Update src/libraries/Native/Unix/System.Security.Cryptography.Native.…
vcsjones Jun 27, 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
11 changes: 11 additions & 0 deletions src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ if (GEN_SHARED_LIB)
target_link_libraries(System.Security.Cryptography.Native.Apple
${NATIVE_LIBS_EXTRA}
)

if (NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS)
add_custom_command(TARGET System.Security.Cryptography.Native.Apple POST_BUILD
COMMENT "Verifying System.Security.Cryptography.Native.Apple points against entrypoints.c "
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../verify-entrypoints.sh
$<TARGET_FILE:System.Security.Cryptography.Native.Apple>
${CMAKE_CURRENT_SOURCE_DIR}/../../Unix/System.Security.Cryptography.Native.Apple/entrypoints.c
vcsjones marked this conversation as resolved.
Show resolved Hide resolved
${CMAKE_NM}
VERBATIM
)
endif()
endif()

if (GEN_SHARED_LIB)
Expand Down
23 changes: 20 additions & 3 deletions src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/entrypoints.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "pal_x509_macos.h"
#include "pal_x509chain.h"
#include "pal_keyderivation_macos.h"
#include "pal_keyagree.h"

static const Entry s_cryptoAppleNative[] =
{
Expand All @@ -30,8 +31,11 @@ static const Entry s_cryptoAppleNative[] =
DllImportEntry(AppleCryptoNative_DigestFinal)
DllImportEntry(AppleCryptoNative_DigestCurrent)
DllImportEntry(AppleCryptoNative_DigestOneShot)
DllImportEntry(AppleCryptoNative_DigestReset)
DllImportEntry(AppleCryptoNative_EccGenerateKey)
DllImportEntry(AppleCryptoNative_EccGetKeySizeInBits)
DllImportEntry(AppleCryptoNative_EcdhKeyAgree)
DllImportEntry(AppleCryptoNative_GetRandomBytes)
DllImportEntry(AppleCryptoNative_HmacFree)
DllImportEntry(AppleCryptoNative_HmacCreate)
DllImportEntry(AppleCryptoNative_HmacInit)
Expand All @@ -40,14 +44,22 @@ static const Entry s_cryptoAppleNative[] =
DllImportEntry(AppleCryptoNative_HmacCurrent)
DllImportEntry(AppleCryptoNative_HmacOneShot)
DllImportEntry(AppleCryptoNative_SecKeychainItemCopyKeychain)
DllImportEntry(AppleCryptoNative_SecKeychainCopyDefault)
DllImportEntry(AppleCryptoNative_SecKeychainCreate)
DllImportEntry(AppleCryptoNative_SecKeychainDelete)
DllImportEntry(AppleCryptoNative_SecKeychainCopyDefault)
DllImportEntry(AppleCryptoNative_SecKeychainEnumerateCerts)
DllImportEntry(AppleCryptoNative_SecKeychainOpen)
DllImportEntry(AppleCryptoNative_SecKeychainUnlock)
DllImportEntry(AppleCryptoNative_SetKeychainNeverLock)
DllImportEntry(AppleCryptoNative_SecKeychainEnumerateIdentities)
DllImportEntry(AppleCryptoNative_GetRandomBytes)
DllImportEntry(AppleCryptoNative_SetKeychainNeverLock)
DllImportEntry(AppleCryptoNative_SslCopyCADistinguishedNames)
DllImportEntry(AppleCryptoNative_SslCopyCertChain)
DllImportEntry(AppleCryptoNative_SslIsHostnameMatch)
DllImportEntry(AppleCryptoNative_SslRead)
DllImportEntry(AppleCryptoNative_SslSetBreakOnClientAuth)
DllImportEntry(AppleCryptoNative_SslSetBreakOnServerAuth)
DllImportEntry(AppleCryptoNative_SslSetIoCallbacks)
DllImportEntry(AppleCryptoNative_SslWrite)
DllImportEntry(AppleCryptoNative_RsaGenerateKey)
DllImportEntry(AppleCryptoNative_RsaDecryptOaep)
DllImportEntry(AppleCryptoNative_RsaDecryptPkcs)
Expand Down Expand Up @@ -87,7 +99,10 @@ static const Entry s_cryptoAppleNative[] =
DllImportEntry(AppleCryptoNative_StoreEnumerateMachineRoot)
DllImportEntry(AppleCryptoNative_StoreEnumerateUserDisallowed)
DllImportEntry(AppleCryptoNative_StoreEnumerateMachineDisallowed)
DllImportEntry(AppleCryptoNative_X509ChainCreate)
DllImportEntry(AppleCryptoNative_X509DemuxAndRetainHandle)
DllImportEntry(AppleCryptoNative_X509GetContentType)
DllImportEntry(AppleCryptoNative_X509GetPublicKey)
DllImportEntry(AppleCryptoNative_X509CopyCertFromIdentity)
DllImportEntry(AppleCryptoNative_X509CopyPrivateKeyFromIdentity)
DllImportEntry(AppleCryptoNative_X509ImportCollection)
Expand All @@ -105,6 +120,8 @@ static const Entry s_cryptoAppleNative[] =
DllImportEntry(AppleCryptoNative_X509ChainGetStatusAtIndex)
DllImportEntry(AppleCryptoNative_GetOSStatusForChainStatus)
DllImportEntry(AppleCryptoNative_X509ChainSetTrustAnchorCertificates)
DllImportEntry(AppleCryptoNative_X509StoreAddCertificate)
DllImportEntry(AppleCryptoNative_X509StoreRemoveCertificate)
DllImportEntry(AppleCryptoNative_Pbkdf2)
DllImportEntry(AppleCryptoNative_X509GetSubjectSummary)
};
Expand Down