Skip to content

Commit 7ead3fe

Browse files
committed
Include psa/crypto.h instead of mbedtls/config.h.
Signed-off-by: Devaraj Ranganna <[email protected]>
1 parent 6e590cd commit 7ead3fe

File tree

4 files changed

+4
-23
lines changed

4 files changed

+4
-23
lines changed

TESTS/mbed-crypto/sanity/main.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
#if !defined(MBEDTLS_CONFIG_FILE)
19-
#include "mbedtls/config.h"
20-
#else
21-
#include MBEDTLS_CONFIG_FILE
22-
#endif
18+
#include "psa/crypto.h"
2319

2420
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
2521
#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
@@ -30,7 +26,6 @@
3026
#include "greentea-client/test_env.h"
3127
#include "unity.h"
3228
#include "utest.h"
33-
#include "psa/crypto.h"
3429
#include "entropy.h"
3530
#include "entropy_poll.h"
3631

TESTS/psa/attestation/main.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
#if !defined(MBEDTLS_CONFIG_FILE)
20-
#include "mbedtls/config.h"
21-
#else
22-
#include MBEDTLS_CONFIG_FILE
23-
#endif
19+
#include "psa/crypto.h"
2420

2521
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
2622
#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.

TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
#if !defined(MBEDTLS_CONFIG_FILE)
19-
#include "mbedtls/config.h"
20-
#else
21-
#include MBEDTLS_CONFIG_FILE
22-
#endif
18+
#include "psa/crypto.h"
2319

2420
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)) || (!defined(COMPONENT_PSA_SRV_IPC)))
2521
#error [NOT_SUPPORTED] These tests can run only on SPM-enabled targets and where Mbed Crypto is ON - skipping.
@@ -30,7 +26,6 @@
3026
#include "greentea-client/test_env.h"
3127
#include "unity.h"
3228
#include "utest.h"
33-
#include "psa/crypto.h"
3429
#include "entropy.h"
3530
#include "entropy_poll.h"
3631
#include "test_partition_proxy.h"

TESTS/psa/crypto_init/main.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
* limitations under the License.
1717
*/
1818

19-
#if !defined(MBEDTLS_CONFIG_FILE)
20-
#include "mbedtls/config.h"
21-
#else
22-
#include MBEDTLS_CONFIG_FILE
23-
#endif
19+
#include "psa/crypto.h"
2420

2521
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
2622
#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
@@ -29,7 +25,6 @@
2925
#include "greentea-client/test_env.h"
3026
#include "unity/unity.h"
3127
#include "utest/utest.h"
32-
#include "crypto.h"
3328
#include "entropy.h"
3429
#include "entropy_poll.h"
3530

0 commit comments

Comments
 (0)