Merge pull request #10408 from ronald-cron-arm/historical-libmbedcryto

Restore historical libmbedcrypto.* libraries
This commit is contained in:
David Horstmann
2025-09-29 08:41:06 +00:00
committed by GitHub
6 changed files with 143 additions and 44 deletions

View File

@@ -17,6 +17,7 @@ execute_process(
"-DENABLE_TESTING=NO"
# Turn on generated files explicitly in case this is a release
"-DGEN_FILES=ON"
"-DUSE_SHARED_MBEDTLS_LIBRARY=ON"
"-DCMAKE_INSTALL_PREFIX=${MbedTLS_INSTALL_DIR}")
execute_process(

View File

@@ -84,13 +84,13 @@ int main(void)
#if defined(MBEDTLS_MD_C)
const char *crypto_so_filename = NULL;
void *crypto_so = dlopen(MBEDCRYPTO_SO_FILENAME, RTLD_NOW);
void *crypto_so = dlopen(TFPSACRYPTO_SO_FILENAME, RTLD_NOW);
if (dlerror() == NULL) {
crypto_so_filename = MBEDCRYPTO_SO_FILENAME;
} else {
crypto_so = dlopen(TFPSACRYPTO_SO_FILENAME, RTLD_NOW);
CHECK_DLERROR("dlopen", TFPSACRYPTO_SO_FILENAME);
crypto_so_filename = TFPSACRYPTO_SO_FILENAME;
} else {
crypto_so = dlopen(MBEDCRYPTO_SO_FILENAME, RTLD_NOW);
CHECK_DLERROR("dlopen", MBEDCRYPTO_SO_FILENAME);
crypto_so_filename = MBEDCRYPTO_SO_FILENAME;
}
#pragma GCC diagnostic push
/* dlsym() returns an object pointer which is meant to be used as a