Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-02-05 19:56:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

crypto/cryptosoft: Fix HMAC-SHA when a long key is used

Browse Source 
When using a key that is longer than the block size of the hashing
algorithm used, the key must be hashed before it is used.

Signed-off-by: Vlad Pruteanu <pruteanuvlad1611@yahoo.com>
This commit is contained in:
Vlad Pruteanu
2026-01-24 02:22:52 +02:00
committed by Alan C. Assis
parent def2e89b6e
commit 17393df52a
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/cryptosoft.c
View File

@@ -1684,10 +1684,17 @@ int swcr_newsession(FAR uint32_t *sid, FAR struct cryptoini *cri)
return -ENOBUFS; return -ENOBUFS;
} }
/* If the key is too long, hash it first using ictx */
if (cri->cri_klen / 8 > axf->keysize) if (cri->cri_klen / 8 > axf->keysize)
{ {
swcr_freesession(i); axf->init((*swd)->sw_ictx);
return -EINVAL; axf->update((*swd)->sw_ictx,
(FAR uint8_t *)cri->cri_key,
cri->cri_klen / 8);
axf->final((unsigned char *)cri->cri_key,
(*swd)->sw_ictx);
cri->cri_klen = axf->hashsize * 8;
} }
for (k = 0; k < cri->cri_klen / 8; k++) for (k = 0; k < cri->cri_klen / 8; k++)

10
crypto/xform.c
View File

@@ -333,7 +333,7 @@ const struct enc_xform enc_xform_null =
const struct auth_hash auth_hash_hmac_md5_96 = const struct auth_hash auth_hash_hmac_md5_96 =
{ {
CRYPTO_MD5_HMAC, "HMAC-MD5", CRYPTO_MD5_HMAC, "HMAC-MD5",
16, 16, 12, sizeof(MD5_CTX), HMAC_MD5_BLOCK_LEN, HMAC_MD5_BLOCK_LEN, 16, 12, sizeof(MD5_CTX), HMAC_MD5_BLOCK_LEN,
(void (*) (FAR void *)) md5init, NULL, NULL, (void (*) (FAR void *)) md5init, NULL, NULL,
md5update_int, md5update_int,
(void (*) (FAR uint8_t *, FAR void *)) md5final (void (*) (FAR uint8_t *, FAR void *)) md5final
@@ -342,7 +342,7 @@ const struct auth_hash auth_hash_hmac_md5_96 =
const struct auth_hash auth_hash_hmac_sha1_96 = const struct auth_hash auth_hash_hmac_sha1_96 =
{ {
CRYPTO_SHA1_HMAC, "HMAC-SHA1", CRYPTO_SHA1_HMAC, "HMAC-SHA1",
20, 20, 12, sizeof(SHA1_CTX), HMAC_SHA1_BLOCK_LEN, HMAC_SHA1_BLOCK_LEN, 20, 12, sizeof(SHA1_CTX), HMAC_SHA1_BLOCK_LEN,
(void (*) (FAR void *)) sha1init, NULL, NULL, (void (*) (FAR void *)) sha1init, NULL, NULL,
sha1update_int, sha1update_int,
(void (*) (FAR uint8_t *, FAR void *)) sha1final (void (*) (FAR uint8_t *, FAR void *)) sha1final
@@ -360,7 +360,7 @@ const struct auth_hash auth_hash_hmac_ripemd_160_96 =
const struct auth_hash auth_hash_hmac_sha2_256_128 = const struct auth_hash auth_hash_hmac_sha2_256_128 =
{ {
CRYPTO_SHA2_256_HMAC, "HMAC-SHA2-256", CRYPTO_SHA2_256_HMAC, "HMAC-SHA2-256",
32, 32, 16, sizeof(SHA2_CTX), HMAC_SHA2_256_BLOCK_LEN, HMAC_SHA2_256_BLOCK_LEN, 32, 16, sizeof(SHA2_CTX), HMAC_SHA2_256_BLOCK_LEN,
(void (*)(FAR void *)) sha256init, NULL, NULL, (void (*)(FAR void *)) sha256init, NULL, NULL,
sha256update_int, sha256update_int,
(void (*)(FAR uint8_t *, FAR void *)) sha256final (void (*)(FAR uint8_t *, FAR void *)) sha256final
@@ -369,7 +369,7 @@ const struct auth_hash auth_hash_hmac_sha2_256_128 =
const struct auth_hash auth_hash_hmac_sha2_384_192 = const struct auth_hash auth_hash_hmac_sha2_384_192 =
{ {
CRYPTO_SHA2_384_HMAC, "HMAC-SHA2-384", CRYPTO_SHA2_384_HMAC, "HMAC-SHA2-384",
48, 48, 24, sizeof(SHA2_CTX), HMAC_SHA2_384_BLOCK_LEN, HMAC_SHA2_384_BLOCK_LEN, 48, 24, sizeof(SHA2_CTX), HMAC_SHA2_384_BLOCK_LEN,
(void (*)(FAR void *)) sha384init, NULL, NULL, (void (*)(FAR void *)) sha384init, NULL, NULL,
sha384update_int, sha384update_int,
(void (*)(FAR uint8_t *, FAR void *)) sha384final (void (*)(FAR uint8_t *, FAR void *)) sha384final
@@ -378,7 +378,7 @@ const struct auth_hash auth_hash_hmac_sha2_384_192 =
const struct auth_hash auth_hash_hmac_sha2_512_256 = const struct auth_hash auth_hash_hmac_sha2_512_256 =
{ {
CRYPTO_SHA2_512_HMAC, "HMAC-SHA2-512", CRYPTO_SHA2_512_HMAC, "HMAC-SHA2-512",
64, 64, 32, sizeof(SHA2_CTX), HMAC_SHA2_512_BLOCK_LEN, HMAC_SHA2_512_BLOCK_LEN, 64, 32, sizeof(SHA2_CTX), HMAC_SHA2_512_BLOCK_LEN,
(void (*)(FAR void *)) sha512init, NULL, NULL, (void (*)(FAR void *)) sha512init, NULL, NULL,
sha512update_int, sha512update_int,
(void (*)(FAR uint8_t *, FAR void *)) sha512final (void (*)(FAR uint8_t *, FAR void *)) sha512final