Changing "common.h" to "mbedcrypto_common.h" to avoid file-name collisions #38
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-Reverted done because /library/common.h is used here but it is intended to be changed in a coming commit This reverts commit 51a390f. Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-Changing all instances of #include "common.h" to #include "mbedcrypto_common.h" to prevent collitions -Changing the name of common.h to mbedcrypto_common.h -Mbed TLS uses the file name "common.h" for common settings relevant for build. Unfortunately common.h is not guarded with any folder-structure as this is an internal file that is present in the folder where source-files resides. Due to the way that zephyr adds include-folders it will be difficult to prevent someone coming up with the same name and adding the include-folder earlier than Mbed TLS. Note: This change will be proposed upstream in Mbed TLS with the hope that this commit is can be reverted Signed-off-by: Frank Audun Kvamtrø <[email protected]> (cherry picked from commit fcf3eac94f406fee639a4e456ece15b86c8669b2)
The Oberon PSA core has some replacement headers but it also uses headers from the library folder. Since the headers and the C files in this folder perform inclusion with double quotes this can create issues since the Oberon PSA core may use headrs from this repo that it shouldn't. This moves the headers that the Oberon PSA core replaces with to another folder so that they don't accidentaly included from the Oberon PSA core. Note that mbedcrypto_common.h is not moved Signed-off-by: Georgios Vasilakis <[email protected]> Signed-off-by: Frank Audun Kvamtrø <[email protected]>
frkv
force-pushed
the
mbedcrypto_common
branch
from
9522f3e to
716eeea
Compare
tomi-font
approved these changes
Jan 23, 2025
degjorva
approved these changes
Jan 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pulling in a [nrf fromlist] that removes issues of the wrong common.h being picked up when trying to build Zephyr with Mbed TLS/Oberon-psa-core
The relevant commit is the top one
[nrf noup] Move headers found in Oberon PSA core
The Oberon PSA core has some replacement headers but it also
uses headers from the library folder. Since the headers and the
C files in this folder perform inclusion with double quotes this
can create issues since the Oberon PSA core may use headrs from
this repo that it shouldn't.
This moves the headers that the Oberon PSA core replaces with
to another folder so that they don't accidentaly included from the
Oberon PSA core.
Note that mbedcrypto_common.h is not moved
Signed-off-by: Frank Audun Kvamtrø [email protected]