ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-07-12 19:18:57 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10196 from ronald-cron-arm/move-crypto-struct-inclusion

Browse Source 
[Backport 3.6] Move the inclusion of crypto_sizes.h and crypto_struct.h in crypto.h
This commit is contained in:
David Horstmann 2025-05-28 15:51:09 +00:00 committed by GitHub
commit 23a0d48d1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.d/move-crypto-struct-inclusion.txt Normal file
View File

@ -0,0 +1,3 @@
Bugfix
* Resolved build issue with C++ projects using TF-PSA-Crypto when compiling
with the MSVC toolset v142 and earlier. Fixes mbedtls issue #7087.

24
include/psa/crypto.h
View File

@ -59,6 +59,18 @@ extern "C" {
* of integral types defined in "crypto_types.h". */ * of integral types defined in "crypto_types.h". */
#include "crypto_values.h" #include "crypto_values.h"
/* The file "crypto_sizes.h" contains definitions for size calculation
* macros whose definitions are implementation-specific. */
#include "crypto_sizes.h"
/* The file "crypto_struct.h" contains definitions for
* implementation-specific structs that are declared above. */
#if defined(MBEDTLS_PSA_CRYPTO_STRUCT_FILE)
#include MBEDTLS_PSA_CRYPTO_STRUCT_FILE
#else
#include "crypto_struct.h"
#endif
/** \defgroup initialization Library initialization /** \defgroup initialization Library initialization
* @{ * @{
*/ */
@ -4958,18 +4970,6 @@ psa_status_t psa_verify_hash_abort(
} }
#endif #endif
/* The file "crypto_sizes.h" contains definitions for size calculation
* macros whose definitions are implementation-specific. */
#include "crypto_sizes.h"
/* The file "crypto_struct.h" contains definitions for
* implementation-specific structs that are declared above. */
#if defined(MBEDTLS_PSA_CRYPTO_STRUCT_FILE)
#include MBEDTLS_PSA_CRYPTO_STRUCT_FILE
#else
#include "crypto_struct.h"
#endif
/* The file "crypto_extra.h" contains vendor-specific definitions. This /* The file "crypto_extra.h" contains vendor-specific definitions. This
* can include vendor-defined algorithms, extra functions, etc. */ * can include vendor-defined algorithms, extra functions, etc. */
#include "crypto_extra.h" #include "crypto_extra.h"