espressif/mbedtls
1
0
Fork 0
mirror of https://github.com/espressif/mbedtls.git synced 2025-05-10 03:39:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use mbedtls_xor in ccm

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2022-11-22 16:30:35 +00:00
parent d23399eb69
commit 0d3b55bca8
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/ccm.c
View File

@ -112,7 +112,6 @@ static int mbedtls_ccm_crypt( mbedtls_ccm_context *ctx,
const unsigned char *input, const unsigned char *input,
unsigned char *output ) unsigned char *output )
{ {
size_t i;
size_t olen = 0; size_t olen = 0;
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
unsigned char tmp_buf[16] = {0}; unsigned char tmp_buf[16] = {0};
@ -125,8 +124,7 @@ static int mbedtls_ccm_crypt( mbedtls_ccm_context *ctx,
return ret; return ret;
} }
for( i = 0; i < use_len; i++ ) mbedtls_xor( output, input, tmp_buf + offset, use_len );
output[i] = input[i] ^ tmp_buf[offset + i];
mbedtls_platform_zeroize(tmp_buf, sizeof(tmp_buf)); mbedtls_platform_zeroize(tmp_buf, sizeof(tmp_buf));
return ret; return ret;
@ -269,7 +267,6 @@ int mbedtls_ccm_update_ad( mbedtls_ccm_context *ctx,
size_t add_len ) size_t add_len )
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
unsigned char i;
size_t olen, use_len, offset; size_t olen, use_len, offset;
if( ctx->state & CCM_STATE__ERROR ) if( ctx->state & CCM_STATE__ERROR )
@ -310,8 +307,7 @@ int mbedtls_ccm_update_ad( mbedtls_ccm_context *ctx,
if( use_len > add_len ) if( use_len > add_len )
use_len = add_len; use_len = add_len;
for( i = 0; i < use_len; i++ ) mbedtls_xor( ctx->y + offset, ctx->y + offset, add, use_len );
ctx->y[i + offset] ^= add[i];
ctx->processed += use_len; ctx->processed += use_len;
add_len -= use_len; add_len -= use_len;
@ -381,8 +377,7 @@ int mbedtls_ccm_update( mbedtls_ccm_context *ctx,
if( ctx->mode == MBEDTLS_CCM_ENCRYPT || \ if( ctx->mode == MBEDTLS_CCM_ENCRYPT || \
ctx->mode == MBEDTLS_CCM_STAR_ENCRYPT ) ctx->mode == MBEDTLS_CCM_STAR_ENCRYPT )
{ {
for( i = 0; i < use_len; i++ ) mbedtls_xor( ctx->y + offset, ctx->y + offset, input, use_len );
ctx->y[i + offset] ^= input[i];
if( use_len + offset == 16 || ctx->processed == ctx->plaintext_len ) if( use_len + offset == 16 || ctx->processed == ctx->plaintext_len )
{ {
@ -411,8 +406,7 @@ int mbedtls_ccm_update( mbedtls_ccm_context *ctx,
if( ret != 0 ) if( ret != 0 )
goto exit; goto exit;
for( i = 0; i < use_len; i++ ) mbedtls_xor( ctx->y + offset, ctx->y + offset, local_output, use_len );
ctx->y[i + offset] ^= local_output[i];
memcpy( output, local_output, use_len ); memcpy( output, local_output, use_len );
mbedtls_platform_zeroize( local_output, 16 ); mbedtls_platform_zeroize( local_output, 16 );