Skip to content

Remove macro MBEDTLS_PSA_CRYPTO_C from PSA targets #10888

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

Jump to bottom
Merged
merged 2 commits into from
Jun 27, 2019
Merged

Remove macro MBEDTLS_PSA_CRYPTO_C from PSA targets #10888

merged 2 commits into from
Jun 27, 2019

Conversation

urutva
Copy link
Contributor

@urutva urutva commented Jun 24, 2019

Description

  1. Include MBEDTLS_CONFIG_FILE before evaluating MBEDTLS_PSA_CRYPTO_C
  2. Remove macro MBEDTLS_PSA_CRYPTO_C from PSA targets

Fixes #10883

Signed-off-by: Devaraj Ranganna [email protected]

Pull request type

[x ] Fix
[ ] Refactor
[x ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@Patater

Release Notes

@urutva
1. Include MBEDTLS_CONFIG_FILE before evaluating MBEDTLS_PSA_CRYPTO_C
cb8f2c0 
2. Remove macro MBEDTLS_PSA_CRYPTO_C from PSA targets

Signed-off-by: Devaraj Ranganna <[email protected]>
@ciarmcom ciarmcom requested review from Patater and a team June 24, 2019 15:00
@ciarmcom
Copy link
Member

@Devran01, thank you for your changes.
@Patater @ARMmbed/mbed-os-maintainers please review.

Patater
Patater suggested changes Jun 24, 2019
View reviewed changes
Copy link
Contributor

@Patater Patater left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Could we remove MBEDTLS_PSA_CRYPTO_C from the NS targets as well (e.g. LPC55S69_NS)?

@urutva
Copy link
Contributor Author

urutva commented Jun 25, 2019

@Patater done.

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 26, 2019

Can we get this to 5.13.1 ? I'll label it as such and would like to start CI soon

Patater
Patater approved these changes Jun 26, 2019
View reviewed changes
Copy link
Contributor

@Patater Patater left a comment

Choose a reason for hiding this comment

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

LGTM

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 26, 2019

Ci started

@mbed-ci
Copy link

mbed-ci commented Jun 26, 2019

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 1
Build artifacts

@0xc0170 0xc0170 merged commit d4aab56 into ARMmbed:master Jun 27, 2019
@urutva urutva deleted the issue/10883 branch July 2, 2019 08:14
@jeromecoutant
Copy link
Collaborator

Hi @Devran01

Since this PR, 4 tests are now skipped:

  • tests-psa-attestation
  • tests-psa-crypto_access_control
  • tests-psa-crypto_init
  • tests-mbed-crypto-sanity

Tests need to be updated ?
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))

@Patater
Copy link
Contributor

Patater commented Jul 4, 2019

@jeromecoutant Nice catch! Looks like those tests need to #include "mbedtls/config.h"

@0xc0170
Copy link
Contributor

0xc0170 commented Jul 4, 2019

@Devran01 Please fix

@urutva urutva mentioned this pull request Jul 4, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Patater Patater Patater approved these changes

@0xc0170 0xc0170 0xc0170 approved these changes

Assignees
No one assigned
Labels
release-version: 5.13.1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

TFM/PSA: compilation warning with MBEDTLS_PSA_CRYPTO_C
6 participants
@urutva @ciarmcom @0xc0170 @mbed-ci @jeromecoutant @Patater