-
Notifications
You must be signed in to change notification settings - Fork 671
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'mcu-tools:main' into bootutil-refacto-crypto-usage
Signed-off-by: Raphael Dupont <[email protected]>
- Loading branch information
Showing
44 changed files
with
916 additions
and
636 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2021 Arm Limited | ||
*/ | ||
|
||
#ifndef __BOOTUTIL_CRYPTO_COMMON_H__ | ||
#define __BOOTUTIL_CRYPTO_COMMON_H__ | ||
|
||
/* TODO May need to update this in a future 3.x version of Mbed TLS. | ||
* Extract a member of the mbedtls context structure. | ||
*/ | ||
#if MBEDTLS_VERSION_NUMBER >= 0x03000000 | ||
#define MBEDTLS_CONTEXT_MEMBER(X) MBEDTLS_PRIVATE(X) | ||
#else | ||
#define MBEDTLS_CONTEXT_MEMBER(X) X | ||
#endif | ||
|
||
#endif /* __BOOTUTIL_CRYPTO_COMMON_H__ */ | ||
/* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Copyright (c) 2021 Arm Limited | ||
*/ | ||
|
||
#ifndef __BOOTUTIL_CRYPTO_COMMON_H__ | ||
#define __BOOTUTIL_CRYPTO_COMMON_H__ | ||
|
||
/* TODO May need to update this in a future 3.x version of Mbed TLS. | ||
* Extract a member of the mbedtls context structure. | ||
*/ | ||
#if MBEDTLS_VERSION_NUMBER >= 0x03000000 | ||
#define MBEDTLS_CONTEXT_MEMBER(X) MBEDTLS_PRIVATE(X) | ||
#else | ||
#define MBEDTLS_CONTEXT_MEMBER(X) X | ||
#endif | ||
|
||
#endif /* __BOOTUTIL_CRYPTO_COMMON_H__ */ |
Oops, something went wrong.