yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-06-29 11:29:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the SPM compatibility hack

Browse source 
Define psa_status_t to int32_t unconditionally. There's no reason to
refer to psa_error_t here: psa_error_t is int32_t if it's present. We
would only need a conditional definition if psa_defs.h and
psa_crypto.h used the same type name.

Keep the conditional definition of PSA_SUCCESS. Although the C
preprocessor allows a duplicate definition for a macro, it has to be
the exact same token sequence, not merely an equivalent way to build
the same value.
This commit is contained in:
Gilles Peskine 2018-12-20 20:09:04 +01:00
parent 1a76f3971c
commit 0344d8171d
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/psa/crypto.h
View file

@ -57,20 +57,6 @@ extern "C" {
* @{ * @{
*/ */
#if defined(PSA_SUCCESS)
/* If PSA_SUCCESS is defined, assume that PSA crypto is being used
* together with PSA IPC, which also defines the identifier
* PSA_SUCCESS. We must not define PSA_SUCCESS ourselves in that case;
* the other error code names don't clash. Also define psa_status_t as
* an alias for the type used by PSA IPC. This is a temporary hack
* until we unify error reporting in PSA IPC and PSA crypto.
*
* Note that psa_defs.h must be included before this header!
*/
typedef psa_error_t psa_status_t;
#else /* defined(PSA_SUCCESS) */
/** /**
* \brief Function return status. * \brief Function return status.
* *
@ -80,9 +66,17 @@ typedef psa_error_t psa_status_t;
*/ */
typedef int32_t psa_status_t; typedef int32_t psa_status_t;
#if !defined(PSA_SUCCESS)
/* If PSA_SUCCESS is defined, assume that PSA crypto is being used
* together with PSA IPC, which also defines the identifier
* PSA_SUCCESS. We must not define PSA_SUCCESS ourselves in that case;
* the other error code names don't clash. This is a temporary hack
* until we unify error reporting in PSA IPC and PSA crypto.
*
* Note that psa_defs.h must be included before this header!
*/
/** The action was completed successfully. */ /** The action was completed successfully. */
#define PSA_SUCCESS ((psa_status_t)0) #define PSA_SUCCESS ((psa_status_t)0)
#endif /* !defined(PSA_SUCCESS) */ #endif /* !defined(PSA_SUCCESS) */
/** An error occurred that does not correspond to any defined /** An error occurred that does not correspond to any defined