From 998760ae5db2330a6d2f09c4464cc47d2fe9b061 Mon Sep 17 00:00:00 2001 From: Felix Conway Date: Mon, 24 Mar 2025 11:37:33 +0000 Subject: [PATCH] Define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS in every sample program Add #define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS to every sample program before the first include so that mbedtls doesn't break with future privatization work. Signed-off-by: Felix Conway --- programs/aes/crypt_and_hash.c | 1 + programs/cipher/cipher_aead_demo.c | 2 ++ programs/fuzz/fuzz_client.c | 2 ++ programs/fuzz/fuzz_dtlsclient.c | 2 ++ programs/fuzz/fuzz_dtlsserver.c | 2 ++ programs/fuzz/fuzz_pkcs7.c | 2 ++ programs/fuzz/fuzz_privkey.c | 2 ++ programs/fuzz/fuzz_pubkey.c | 2 ++ programs/fuzz/fuzz_server.c | 2 ++ programs/fuzz/fuzz_x509crl.c | 2 ++ programs/fuzz/fuzz_x509crt.c | 2 ++ programs/fuzz/fuzz_x509csr.c | 2 ++ programs/fuzz/onefile.c | 2 ++ programs/hash/generic_sum.c | 2 ++ programs/hash/hello.c | 2 ++ programs/hash/md_hmac_demo.c | 2 ++ programs/pkey/dh_genprime.c | 2 ++ programs/pkey/ecdh_curve25519.c | 2 ++ programs/pkey/ecdsa.c | 2 ++ programs/pkey/gen_key.c | 2 ++ programs/pkey/key_app.c | 2 ++ programs/pkey/key_app_writer.c | 2 ++ programs/pkey/mpi_demo.c | 2 ++ programs/pkey/pk_decrypt.c | 2 ++ programs/pkey/pk_encrypt.c | 2 ++ programs/pkey/pk_sign.c | 2 ++ programs/pkey/pk_verify.c | 2 ++ programs/pkey/rsa_decrypt.c | 2 ++ programs/pkey/rsa_encrypt.c | 2 ++ programs/pkey/rsa_genkey.c | 2 ++ programs/pkey/rsa_sign.c | 2 ++ programs/pkey/rsa_sign_pss.c | 2 ++ programs/pkey/rsa_verify.c | 2 ++ programs/pkey/rsa_verify_pss.c | 2 ++ programs/random/gen_entropy.c | 2 ++ programs/random/gen_random_ctr_drbg.c | 2 ++ programs/ssl/dtls_client.c | 2 ++ programs/ssl/dtls_server.c | 2 ++ programs/ssl/mini_client.c | 2 ++ programs/ssl/ssl_client1.c | 2 ++ programs/ssl/ssl_context_info.c | 2 ++ programs/ssl/ssl_fork_server.c | 2 ++ programs/ssl/ssl_mail_client.c | 2 ++ programs/ssl/ssl_pthread_server.c | 2 ++ programs/ssl/ssl_server.c | 2 ++ programs/test/cmake_package/cmake_package.c | 2 ++ programs/test/cmake_package_install/cmake_package_install.c | 2 ++ programs/test/cmake_subproject/cmake_subproject.c | 2 ++ programs/test/dlopen.c | 2 ++ programs/test/selftest.c | 2 ++ programs/test/udp_proxy.c | 2 ++ programs/util/pem2der.c | 2 ++ programs/util/strerror.c | 2 ++ programs/wince_main.c | 2 ++ programs/x509/cert_app.c | 2 ++ programs/x509/cert_req.c | 2 ++ programs/x509/cert_write.c | 2 ++ programs/x509/crl_app.c | 2 ++ programs/x509/load_roots.c | 2 ++ programs/x509/req_app.c | 2 ++ 60 files changed, 119 insertions(+) diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c index b2cd70471..e3bfb3c61 100644 --- a/programs/aes/crypt_and_hash.c +++ b/programs/aes/crypt_and_hash.c @@ -10,6 +10,7 @@ * set before mbedtls_config.h, which pulls in glibc's features.h indirectly. * Harmless on other platforms. */ #define _POSIX_C_SOURCE 200112L +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS #include "mbedtls/build_info.h" diff --git a/programs/cipher/cipher_aead_demo.c b/programs/cipher/cipher_aead_demo.c index 83fcce587..533af34fc 100644 --- a/programs/cipher/cipher_aead_demo.c +++ b/programs/cipher/cipher_aead_demo.c @@ -31,6 +31,8 @@ /* First include Mbed TLS headers to get the Mbed TLS configuration and * platform definitions that we'll use in this program. Also include * standard C headers for functions we'll use here. */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/cipher.h" diff --git a/programs/fuzz/fuzz_client.c b/programs/fuzz/fuzz_client.c index 07ca96efa..209422399 100644 --- a/programs/fuzz/fuzz_client.c +++ b/programs/fuzz/fuzz_client.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/ssl.h" #include "mbedtls/entropy.h" #include "mbedtls/ctr_drbg.h" diff --git a/programs/fuzz/fuzz_dtlsclient.c b/programs/fuzz/fuzz_dtlsclient.c index 6581dcb1e..e667d8b3d 100644 --- a/programs/fuzz/fuzz_dtlsclient.c +++ b/programs/fuzz/fuzz_dtlsclient.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include #include diff --git a/programs/fuzz/fuzz_dtlsserver.c b/programs/fuzz/fuzz_dtlsserver.c index d215f7ac7..404c4ad30 100644 --- a/programs/fuzz/fuzz_dtlsserver.c +++ b/programs/fuzz/fuzz_dtlsserver.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include #include diff --git a/programs/fuzz/fuzz_pkcs7.c b/programs/fuzz/fuzz_pkcs7.c index 38b4dc139..9ec935179 100644 --- a/programs/fuzz/fuzz_pkcs7.c +++ b/programs/fuzz/fuzz_pkcs7.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include "mbedtls/pkcs7.h" #include "common.h" diff --git a/programs/fuzz/fuzz_privkey.c b/programs/fuzz/fuzz_privkey.c index 753096406..1a5fbba9a 100644 --- a/programs/fuzz/fuzz_privkey.c +++ b/programs/fuzz/fuzz_privkey.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include #include diff --git a/programs/fuzz/fuzz_pubkey.c b/programs/fuzz/fuzz_pubkey.c index b2500e57c..69e85e038 100644 --- a/programs/fuzz/fuzz_pubkey.c +++ b/programs/fuzz/fuzz_pubkey.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include #include "mbedtls/pk.h" diff --git a/programs/fuzz/fuzz_server.c b/programs/fuzz/fuzz_server.c index 09436542e..64fe32d26 100644 --- a/programs/fuzz/fuzz_server.c +++ b/programs/fuzz/fuzz_server.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/ssl.h" #include "mbedtls/entropy.h" #include "mbedtls/ctr_drbg.h" diff --git a/programs/fuzz/fuzz_x509crl.c b/programs/fuzz/fuzz_x509crl.c index e8dacd90b..2840fbbb0 100644 --- a/programs/fuzz/fuzz_x509crl.c +++ b/programs/fuzz/fuzz_x509crl.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include "mbedtls/x509_crl.h" #include "common.h" diff --git a/programs/fuzz/fuzz_x509crt.c b/programs/fuzz/fuzz_x509crt.c index 74d3b077c..29331b94d 100644 --- a/programs/fuzz/fuzz_x509crt.c +++ b/programs/fuzz/fuzz_x509crt.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include "mbedtls/x509_crt.h" #include "common.h" diff --git a/programs/fuzz/fuzz_x509csr.c b/programs/fuzz/fuzz_x509csr.c index 4c123f8e0..e0aaabc01 100644 --- a/programs/fuzz/fuzz_x509csr.c +++ b/programs/fuzz/fuzz_x509csr.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include "mbedtls/x509_csr.h" #include "common.h" diff --git a/programs/fuzz/onefile.c b/programs/fuzz/onefile.c index 2d4330abc..6c02a641d 100644 --- a/programs/fuzz/onefile.c +++ b/programs/fuzz/onefile.c @@ -1,3 +1,5 @@ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include #include #include diff --git a/programs/hash/generic_sum.c b/programs/hash/generic_sum.c index 3fd2b0089..ac776deb8 100644 --- a/programs/hash/generic_sum.c +++ b/programs/hash/generic_sum.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/hash/hello.c b/programs/hash/hello.c index 8caae8851..19408f37f 100644 --- a/programs/hash/hello.c +++ b/programs/hash/hello.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/hash/md_hmac_demo.c b/programs/hash/md_hmac_demo.c index 494e9efaa..0fe0700ce 100644 --- a/programs/hash/md_hmac_demo.c +++ b/programs/hash/md_hmac_demo.c @@ -26,6 +26,8 @@ /* First include Mbed TLS headers to get the Mbed TLS configuration and * platform definitions that we'll use in this program. Also include * standard C headers for functions we'll use here. */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/md.h" diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c index 6872e61e3..ebaf9265f 100644 --- a/programs/pkey/dh_genprime.c +++ b/programs/pkey/dh_genprime.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/ecdh_curve25519.c b/programs/pkey/ecdh_curve25519.c index fedfcc9fe..952d487c9 100644 --- a/programs/pkey/ecdh_curve25519.c +++ b/programs/pkey/ecdh_curve25519.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/ecdsa.c b/programs/pkey/ecdsa.c index 5664b8c4e..a4988b0b4 100644 --- a/programs/pkey/ecdsa.c +++ b/programs/pkey/ecdsa.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/gen_key.c b/programs/pkey/gen_key.c index 99999c7a5..f1ed51124 100644 --- a/programs/pkey/gen_key.c +++ b/programs/pkey/gen_key.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c index d01aa8852..b06407801 100644 --- a/programs/pkey/key_app.c +++ b/programs/pkey/key_app.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c index d34cbe1fb..b9b477b83 100644 --- a/programs/pkey/key_app_writer.c +++ b/programs/pkey/key_app_writer.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c index e83aa3259..a9c3190bf 100644 --- a/programs/pkey/mpi_demo.c +++ b/programs/pkey/mpi_demo.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/pk_decrypt.c b/programs/pkey/pk_decrypt.c index 3dbfde02b..a7b9001fc 100644 --- a/programs/pkey/pk_decrypt.c +++ b/programs/pkey/pk_decrypt.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/pk_encrypt.c b/programs/pkey/pk_encrypt.c index a3a7c1b4d..28a849b38 100644 --- a/programs/pkey/pk_encrypt.c +++ b/programs/pkey/pk_encrypt.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c index c1640d66a..af5258320 100644 --- a/programs/pkey/pk_sign.c +++ b/programs/pkey/pk_sign.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c index 7b88cabf8..8ae612bdf 100644 --- a/programs/pkey/pk_verify.c +++ b/programs/pkey/pk_verify.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c index a84af50d7..c2c313ac1 100644 --- a/programs/pkey/rsa_decrypt.c +++ b/programs/pkey/rsa_decrypt.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c index 6538f8a99..e1ed252bb 100644 --- a/programs/pkey/rsa_encrypt.c +++ b/programs/pkey/rsa_encrypt.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c index dc58215f7..3dfa8529e 100644 --- a/programs/pkey/rsa_genkey.c +++ b/programs/pkey/rsa_genkey.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index 0e32e13d9..e88e4e33b 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c index 430536a55..e4f27f337 100644 --- a/programs/pkey/rsa_sign_pss.c +++ b/programs/pkey/rsa_sign_pss.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index e3f32bb4d..af6156cdb 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c index 4b5336d70..2bb140fe4 100644 --- a/programs/pkey/rsa_verify_pss.c +++ b/programs/pkey/rsa_verify_pss.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/random/gen_entropy.c b/programs/random/gen_entropy.c index 887b2c988..eb85b6269 100644 --- a/programs/random/gen_entropy.c +++ b/programs/random/gen_entropy.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/random/gen_random_ctr_drbg.c b/programs/random/gen_random_ctr_drbg.c index 0eecf0ad4..793c8ac88 100644 --- a/programs/random/gen_random_ctr_drbg.c +++ b/programs/random/gen_random_ctr_drbg.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c index f7f417f74..3277e525f 100644 --- a/programs/ssl/dtls_client.c +++ b/programs/ssl/dtls_client.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/ssl/dtls_server.c b/programs/ssl/dtls_server.c index e881c91ae..d1c2a8c1c 100644 --- a/programs/ssl/dtls_server.c +++ b/programs/ssl/dtls_server.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/ssl/mini_client.c b/programs/ssl/mini_client.c index cac630e29..39d07ab37 100644 --- a/programs/ssl/mini_client.c +++ b/programs/ssl/mini_client.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c index a6ab8587b..bd2572bc2 100644 --- a/programs/ssl/ssl_client1.c +++ b/programs/ssl/ssl_client1.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c index cbe9c6dcc..63391cd01 100644 --- a/programs/ssl/ssl_context_info.c +++ b/programs/ssl/ssl_context_info.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/debug.h" #include "mbedtls/platform.h" diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c index 1bd18c1f1..b9598585b 100644 --- a/programs/ssl/ssl_fork_server.c +++ b/programs/ssl/ssl_fork_server.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c index bdeef9b65..d3354caf7 100644 --- a/programs/ssl/ssl_mail_client.c +++ b/programs/ssl/ssl_mail_client.c @@ -11,6 +11,8 @@ #define _POSIX_C_SOURCE 200112L #define _XOPEN_SOURCE 600 +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c index d8213cb14..a1c583aab 100644 --- a/programs/ssl/ssl_pthread_server.c +++ b/programs/ssl/ssl_pthread_server.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c index 9a90d1d44..4b101d39a 100644 --- a/programs/ssl/ssl_server.c +++ b/programs/ssl/ssl_server.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/test/cmake_package/cmake_package.c b/programs/test/cmake_package/cmake_package.c index 729800ad8..f7d5230f4 100644 --- a/programs/test/cmake_package/cmake_package.c +++ b/programs/test/cmake_package/cmake_package.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/test/cmake_package_install/cmake_package_install.c b/programs/test/cmake_package_install/cmake_package_install.c index 44a2adadf..fb68883fe 100644 --- a/programs/test/cmake_package_install/cmake_package_install.c +++ b/programs/test/cmake_package_install/cmake_package_install.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/test/cmake_subproject/cmake_subproject.c b/programs/test/cmake_subproject/cmake_subproject.c index 8b4f18e28..efab78955 100644 --- a/programs/test/cmake_subproject/cmake_subproject.c +++ b/programs/test/cmake_subproject/cmake_subproject.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/test/dlopen.c b/programs/test/dlopen.c index 3a0f37d4b..ec4ee7ea7 100644 --- a/programs/test/dlopen.c +++ b/programs/test/dlopen.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/test/selftest.c b/programs/test/selftest.c index 41252b6e4..546716f12 100644 --- a/programs/test/selftest.c +++ b/programs/test/selftest.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/entropy.h" diff --git a/programs/test/udp_proxy.c b/programs/test/udp_proxy.c index 43d2e8cf7..6e9ebf9a2 100644 --- a/programs/test/udp_proxy.c +++ b/programs/test/udp_proxy.c @@ -12,6 +12,8 @@ */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #if defined(MBEDTLS_PLATFORM_C) diff --git a/programs/util/pem2der.c b/programs/util/pem2der.c index 177365b87..9515ed43d 100644 --- a/programs/util/pem2der.c +++ b/programs/util/pem2der.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/util/strerror.c b/programs/util/strerror.c index 316f28614..e20bed6e8 100644 --- a/programs/util/strerror.c +++ b/programs/util/strerror.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/wince_main.c b/programs/wince_main.c index e817b9f5f..de1116229 100644 --- a/programs/wince_main.c +++ b/programs/wince_main.c @@ -7,6 +7,8 @@ #if defined(_WIN32_WCE) +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include extern int main(int, const char **); diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c index cb1e5bc4e..1de439ce8 100644 --- a/programs/x509/cert_app.c +++ b/programs/x509/cert_app.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c index 0dc4c971c..1be335c0a 100644 --- a/programs/x509/cert_req.c +++ b/programs/x509/cert_req.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index b15e2818c..5993f2465 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/x509/crl_app.c b/programs/x509/crl_app.c index 5e3fd5a94..fee8b693c 100644 --- a/programs/x509/crl_app.c +++ b/programs/x509/crl_app.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/x509/load_roots.c b/programs/x509/load_roots.c index d14537fd4..2ae7c9b01 100644 --- a/programs/x509/load_roots.c +++ b/programs/x509/load_roots.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h" diff --git a/programs/x509/req_app.c b/programs/x509/req_app.c index fff0983f0..2929d687d 100644 --- a/programs/x509/req_app.c +++ b/programs/x509/req_app.c @@ -5,6 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ +#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS + #include "mbedtls/build_info.h" #include "mbedtls/platform.h"