Skip to content

Commit 1471b4c

Browse files
author
Cruz Monrreal
authored
Merge pull request #10041 from netanelgonen/Fix_include_mbedtls
Fix include in psa compliance tests to mbedtls config file
2 parents bf6e6ee + 0f5147c commit 1471b4c

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

features/frameworks/TARGET_PSA/pal/pal_crypto_config.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,7 @@
2727
#ifndef _PAL_CRYPTO_CONFIG_H_
2828
#define _PAL_CRYPTO_CONFIG_H_
2929

30-
#if !defined(MBEDTLS_CONFIG_FILE)
31-
#include "config.h"
32-
#else
33-
#include MBEDTLS_CONFIG_FILE
34-
#endif
30+
#include "mbedtls/config.h"
3531

3632
/**
3733
* \def ARCH_TEST_RSA
@@ -408,4 +404,4 @@
408404

409405
#include "pal_crypto_config_check.h"
410406

411-
#endif /* _PAL_CRYPTO_CONFIG_H_ */
407+
#endif

tools/importer/psa_compliance_importer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,8 @@
316316
"1650a923eb6f79051544b2c57fb72140eaae4f65",
317317
"2982907e37b695d9dee9db7026a3ae0ecbd04451",
318318
"16a59cb9926bc96792cc9d1b7a996689f7bf1b86",
319-
"c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b"
319+
"c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b",
320+
"053e07b6dc7a2db6c4225e082e3ddb118aade882"
320321

321322
]
322323
}

0 commit comments

Comments
 (0)