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

Update validity domain of min_tag_length / min_mac_length

Browse source 
Review indicated explicit validity domain should be [1, max_alg_length]

Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>

# Conflicts:
#	include/psa/crypto_values.h
This commit is contained in:
Steven Cooreman 2021-02-18 12:08:41 +01:00
parent 0348802247
commit 37389c768d
1 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
include/psa/crypto_values.h
View file

@ -941,28 +941,30 @@
/** Macro to build a MAC minimum-MAC-length wildcard algorithm. /** Macro to build a MAC minimum-MAC-length wildcard algorithm.
* *
* A mininimum-MAC-length MAC wildcard algorithm contains all MAC algorithms * A mininimum-MAC-length MAC wildcard algorithm permits all MAC algorithms
* sharing the same base algorithm, and where the (potentially truncated) MAC * sharing the same base algorithm, and where the (potentially truncated) MAC
* length of the specific algorithm is equal to or larger then the wildcard * length of the specific algorithm is equal to or larger then the wildcard
* algorithm's minimum MAC length. * algorithm's minimum MAC length.
* *
* \param mac_alg A MAC algorithm identifier (value of type * \note When setting the minimum required MAC length to less than the
* #psa_algorithm_t such that #PSA_ALG_IS_MAC(\p mac_alg) * smallest MAC length allowed by the base algorithm, this effectively
* is true). * becomes an 'any-MAC-length-allowed' policy for that base algorithm.
* \param mac_length Desired minimum length of the message authentication
* code in bytes. This must be at most the full length of
* the MAC and must be at least an implementation-specified
* minimum. The implementation-specified minimum
* shall not be zero.
* *
* \return The corresponding MAC wildcard algorithm with the * \param mac_alg A MAC algorithm identifier (value of type
* specified minimum length. * #psa_algorithm_t such that #PSA_ALG_IS_MAC(\p mac_alg)
* \return Unspecified if \p mac_alg is not a supported MAC * is true).
* algorithm or if \p mac_length is too small or too large * \param min_mac_length Desired minimum length of the message authentication
* for the specified MAC algorithm. * code in bytes. This must be at most the untruncated
* length of the MAC and must be at least 1.
*
* \return The corresponding MAC wildcard algorithm with the
* specified minimum length.
* \return Unspecified if \p mac_alg is not a supported MAC
* algorithm or if \p min_mac_length is less than 1 or
* too large for the specified MAC algorithm.
*/ */
#define PSA_ALG_MAC_WITH_MINIMUM_LENGTH_TAG(mac_alg, mac_length) \ #define PSA_ALG_MAC_WITH_MINIMUM_LENGTH_TAG(mac_alg, min_mac_length) \
( PSA_ALG_TRUNCATED_MAC(mac_alg, mac_length) | PSA_ALG_MAC_MINIMUM_LENGTH_FLAG ) ( PSA_ALG_TRUNCATED_MAC(mac_alg, min_mac_length) | PSA_ALG_MAC_MINIMUM_LENGTH_FLAG )
#define PSA_ALG_CIPHER_MAC_BASE ((psa_algorithm_t)0x03c00000) #define PSA_ALG_CIPHER_MAC_BASE ((psa_algorithm_t)0x03c00000)
/** The CBC-MAC construction over a block cipher /** The CBC-MAC construction over a block cipher
@ -1190,25 +1192,30 @@
/** Macro to build an AEAD minimum-tag-length wildcard algorithm. /** Macro to build an AEAD minimum-tag-length wildcard algorithm.
* *
* A mininimum-tag-length AEAD wildcard algorithm contains all AEAD algorithms * A mininimum-tag-length AEAD wildcard algorithm permits all AEAD algorithms
* sharing the same base algorithm, and where the tag length of the specific * sharing the same base algorithm, and where the tag length of the specific
* algorithm is equal to or larger then the minimum tag length specified by the * algorithm is equal to or larger then the minimum tag length specified by the
* wildcard algorithm. * wildcard algorithm.
* *
* \param aead_alg An AEAD algorithm identifier (value of type * \note When setting the minimum required tag length to less than the
* #psa_algorithm_t such that #PSA_ALG_IS_AEAD(\p aead_alg) * smallest tag length allowed by the base algorithm, this effectively
* is true). * becomes an 'any-tag-length-allowed' policy for that base algorithm.
* \param tag_length Desired minimum length of the authentication tag in
* bytes.
* *
* \return The corresponding AEAD wildcard algorithm with the * \param aead_alg An AEAD algorithm identifier (value of type
* specified minimum length. * #psa_algorithm_t such that
* \return Unspecified if \p aead_alg is not a supported * #PSA_ALG_IS_AEAD(\p aead_alg) is true).
* AEAD algorithm or if \p tag_length is not valid * \param min_tag_length Desired minimum length of the authentication tag in
* for the specified AEAD algorithm. * bytes. This must be at least 1 and at most the largest
* allowed tag length of the algorithm.
*
* \return The corresponding AEAD wildcard algorithm with the
* specified minimum length.
* \return Unspecified if \p aead_alg is not a supported
* AEAD algorithm or if \p min_tag_length is less than 1
* or too large for the specified AEAD algorithm.
*/ */
#define PSA_ALG_AEAD_WITH_MINIMUM_LENGTH_TAG(aead_alg, tag_length) \ #define PSA_ALG_AEAD_WITH_MINIMUM_LENGTH_TAG(aead_alg, min_tag_length) \
( PSA_ALG_AEAD_WITH_SHORTENED_TAG(aead_alg, tag_length) | PSA_ALG_AEAD_MINIMUM_LENGTH_FLAG ) ( PSA_ALG_AEAD_WITH_SHORTENED_TAG(aead_alg, min_tag_length) | PSA_ALG_AEAD_MINIMUM_LENGTH_FLAG )
#define PSA_ALG_RSA_PKCS1V15_SIGN_BASE ((psa_algorithm_t)0x06000200) #define PSA_ALG_RSA_PKCS1V15_SIGN_BASE ((psa_algorithm_t)0x06000200)
/** RSA PKCS#1 v1.5 signature with hashing. /** RSA PKCS#1 v1.5 signature with hashing.