Skip to content

Fix include in psa compliance tests to mbedtls config file #10041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 12, 2019
Merged

Fix include in psa compliance tests to mbedtls config file #10041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
053e07b
change the include to mbedtls/config.h
Mar 11, 2019
24244b5
update crypto complience tests importer, fix include to mbedtls config
Mar 11, 2019
0f5147c
remove hidden tad
Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions features/frameworks/TARGET_PSA/pal/pal_crypto_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@
#ifndef _PAL_CRYPTO_CONFIG_H_
#define _PAL_CRYPTO_CONFIG_H_

#if !defined(MBEDTLS_CONFIG_FILE)
#include "config.h"
#else
#include MBEDTLS_CONFIG_FILE
#endif
#include "mbedtls/config.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are two changes here:

  1. change default header file include path
  2. remove an option to override this file from app sources

I'm fine with the first one, the second one is not clear to me.
What is the reason for removing the ability to use custom config file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

part 2 is actually made inside part 1
mbedtls overwriting the file, we should not do this.


/**
* \def ARCH_TEST_RSA
Expand Down Expand Up @@ -408,4 +404,4 @@

#include "pal_crypto_config_check.h"

#endif /* _PAL_CRYPTO_CONFIG_H_ */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the reason for this change?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug in the code, user config should augment the mbedtls one not replace it

#endif
3 changes: 2 additions & 1 deletion tools/importer/psa_compliance_importer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,8 @@
"1650a923eb6f79051544b2c57fb72140eaae4f65",
"2982907e37b695d9dee9db7026a3ae0ecbd04451",
"16a59cb9926bc96792cc9d1b7a996689f7bf1b86",
"c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b"
"c437c9f0b80a3f4177a23a2a6f2399d9e8bd162b",
"053e07b6dc7a2db6c4225e082e3ddb118aade882"

]
}