AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Integrated feedback of first code review

Browse Source 
- Fixed code style.
- Clarified the documentation of what happens when saltlen is set to
  MBEDTLS_RSA_SALT_LEN_ANY.
- Added range check on saltlen to reject out of range values.

(Code review done by @gilles-peskine-arm)

Signed-off-by: Cédric Meuter <cedric.meuter@gmail.com>
This commit is contained in:
Cédric Meuter 2020-04-25 09:24:11 +02:00
parent 8aa4d75ec9
commit 010ddc2b62
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/mbedtls/rsa.h
View File

@ -979,14 +979,11 @@ int mbedtls_rsa_rsassa_pkcs1_v15_sign( mbedtls_rsa_context *ctx,
* Specifications</em> it is advised to keep both hashes the * Specifications</em> it is advised to keep both hashes the
* same. * same.
* *
* \note This function always uses the maximum possible salt size, * \note This function enforces that the provided salt length complies
* up to the length of the payload hash. This choice of salt * with FIPS 186-4 §5.5 (e) and RFC 8017 (PKCS#1 v2.2) §9.1.1
* size complies with FIPS 186-4 §5.5 (e) and RFC 8017 (PKCS#1 * step 3. The constraint is that the hash length plus the salt
* v2.2) §9.1.1 step 3. Furthermore this function enforces a * length plus 2 bytes must be at most the key length. If this
* minimum salt size which is the hash size minus 2 bytes. If * constraint is not met, this function returns
* this minimum size is too large given the key size (the salt
* size, plus the hash size, plus 2 bytes must be no more than
* the key size in bytes), this function returns
* #MBEDTLS_ERR_RSA_BAD_INPUT_DATA. * #MBEDTLS_ERR_RSA_BAD_INPUT_DATA.
* *
* \deprecated It is deprecated and discouraged to call this function * \deprecated It is deprecated and discouraged to call this function
@ -1014,8 +1011,10 @@ int mbedtls_rsa_rsassa_pkcs1_v15_sign( mbedtls_rsa_context *ctx,
* #MBEDTLS_MD_NONE, it must be a readable buffer of length * #MBEDTLS_MD_NONE, it must be a readable buffer of length
* the size of the hash corresponding to \p md_alg. * the size of the hash corresponding to \p md_alg.
* \param saltlen The length of the salt that should be used. * \param saltlen The length of the salt that should be used.
* If passed MBEDTLS_RSA_SALT_LEN_ANY, the function will use * If passed #MBEDTLS_RSA_SALT_LEN_ANY, the function will use
* the largest possible salt length. * the largest possible salt length up to the hash length,
* which is the largest permitted by some standards including
* FIPS 186-4 §5.5.
* \param sig The buffer to hold the signature. This must be a writable * \param sig The buffer to hold the signature. This must be a writable
* buffer of length \c ctx->len Bytes. For example, \c 256 Bytes * buffer of length \c ctx->len Bytes. For example, \c 256 Bytes
* for an 2048-bit RSA modulus. A buffer length of * for an 2048-bit RSA modulus. A buffer length of

11
library/rsa.c
View File

@ -1843,8 +1843,9 @@ int mbedtls_rsa_rsassa_pss_sign_ext( mbedtls_rsa_context *ctx,
if (saltlen == MBEDTLS_RSA_SALT_LEN_ANY) if (saltlen == MBEDTLS_RSA_SALT_LEN_ANY)
{ {
/* Calculate the largest possible salt length. Normally this is the hash /* Calculate the largest possible salt length, up to the hash size.
* length, which is the maximum length the salt can have. If there is not * Normally this is the hash length, which is the maximum salt length
* according to FIPS 185-4 §5.5 (e) and common practice. If there is not
* enough room, use the maximum salt length that fits. The constraint is * enough room, use the maximum salt length that fits. The constraint is
* that the hash length plus the salt length plus 2 bytes must be at most * that the hash length plus the salt length plus 2 bytes must be at most
* the key length. This complies with FIPS 186-4 §5.5 (e) and RFC 8017 * the key length. This complies with FIPS 186-4 §5.5 (e) and RFC 8017
@ -1857,9 +1858,13 @@ int mbedtls_rsa_rsassa_pss_sign_ext( mbedtls_rsa_context *ctx,
else else
slen = olen - hlen - 2; slen = olen - hlen - 2;
} }
else if ( (saltlen < 0) || ((size_t) saltlen > olen - hlen - 2) )
{
return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
}
else else
{ {
slen = (size_t)saltlen; slen = (size_t) saltlen;
} }
memset( sig, 0, olen ); memset( sig, 0, olen );