yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-10-19 03:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3305 from gilles-peskine-arm/psa-asymmetric-adjectives

Browse source 
PSA: Fix copypasta and align terminology about asymmetric encryption
This commit is contained in:
Janos Follath 2020-05-29 08:15:11 +01:00 committed by GitHub
parent 6147e86e5d 4eb05a4edd
commit 0af1560919
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/psa/crypto_sizes.h
View file

@ -431,7 +431,7 @@
* \param key_type An asymmetric key type (this may indifferently be a * \param key_type An asymmetric key type (this may indifferently be a
* key pair type or a public key type). * key pair type or a public key type).
* \param key_bits The size of the key in bits. * \param key_bits The size of the key in bits.
* \param alg The signature algorithm. * \param alg The asymmetric encryption algorithm.
* *
* \return If the parameters are valid and supported, return * \return If the parameters are valid and supported, return
* a buffer size in bytes that guarantees that * a buffer size in bytes that guarantees that
@ -450,9 +450,9 @@
/** Sufficient output buffer size for psa_asymmetric_decrypt(). /** Sufficient output buffer size for psa_asymmetric_decrypt().
* *
* This macro returns a sufficient buffer size for a ciphertext produced using * This macro returns a sufficient buffer size for a plaintext produced using
* a key of the specified type and size, with the specified algorithm. * a key of the specified type and size, with the specified algorithm.
* Note that the actual size of the ciphertext may be smaller, depending * Note that the actual size of the plaintext may be smaller, depending
* on the algorithm. * on the algorithm.
* *
* \warning This function may call its arguments multiple times or * \warning This function may call its arguments multiple times or
@ -462,7 +462,7 @@
* \param key_type An asymmetric key type (this may indifferently be a * \param key_type An asymmetric key type (this may indifferently be a
* key pair type or a public key type). * key pair type or a public key type).
* \param key_bits The size of the key in bits. * \param key_bits The size of the key in bits.
* \param alg The signature algorithm. * \param alg The asymmetric encryption algorithm.
* *
* \return If the parameters are valid and supported, return * \return If the parameters are valid and supported, return
* a buffer size in bytes that guarantees that * a buffer size in bytes that guarantees that

18
include/psa/crypto_values.h
View file

@ -672,22 +672,24 @@
#define PSA_ALG_IS_AEAD(alg) \ #define PSA_ALG_IS_AEAD(alg) \
(((alg) & PSA_ALG_CATEGORY_MASK) == PSA_ALG_CATEGORY_AEAD) (((alg) & PSA_ALG_CATEGORY_MASK) == PSA_ALG_CATEGORY_AEAD)
/** Whether the specified algorithm is a public-key signature algorithm. /** Whether the specified algorithm is an asymmetric signature algorithm,
* also known as public-key signature algorithm.
* *
* \param alg An algorithm identifier (value of type #psa_algorithm_t). * \param alg An algorithm identifier (value of type #psa_algorithm_t).
* *
* \return 1 if \p alg is a public-key signature algorithm, 0 otherwise. * \return 1 if \p alg is an asymmetric signature algorithm, 0 otherwise.
* This macro may return either 0 or 1 if \p alg is not a supported * This macro may return either 0 or 1 if \p alg is not a supported
* algorithm identifier. * algorithm identifier.
*/ */
#define PSA_ALG_IS_SIGN(alg) \ #define PSA_ALG_IS_SIGN(alg) \
(((alg) & PSA_ALG_CATEGORY_MASK) == PSA_ALG_CATEGORY_SIGN) (((alg) & PSA_ALG_CATEGORY_MASK) == PSA_ALG_CATEGORY_SIGN)
/** Whether the specified algorithm is a public-key encryption algorithm. /** Whether the specified algorithm is an asymmetric encryption algorithm,
* also known as public-key encryption algorithm.
* *
* \param alg An algorithm identifier (value of type #psa_algorithm_t). * \param alg An algorithm identifier (value of type #psa_algorithm_t).
* *
* \return 1 if \p alg is a public-key encryption algorithm, 0 otherwise. * \return 1 if \p alg is an asymmetric encryption algorithm, 0 otherwise.
* This macro may return either 0 or 1 if \p alg is not a supported * This macro may return either 0 or 1 if \p alg is not a supported
* algorithm identifier. * algorithm identifier.
*/ */
@ -1205,9 +1207,9 @@
/** Whether the specified algorithm is a hash-and-sign algorithm. /** Whether the specified algorithm is a hash-and-sign algorithm.
* *
* Hash-and-sign algorithms are public-key signature algorithms structured * Hash-and-sign algorithms are asymmetric (public-key) signature algorithms
* in two parts: first the calculation of a hash in a way that does not * structured in two parts: first the calculation of a hash in a way that
* depend on the key, then the calculation of a signature from the * does not depend on the key, then the calculation of a signature from the
* hash value and the key. * hash value and the key.
* *
* \param alg An algorithm identifier (value of type #psa_algorithm_t). * \param alg An algorithm identifier (value of type #psa_algorithm_t).
@ -1259,7 +1261,7 @@
* #PSA_ALG_IS_HASH(\p hash_alg) is true) to use * #PSA_ALG_IS_HASH(\p hash_alg) is true) to use
* for MGF1. * for MGF1.
* *
* \return The corresponding RSA OAEP signature algorithm. * \return The corresponding RSA OAEP encryption algorithm.
* \return Unspecified if \p hash_alg is not a supported * \return Unspecified if \p hash_alg is not a supported
* hash algorithm. * hash algorithm.
*/ */