mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-02-03 11:54:02 +00:00
Remove PSA AEAD output size compatibility macros
Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
This commit is contained in:
Bence Szépkúti
parent
58d8518eb1
commit
da95ef9ae0
@ -3,10 +3,3 @@ API changes
|
|||||||
API version 1.0 spec. This version of the spec parameterizes them on the
|
API version 1.0 spec. This version of the spec parameterizes them on the
|
||||||
key type used, as well as the key bit-size in the case of
|
key type used, as well as the key bit-size in the case of
|
||||||
PSA_AEAD_TAG_LENGTH.
|
PSA_AEAD_TAG_LENGTH.
|
||||||
The old versions of these macros were renamed and deprecated as follows:
|
|
||||||
- PSA_AEAD_TAG_LENGTH -> PSA_AEAD_TAG_LENGTH_1_ARG
|
|
||||||
- PSA_AEAD_ENCRYPT_OUTPUT_SIZE -> PSA_AEAD_ENCRYPT_OUTPUT_SIZE_2_ARG
|
|
||||||
- PSA_AEAD_DECRYPT_OUTPUT_SIZE -> PSA_AEAD_DECRYPT_OUTPUT_SIZE_2_ARG
|
|
||||||
- PSA_AEAD_UPDATE_OUTPUT_SIZE -> PSA_AEAD_UPDATE_OUTPUT_SIZE_2_ARG
|
|
||||||
- PSA_AEAD_FINISH_OUTPUT_SIZE -> PSA_AEAD_FINISH_OUTPUT_SIZE_1_ARG
|
|
||||||
- PSA_AEAD_VERIFY_OUTPUT_SIZE -> PSA_AEAD_VERIFY_OUTPUT_SIZE_1_ARG
|
|
||||||
|
|||||||
@ -269,153 +269,6 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key
|
|||||||
#define PSA_ALG_AEAD_WITH_TAG_LENGTH( aead_alg, tag_length ) \
|
#define PSA_ALG_AEAD_WITH_TAG_LENGTH( aead_alg, tag_length ) \
|
||||||
MBEDTLS_DEPRECATED_CONSTANT( psa_algorithm_t, PSA_ALG_AEAD_WITH_SHORTENED_TAG( aead_alg, tag_length ) )
|
MBEDTLS_DEPRECATED_CONSTANT( psa_algorithm_t, PSA_ALG_AEAD_WITH_SHORTENED_TAG( aead_alg, tag_length ) )
|
||||||
|
|
||||||
/*
|
|
||||||
* Deprecated PSA AEAD output size macros (PSA Crypto API <= 1.0 beta3)
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** The tag size for an AEAD algorithm, in bytes.
|
|
||||||
*
|
|
||||||
* \param alg An AEAD algorithm
|
|
||||||
* (\c PSA_ALG_XXX value such that
|
|
||||||
* #PSA_ALG_IS_AEAD(\p alg) is true).
|
|
||||||
*
|
|
||||||
* \return The tag size for the specified algorithm.
|
|
||||||
* If the AEAD algorithm does not have an identified
|
|
||||||
* tag that can be distinguished from the rest of
|
|
||||||
* the ciphertext, return 0.
|
|
||||||
* If the AEAD algorithm is not recognized, return 0.
|
|
||||||
*/
|
|
||||||
#define PSA_AEAD_TAG_LENGTH_1_ARG( alg ) \
|
|
||||||
MBEDTLS_DEPRECATED_CONSTANT( size_t, \
|
|
||||||
PSA_ALG_IS_AEAD( alg ) ? \
|
|
||||||
PSA_ALG_AEAD_GET_TAG_LENGTH( alg ) : \
|
|
||||||
0 )
|
|
||||||
|
|
||||||
/** The maximum size of the output of psa_aead_encrypt(), in bytes.
|
|
||||||
*
|
|
||||||
* If the size of the ciphertext buffer is at least this large, it is
|
|
||||||
* guaranteed that psa_aead_encrypt() will not fail due to an
|
|
||||||
* insufficient buffer size. Depending on the algorithm, the actual size of
|
|
||||||
* the ciphertext may be smaller.
|
|
||||||
*
|
|
||||||
* \warning This macro may evaluate its arguments multiple times or
|
|
||||||
* zero times, so you should not pass arguments that contain
|
|
||||||
* side effects.
|
|
||||||
*
|
|
||||||
* \param alg An AEAD algorithm
|
|
||||||
* (\c PSA_ALG_XXX value such that
|
|
||||||
* #PSA_ALG_IS_AEAD(\p alg) is true).
|
|
||||||
* \param plaintext_length Size of the plaintext in bytes.
|
|
||||||
*
|
|
||||||
* \return The AEAD ciphertext size for the specified
|
|
||||||
* algorithm.
|
|
||||||
* If the AEAD algorithm is not recognized, return 0.
|
|
||||||
*/
|
|
||||||
#define PSA_AEAD_ENCRYPT_OUTPUT_SIZE_2_ARG( alg, plaintext_length ) \
|
|
||||||
MBEDTLS_DEPRECATED_CONSTANT( size_t, \
|
|
||||||
PSA_ALG_IS_AEAD( alg ) ? \
|
|
||||||
(plaintext_length) + PSA_ALG_AEAD_GET_TAG_LENGTH( alg ) : \
|
|
||||||
0 )
|
|
||||||
|
|
||||||
/** The maximum size of the output of psa_aead_decrypt(), in bytes.
|
|
||||||
*
|
|
||||||
* If the size of the plaintext buffer is at least this large, it is
|
|
||||||
* guaranteed that psa_aead_decrypt() will not fail due to an
|
|
||||||
* insufficient buffer size. Depending on the algorithm, the actual size of
|
|
||||||
* the plaintext may be smaller.
|
|
||||||
*
|
|
||||||
* \warning This macro may evaluate its arguments multiple times or
|
|
||||||
* zero times, so you should not pass arguments that contain
|
|
||||||
* side effects.
|
|
||||||
*
|
|
||||||
* \param alg An AEAD algorithm
|
|
||||||
* (\c PSA_ALG_XXX value such that
|
|
||||||
* #PSA_ALG_IS_AEAD(\p alg) is true).
|
|
||||||
* \param ciphertext_length Size of the plaintext in bytes.
|
|
||||||
*
|
|
||||||
* \return The AEAD ciphertext size for the specified
|
|
||||||
* algorithm.
|
|
||||||
* If the AEAD algorithm is not recognized, return 0.
|
|
||||||
*/
|
|
||||||
#define PSA_AEAD_DECRYPT_OUTPUT_SIZE_2_ARG( alg, ciphertext_length ) \
|
|
||||||
MBEDTLS_DEPRECATED_CONSTANT( size_t, \
|
|
||||||
PSA_ALG_IS_AEAD( alg ) && \
|
|
||||||
(ciphertext_length) > PSA_ALG_AEAD_GET_TAG_LENGTH( alg ) ? \
|
|
||||||
(ciphertext_length) - PSA_ALG_AEAD_GET_TAG_LENGTH( alg ) : \
|
|
||||||
0 )
|
|
||||||
|
|
||||||
/** A sufficient output buffer size for psa_aead_update().
|
|
||||||
*
|
|
||||||
* If the size of the output buffer is at least this large, it is
|
|
||||||
* guaranteed that psa_aead_update() will not fail due to an
|
|
||||||
* insufficient buffer size. The actual size of the output may be smaller
|
|
||||||
* in any given call.
|
|
||||||
*
|
|
||||||
* \warning This macro may evaluate its arguments multiple times or
|
|
||||||
* zero times, so you should not pass arguments that contain
|
|
||||||
* side effects.
|
|
||||||
*
|
|
||||||
* \param alg An AEAD algorithm
|
|
||||||
* (\c PSA_ALG_XXX value such that
|
|
||||||
* #PSA_ALG_IS_AEAD(\p alg) is true).
|
|
||||||
* \param input_length Size of the input in bytes.
|
|
||||||
*
|
|
||||||
* \return A sufficient output buffer size for the specified
|
|
||||||
* algorithm.
|
|
||||||
* If the AEAD algorithm is not recognized, return 0.
|
|
||||||
*/
|
|
||||||
/* For all the AEAD modes defined in this specification, it is possible
|
|
||||||
* to emit output without delay. However, hardware may not always be
|
|
||||||
* capable of this. So for modes based on a block cipher, allow the
|
|
||||||
* implementation to delay the output until it has a full block. */
|
|
||||||
#define PSA_AEAD_UPDATE_OUTPUT_SIZE_2_ARG( alg, input_length ) \
|
|
||||||
MBEDTLS_DEPRECATED_CONSTANT( size_t, \
|
|
||||||
PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER( alg ) ? \
|
|
||||||
PSA_ROUND_UP_TO_MULTIPLE( PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE, (input_length) ) : \
|
|
||||||
(input_length) )
|
|
||||||
|
|
||||||
/** A sufficient ciphertext buffer size for psa_aead_finish().
|
|
||||||
*
|
|
||||||
* If the size of the ciphertext buffer is at least this large, it is
|
|
||||||
* guaranteed that psa_aead_finish() will not fail due to an
|
|
||||||
* insufficient ciphertext buffer size. The actual size of the output may
|
|
||||||
* be smaller in any given call.
|
|
||||||
*
|
|
||||||
* \param alg An AEAD algorithm
|
|
||||||
* (\c PSA_ALG_XXX value such that
|
|
||||||
* #PSA_ALG_IS_AEAD(\p alg) is true).
|
|
||||||
*
|
|
||||||
* \return A sufficient ciphertext buffer size for the
|
|
||||||
* specified algorithm.
|
|
||||||
* If the AEAD algorithm is not recognized, return 0.
|
|
||||||
*/
|
|
||||||
#define PSA_AEAD_FINISH_OUTPUT_SIZE_1_ARG( alg ) \
|
|
||||||
MBEDTLS_DEPRECATED_CONSTANT( size_t, \
|
|
||||||
PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER( alg ) ? \
|
|
||||||
PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE : \
|
|
||||||
0 )
|
|
||||||
|
|
||||||
/** A sufficient plaintext buffer size for psa_aead_verify().
|
|
||||||
*
|
|
||||||
* If the size of the plaintext buffer is at least this large, it is
|
|
||||||
* guaranteed that psa_aead_verify() will not fail due to an
|
|
||||||
* insufficient plaintext buffer size. The actual size of the output may
|
|
||||||
* be smaller in any given call.
|
|
||||||
*
|
|
||||||
* \param alg An AEAD algorithm
|
|
||||||
* (\c PSA_ALG_XXX value such that
|
|
||||||
* #PSA_ALG_IS_AEAD(\p alg) is true).
|
|
||||||
*
|
|
||||||
* \return A sufficient plaintext buffer size for the
|
|
||||||
* specified algorithm.
|
|
||||||
* If the AEAD algorithm is not recognized, return 0.
|
|
||||||
*/
|
|
||||||
#define PSA_AEAD_VERIFY_OUTPUT_SIZE_1_ARG( alg ) \
|
|
||||||
MBEDTLS_DEPRECATED_CONSTANT( size_t, \
|
|
||||||
PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER( alg ) ? \
|
|
||||||
PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE : \
|
|
||||||
0 )
|
|
||||||
|
|
||||||
#endif /* MBEDTLS_DEPRECATED_REMOVED */
|
#endif /* MBEDTLS_DEPRECATED_REMOVED */
|
||||||
|
|
||||||
/** Open a handle to an existing persistent key.
|
/** Open a handle to an existing persistent key.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user