mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-10-17 14:27:25 +00:00
Move the inclusion of crypto_sizes.h and crypto_struct.h in crypto.h
That way when API are declared, the types they use are defined. This should resolve the issues related to psa_xyz_init functions returning a structure described in #7087. Signed-off-by: Ronald Cron <[email protected]>
This commit is contained in:
+12
-12
@@ -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"
|
||||||
|
|||||||
Reference in New Issue
Block a user