yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Mark AEAD compatibility macros as deprecated

Browse source 
Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
This commit is contained in:
Bence Szépkúti 2021-03-08 15:30:27 +01:00
parent 670df7a41d
commit 30f91a4bca
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
include/psa/crypto_compat.h
View file

@ -285,10 +285,11 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key
* the ciphertext, return 0. * the ciphertext, return 0.
* If the AEAD algorithm is not recognized, return 0. * If the AEAD algorithm is not recognized, return 0.
*/ */
#define PSA_AEAD_TAG_LENGTH_1_ARG(alg) \ #define PSA_AEAD_TAG_LENGTH_1_ARG(alg) \
(PSA_ALG_IS_AEAD(alg) ? \ MBEDTLS_DEPRECATED_CONSTANT(size_t, \
(((alg) & PSA_ALG_AEAD_TAG_LENGTH_MASK) >> PSA_AEAD_TAG_LENGTH_OFFSET) : \ PSA_ALG_IS_AEAD(alg) ? \
0) (((alg) & PSA_ALG_AEAD_TAG_LENGTH_MASK) >> PSA_AEAD_TAG_LENGTH_OFFSET) : \
0)
/** The maximum size of the output of psa_aead_encrypt(), in bytes. /** The maximum size of the output of psa_aead_encrypt(), in bytes.
* *
@ -311,9 +312,10 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key
* If the AEAD algorithm is not recognized, return 0. * If the AEAD algorithm is not recognized, return 0.
*/ */
#define PSA_AEAD_ENCRYPT_OUTPUT_SIZE_2_ARG(alg, plaintext_length) \ #define PSA_AEAD_ENCRYPT_OUTPUT_SIZE_2_ARG(alg, plaintext_length) \
(PSA_AEAD_TAG_LENGTH_1_ARG(alg) != 0 ? \ MBEDTLS_DEPRECATED_CONSTANT(size_t, \
(plaintext_length) + PSA_AEAD_TAG_LENGTH_1_ARG(alg) : \ PSA_AEAD_TAG_LENGTH_1_ARG(alg) != 0 ? \
0) (plaintext_length) + PSA_AEAD_TAG_LENGTH_1_ARG(alg) : \
0)
/** The maximum size of the output of psa_aead_decrypt(), in bytes. /** The maximum size of the output of psa_aead_decrypt(), in bytes.
* *
@ -336,9 +338,10 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key
* If the AEAD algorithm is not recognized, return 0. * If the AEAD algorithm is not recognized, return 0.
*/ */
#define PSA_AEAD_DECRYPT_OUTPUT_SIZE_2_ARG(alg, ciphertext_length) \ #define PSA_AEAD_DECRYPT_OUTPUT_SIZE_2_ARG(alg, ciphertext_length) \
(PSA_AEAD_TAG_LENGTH_1_ARG(alg) != 0 ? \ MBEDTLS_DEPRECATED_CONSTANT(size_t, \
(ciphertext_length) - PSA_AEAD_TAG_LENGTH_1_ARG(alg) : \ PSA_AEAD_TAG_LENGTH_1_ARG(alg) != 0 ? \
0) (ciphertext_length) - PSA_AEAD_TAG_LENGTH_1_ARG(alg) : \
0)
/** A sufficient output buffer size for psa_aead_update(). /** A sufficient output buffer size for psa_aead_update().
* *
@ -365,9 +368,10 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key
* capable of this. So for modes based on a block cipher, allow the * capable of this. So for modes based on a block cipher, allow the
* implementation to delay the output until it has a full block. */ * implementation to delay the output until it has a full block. */
#define PSA_AEAD_UPDATE_OUTPUT_SIZE_2_ARG(alg, input_length) \ #define PSA_AEAD_UPDATE_OUTPUT_SIZE_2_ARG(alg, input_length) \
(PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \ MBEDTLS_DEPRECATED_CONSTANT(size_t, \
PSA_ROUND_UP_TO_MULTIPLE(PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE, (input_length)) : \ PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \
(input_length)) PSA_ROUND_UP_TO_MULTIPLE(PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE, (input_length)) : \
(input_length))
/** A sufficient ciphertext buffer size for psa_aead_finish(). /** A sufficient ciphertext buffer size for psa_aead_finish().
* *
@ -385,9 +389,10 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key
* If the AEAD algorithm is not recognized, return 0. * If the AEAD algorithm is not recognized, return 0.
*/ */
#define PSA_AEAD_FINISH_OUTPUT_SIZE_1_ARG(alg) \ #define PSA_AEAD_FINISH_OUTPUT_SIZE_1_ARG(alg) \
(PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \ MBEDTLS_DEPRECATED_CONSTANT(size_t, \
PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE : \ PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \
0) PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE : \
0)
/** A sufficient plaintext buffer size for psa_aead_verify(). /** A sufficient plaintext buffer size for psa_aead_verify().
* *
@ -405,9 +410,10 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key
* If the AEAD algorithm is not recognized, return 0. * If the AEAD algorithm is not recognized, return 0.
*/ */
#define PSA_AEAD_VERIFY_OUTPUT_SIZE_1_ARG(alg) \ #define PSA_AEAD_VERIFY_OUTPUT_SIZE_1_ARG(alg) \
(PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \ MBEDTLS_DEPRECATED_CONSTANT(size_t, \
PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE : \ PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \
0) PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE : \
0)
#endif /* MBEDTLS_DEPRECATED_REMOVED */ #endif /* MBEDTLS_DEPRECATED_REMOVED */