ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10041 from netanelgonen/Fix_include_mbedtls 

Fix include in psa compliance tests to mbedtls config file
pull/10046/head
Cruz Monrreal 2019-03-11 19:19:40 -05:00 committed by GitHub
parent bf6e6ee6d9 0f5147c8b9
commit 1471b4c130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/frameworks/TARGET_PSA/pal/pal_crypto_config.h
View File

@ -27,11 +27,7 @@
#ifndef _PAL_CRYPTO_CONFIG_H_ #ifndef _PAL_CRYPTO_CONFIG_H_
#define _PAL_CRYPTO_CONFIG_H_ #define _PAL_CRYPTO_CONFIG_H_
#if !defined(MBEDTLS_CONFIG_FILE) #include "mbedtls/config.h"
#include "config.h"
#else
#include MBEDTLS_CONFIG_FILE
#endif
/** /**
* \def ARCH_TEST_RSA * \def ARCH_TEST_RSA
@ -408,4 +404,4 @@
#include "pal_crypto_config_check.h" #include "pal_crypto_config_check.h"
#endif /* _PAL_CRYPTO_CONFIG_H_ */ #endif

3
tools/importer/psa_compliance_importer.json
View File

@ -316,7 +316,8 @@
"1650a923eb6f79051544b2c57fb72140eaae4f65", "1650a923eb6f79051544b2c57fb72140eaae4f65",
"2982907e37b695d9dee9db7026a3ae0ecbd04451", "2982907e37b695d9dee9db7026a3ae0ecbd04451",
"16a59cb9926bc96792cc9d1b7a996689f7bf1b86", "16a59cb9926bc96792cc9d1b7a996689f7bf1b86",
"c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b" "c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b",
"053e07b6dc7a2db6c4225e082e3ddb118aade882"
] ]
} }