mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-25 19:55:28 +00:00
Move remaining size macros from crypto.h to crypto_sizes.h
No functional changes, code was only moved from crypto.h to crypto_sizes.h.
This commit is contained in:
Gilles Peskine
parent
f3b731e817
commit
a7c26db335
|
|
@ -53,9 +53,6 @@ typedef _unsigned_integral_type_ psa_key_handle_t;
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PSA_BITS_TO_BYTES(bits) (((bits) + 7) / 8)
|
|
||||||
#define PSA_BYTES_TO_BITS(bytes) ((bytes) * 8)
|
|
||||||
|
|
||||||
/* The file "crypto_types.h" declares types that encode errors,
|
/* The file "crypto_types.h" declares types that encode errors,
|
||||||
* algorithms, key types, policies, etc. */
|
* algorithms, key types, policies, etc. */
|
||||||
#include "crypto_types.h"
|
#include "crypto_types.h"
|
||||||
|
|
@ -680,39 +677,6 @@ psa_status_t psa_get_key_policy(psa_key_handle_t handle,
|
||||||
* as directed by the documentation of a specific implementation. */
|
* as directed by the documentation of a specific implementation. */
|
||||||
typedef struct psa_hash_operation_s psa_hash_operation_t;
|
typedef struct psa_hash_operation_s psa_hash_operation_t;
|
||||||
|
|
||||||
/** The size of the output of psa_hash_finish(), in bytes.
|
|
||||||
*
|
|
||||||
* This is also the hash size that psa_hash_verify() expects.
|
|
||||||
*
|
|
||||||
* \param alg A hash algorithm (\c PSA_ALG_XXX value such that
|
|
||||||
* #PSA_ALG_IS_HASH(\p alg) is true), or an HMAC algorithm
|
|
||||||
* (#PSA_ALG_HMAC(\c hash_alg) where \c hash_alg is a
|
|
||||||
* hash algorithm).
|
|
||||||
*
|
|
||||||
* \return The hash size for the specified hash algorithm.
|
|
||||||
* If the hash algorithm is not recognized, return 0.
|
|
||||||
* An implementation may return either 0 or the correct size
|
|
||||||
* for a hash algorithm that it recognizes, but does not support.
|
|
||||||
*/
|
|
||||||
#define PSA_HASH_SIZE(alg) \
|
|
||||||
( \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_MD2 ? 16 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_MD4 ? 16 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_MD5 ? 16 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_RIPEMD160 ? 20 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_1 ? 20 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_224 ? 28 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_256 ? 32 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_384 ? 48 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_512 ? 64 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_512_224 ? 28 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_512_256 ? 32 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA3_224 ? 28 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA3_256 ? 32 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA3_384 ? 48 : \
|
|
||||||
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA3_512 ? 64 : \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/** Start a multipart hash operation.
|
/** Start a multipart hash operation.
|
||||||
*
|
*
|
||||||
* The sequence of operations to calculate a hash (message digest)
|
* The sequence of operations to calculate a hash (message digest)
|
||||||
|
|
@ -1433,26 +1397,6 @@ psa_status_t psa_cipher_abort(psa_cipher_operation_t *operation);
|
||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** 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.
|
|
||||||
* An implementation may return either 0 or a
|
|
||||||
* correct size for an AEAD algorithm that it
|
|
||||||
* recognizes, but does not support.
|
|
||||||
*/
|
|
||||||
#define PSA_AEAD_TAG_LENGTH(alg) \
|
|
||||||
(PSA_ALG_IS_AEAD(alg) ? \
|
|
||||||
(((alg) & PSA_ALG_AEAD_TAG_LENGTH_MASK) >> PSA_AEAD_TAG_LENGTH_OFFSET) : \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/** Process an authenticated encryption operation.
|
/** Process an authenticated encryption operation.
|
||||||
*
|
*
|
||||||
* \param handle Handle to the key to use for the operation.
|
* \param handle Handle to the key to use for the operation.
|
||||||
|
|
@ -1575,17 +1519,6 @@ psa_status_t psa_aead_decrypt(psa_key_handle_t handle,
|
||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* \brief ECDSA signature size for a given curve bit size
|
|
||||||
*
|
|
||||||
* \param curve_bits Curve size in bits.
|
|
||||||
* \return Signature size in bytes.
|
|
||||||
*
|
|
||||||
* \note This macro returns a compile-time constant if its argument is one.
|
|
||||||
*/
|
|
||||||
#define PSA_ECDSA_SIGNATURE_SIZE(curve_bits) \
|
|
||||||
(PSA_BITS_TO_BYTES(curve_bits) * 2)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Sign a hash or short message with a private key.
|
* \brief Sign a hash or short message with a private key.
|
||||||
*
|
*
|
||||||
|
|
@ -1675,11 +1608,6 @@ psa_status_t psa_asymmetric_verify(psa_key_handle_t handle,
|
||||||
const uint8_t *signature,
|
const uint8_t *signature,
|
||||||
size_t signature_length);
|
size_t signature_length);
|
||||||
|
|
||||||
#define PSA_RSA_MINIMUM_PADDING_SIZE(alg) \
|
|
||||||
(PSA_ALG_IS_RSA_OAEP(alg) ? \
|
|
||||||
2 * PSA_HASH_FINAL_SIZE(PSA_ALG_RSA_OAEP_GET_HASH(alg)) + 1 : \
|
|
||||||
11 /*PKCS#1v1.5*/)
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \brief Encrypt a short message with a public key.
|
* \brief Encrypt a short message with a public key.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,42 @@
|
||||||
#include MBEDTLS_CONFIG_FILE
|
#include MBEDTLS_CONFIG_FILE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define PSA_BITS_TO_BYTES(bits) (((bits) + 7) / 8)
|
||||||
|
#define PSA_BYTES_TO_BITS(bytes) ((bytes) * 8)
|
||||||
|
|
||||||
|
/** The size of the output of psa_hash_finish(), in bytes.
|
||||||
|
*
|
||||||
|
* This is also the hash size that psa_hash_verify() expects.
|
||||||
|
*
|
||||||
|
* \param alg A hash algorithm (\c PSA_ALG_XXX value such that
|
||||||
|
* #PSA_ALG_IS_HASH(\p alg) is true), or an HMAC algorithm
|
||||||
|
* (#PSA_ALG_HMAC(\c hash_alg) where \c hash_alg is a
|
||||||
|
* hash algorithm).
|
||||||
|
*
|
||||||
|
* \return The hash size for the specified hash algorithm.
|
||||||
|
* If the hash algorithm is not recognized, return 0.
|
||||||
|
* An implementation may return either 0 or the correct size
|
||||||
|
* for a hash algorithm that it recognizes, but does not support.
|
||||||
|
*/
|
||||||
|
#define PSA_HASH_SIZE(alg) \
|
||||||
|
( \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_MD2 ? 16 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_MD4 ? 16 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_MD5 ? 16 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_RIPEMD160 ? 20 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_1 ? 20 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_224 ? 28 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_256 ? 32 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_384 ? 48 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_512 ? 64 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_512_224 ? 28 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA_512_256 ? 32 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA3_224 ? 28 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA3_256 ? 32 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA3_384 ? 48 : \
|
||||||
|
PSA_ALG_HMAC_GET_HASH(alg) == PSA_ALG_SHA3_512 ? 64 : \
|
||||||
|
0)
|
||||||
|
|
||||||
/** \def PSA_HASH_MAX_SIZE
|
/** \def PSA_HASH_MAX_SIZE
|
||||||
*
|
*
|
||||||
* Maximum size of a hash.
|
* Maximum size of a hash.
|
||||||
|
|
@ -84,6 +120,26 @@
|
||||||
*/
|
*/
|
||||||
#define PSA_MAC_MAX_SIZE PSA_HASH_MAX_SIZE
|
#define PSA_MAC_MAX_SIZE PSA_HASH_MAX_SIZE
|
||||||
|
|
||||||
|
/** 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.
|
||||||
|
* An implementation may return either 0 or a
|
||||||
|
* correct size for an AEAD algorithm that it
|
||||||
|
* recognizes, but does not support.
|
||||||
|
*/
|
||||||
|
#define PSA_AEAD_TAG_LENGTH(alg) \
|
||||||
|
(PSA_ALG_IS_AEAD(alg) ? \
|
||||||
|
(((alg) & PSA_ALG_AEAD_TAG_LENGTH_MASK) >> PSA_AEAD_TAG_LENGTH_OFFSET) : \
|
||||||
|
0)
|
||||||
|
|
||||||
/* The maximum size of an RSA key on this implementation, in bits.
|
/* The maximum size of an RSA key on this implementation, in bits.
|
||||||
* This is a vendor-specific macro.
|
* This is a vendor-specific macro.
|
||||||
*
|
*
|
||||||
|
|
@ -236,6 +292,22 @@
|
||||||
(plaintext_length) - PSA_AEAD_TAG_LENGTH(alg) : \
|
(plaintext_length) - PSA_AEAD_TAG_LENGTH(alg) : \
|
||||||
0)
|
0)
|
||||||
|
|
||||||
|
#define PSA_RSA_MINIMUM_PADDING_SIZE(alg) \
|
||||||
|
(PSA_ALG_IS_RSA_OAEP(alg) ? \
|
||||||
|
2 * PSA_HASH_FINAL_SIZE(PSA_ALG_RSA_OAEP_GET_HASH(alg)) + 1 : \
|
||||||
|
11 /*PKCS#1v1.5*/)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief ECDSA signature size for a given curve bit size
|
||||||
|
*
|
||||||
|
* \param curve_bits Curve size in bits.
|
||||||
|
* \return Signature size in bytes.
|
||||||
|
*
|
||||||
|
* \note This macro returns a compile-time constant if its argument is one.
|
||||||
|
*/
|
||||||
|
#define PSA_ECDSA_SIGNATURE_SIZE(curve_bits) \
|
||||||
|
(PSA_BITS_TO_BYTES(curve_bits) * 2)
|
||||||
|
|
||||||
/** Safe signature buffer size for psa_asymmetric_sign().
|
/** Safe signature buffer size for psa_asymmetric_sign().
|
||||||
*
|
*
|
||||||
* This macro returns a safe buffer size for a signature using a key
|
* This macro returns a safe buffer size for a signature using a key
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue