mirror of
https://github.com/Mbed-TLS/mbedtls-framework.git
synced 2026-07-28 14:57:46 +00:00
Changed the private header preprocessor condition, so that the old (non-private) path is only taken in case of mbedtls 3.6
Signed-off-by: Anton Matkin <[email protected]>
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
|
||||
#if defined(MBEDTLS_BIGNUM_C)
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include <mbedtls/private/bignum.h>
|
||||
#else
|
||||
#include <mbedtls/bignum.h>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <psa/crypto_driver_common.h>
|
||||
#include <psa/crypto.h>
|
||||
|
||||
#if MBEDTLS_MAJOR_VERSION >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include "mbedtls/private/cipher.h"
|
||||
#else
|
||||
#include "mbedtls/cipher.h"
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
#if defined(MBEDTLS_BIGNUM_C)
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include "mbedtls/private/bignum.h"
|
||||
#else
|
||||
#include "mbedtls/bignum.h"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
#include <psa/crypto.h>
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include <mbedtls/private/ctr_drbg.h>
|
||||
#else
|
||||
#include <mbedtls/ctr_drbg.h>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include <mbedtls/private/bignum.h>
|
||||
#else
|
||||
#include <mbedtls/bignum.h>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#if defined(PSA_CRYPTO_DRIVER_TEST)
|
||||
#include "psa/crypto.h"
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include "mbedtls/private/rsa.h"
|
||||
#else
|
||||
#include "mbedtls/rsa.h"
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "psa_crypto_cipher.h"
|
||||
#include "psa_crypto_core.h"
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include "mbedtls/private/cipher.h"
|
||||
#else
|
||||
#include "mbedtls/cipher.h"
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "psa_crypto_rsa.h"
|
||||
#include "psa_crypto_ffdh.h"
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include "mbedtls/private/ecp.h"
|
||||
#else
|
||||
#include "mbedtls/ecp.h"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "psa_crypto_hash.h"
|
||||
#include "psa_crypto_rsa.h"
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include "mbedtls/private/ecp.h"
|
||||
#else
|
||||
#include "mbedtls/ecp.h"
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "test/drivers/signature.h"
|
||||
#include "test/drivers/hash.h"
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include "mbedtls/private/ecdsa.h"
|
||||
#else
|
||||
#include "mbedtls/ecdsa.h"
|
||||
|
||||
@@ -59,7 +59,7 @@ psa_status_t mbedtls_psa_external_get_random(
|
||||
|
||||
#include <test/random.h>
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include <mbedtls/private/entropy.h>
|
||||
#else
|
||||
#include <mbedtls/entropy.h>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <test/psa_crypto_helpers.h>
|
||||
|
||||
#if defined(MBEDTLS_CTR_DRBG_C)
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include <mbedtls/private/ctr_drbg.h>
|
||||
#else
|
||||
#include <mbedtls/ctr_drbg.h>
|
||||
@@ -253,7 +253,7 @@ exit:
|
||||
|
||||
#if defined(MBEDTLS_PSA_INJECT_ENTROPY)
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include <mbedtls/private/entropy.h>
|
||||
#else
|
||||
#include <mbedtls/entropy.h>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#endif
|
||||
#if defined(MBEDTLS_ECP_C)
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include <mbedtls/private/ecp.h>
|
||||
#else
|
||||
#include <mbedtls/ecp.h>
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
#include <test/random.h>
|
||||
#include <string.h>
|
||||
|
||||
#if MBEDTLS_VERSION_MAJOR >= 4
|
||||
#if !defined(MBEDTLS_VERSION_MAJOR) || MBEDTLS_VERSION_MAJOR >= 4
|
||||
#include <mbedtls/private/entropy.h>
|
||||
#else
|
||||
#include <mbedtls/entropy.h>
|
||||
|
||||
Reference in New Issue
Block a user