espressif/mbedtls
1
0
Fork 0
mirror of https://github.com/espressif/mbedtls.git synced 2025-06-21 22:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve const-timeness of mbedtls_nist_kw_unwrap

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-09-18 18:22:27 +01:00
parent 771ac65b0c
commit d337bd9bfe
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/nist_kw.c
View File

@ -35,6 +35,7 @@
#include "mbedtls/platform_util.h" #include "mbedtls/platform_util.h"
#include "mbedtls/error.h" #include "mbedtls/error.h"
#include "mbedtls/constant_time.h" #include "mbedtls/constant_time.h"
#include "constant_time_internal.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@ -333,9 +334,9 @@ int mbedtls_nist_kw_unwrap(mbedtls_nist_kw_context *ctx,
unsigned char *output, size_t *out_len, size_t out_size) unsigned char *output, size_t *out_len, size_t out_size)
{ {
int ret = 0; int ret = 0;
size_t i, olen; size_t olen;
unsigned char A[KW_SEMIBLOCK_LENGTH]; unsigned char A[KW_SEMIBLOCK_LENGTH];
unsigned char diff, bad_padding = 0; int diff;
*out_len = 0; *out_len = 0;
if (out_size < in_len - KW_SEMIBLOCK_LENGTH) { if (out_size < in_len - KW_SEMIBLOCK_LENGTH) {
@ -426,13 +427,10 @@ int mbedtls_nist_kw_unwrap(mbedtls_nist_kw_context *ctx,
} }
/* Check padding in "constant-time" */ /* Check padding in "constant-time" */
for (diff = 0, i = 0; i < KW_SEMIBLOCK_LENGTH; i++) { const uint8_t zero[KW_SEMIBLOCK_LENGTH] = { 0 };
if (i >= KW_SEMIBLOCK_LENGTH - padlen) { diff = mbedtls_ct_memcmp_partial(
diff |= output[*out_len - KW_SEMIBLOCK_LENGTH + i]; &output[*out_len - KW_SEMIBLOCK_LENGTH], zero,
} else { KW_SEMIBLOCK_LENGTH, KW_SEMIBLOCK_LENGTH - padlen, 0);
bad_padding |= output[*out_len - KW_SEMIBLOCK_LENGTH + i];
}
}
if (diff != 0) { if (diff != 0) {
ret = MBEDTLS_ERR_CIPHER_AUTH_FAILED; ret = MBEDTLS_ERR_CIPHER_AUTH_FAILED;
@ -454,7 +452,6 @@ cleanup:
*out_len = 0; *out_len = 0;
} }
mbedtls_platform_zeroize(&bad_padding, sizeof(bad_padding));
mbedtls_platform_zeroize(&diff, sizeof(diff)); mbedtls_platform_zeroize(&diff, sizeof(diff));
mbedtls_platform_zeroize(A, sizeof(A)); mbedtls_platform_zeroize(A, sizeof(A));