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

Clear context state if previous operation failed.

Browse Source 
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
This commit is contained in:
Mateusz Starzyk 2021-07-05 17:09:16 +02:00
parent 793692cbcb
commit 88c4d624f8
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
library/ccm.c
View File

@ -122,7 +122,10 @@ void mbedtls_ccm_free( mbedtls_ccm_context *ctx )
ctx->y[i] ^= ctx->b[i]; \ ctx->y[i] ^= ctx->b[i]; \
\ \
if( ( ret = mbedtls_cipher_update( &ctx->cipher_ctx, ctx->y, 16, ctx->y, &olen ) ) != 0 ) \ if( ( ret = mbedtls_cipher_update( &ctx->cipher_ctx, ctx->y, 16, ctx->y, &olen ) ) != 0 ) \
return( ret ); { \
ctx->state |= CCM_STATE__ERROR; \
return( ret ); \
} \
/* /*
* Encrypt or decrypt a partial block with CTR * Encrypt or decrypt a partial block with CTR
@ -135,6 +138,7 @@ void mbedtls_ccm_free( mbedtls_ccm_context *ctx )
if( ( ret = mbedtls_cipher_update( &ctx->cipher_ctx, ctx->ctr, \ if( ( ret = mbedtls_cipher_update( &ctx->cipher_ctx, ctx->ctr, \
16, ctx->b, &olen ) ) != 0 ) \ 16, ctx->b, &olen ) ) != 0 ) \
{ \ { \
ctx->state |= CCM_STATE__ERROR; \
return( ret ); \ return( ret ); \
} \ } \
\ \
@ -145,6 +149,7 @@ void mbedtls_ccm_free( mbedtls_ccm_context *ctx )
#define CCM_STATE__CLEAR 0 #define CCM_STATE__CLEAR 0
#define CCM_STATE__STARTED 0x0001 #define CCM_STATE__STARTED 0x0001
#define CCM_STATE__LENGHTS_SET 0x0002 #define CCM_STATE__LENGHTS_SET 0x0002
#define CCM_STATE__ERROR 0x0004
static void mbedtls_ccm_clear_state(mbedtls_ccm_context *ctx) { static void mbedtls_ccm_clear_state(mbedtls_ccm_context *ctx) {
ctx->state = CCM_STATE__CLEAR; ctx->state = CCM_STATE__CLEAR;
@ -175,7 +180,10 @@ static int mbedtls_ccm_calculate_first_block(mbedtls_ccm_context *ctx)
ctx->b[15-i] = (unsigned char)( len_left & 0xFF ); ctx->b[15-i] = (unsigned char)( len_left & 0xFF );
if( len_left > 0 ) if( len_left > 0 )
{
ctx->state |= CCM_STATE__ERROR;
return( MBEDTLS_ERR_CCM_BAD_INPUT ); return( MBEDTLS_ERR_CCM_BAD_INPUT );
}
/* Start CBC-MAC with first block*/ /* Start CBC-MAC with first block*/
UPDATE_CBC_MAC; UPDATE_CBC_MAC;
@ -188,12 +196,15 @@ int mbedtls_ccm_starts( mbedtls_ccm_context *ctx,
const unsigned char *iv, const unsigned char *iv,
size_t iv_len ) size_t iv_len )
{ {
int ret;
/* Also implies q is within bounds */ /* Also implies q is within bounds */
if( iv_len < 7 || iv_len > 13 ) if( iv_len < 7 || iv_len > 13 )
return( MBEDTLS_ERR_CCM_BAD_INPUT ); return( MBEDTLS_ERR_CCM_BAD_INPUT );
if( ctx->state & CCM_STATE__ERROR )
{
mbedtls_ccm_clear_state(ctx);
}
ctx->mode = mode; ctx->mode = mode;
ctx->q = 16 - 1 - (unsigned char) iv_len; ctx->q = 16 - 1 - (unsigned char) iv_len;
@ -230,9 +241,7 @@ int mbedtls_ccm_starts( mbedtls_ccm_context *ctx,
memcpy( ctx->b + 1, iv, iv_len ); memcpy( ctx->b + 1, iv, iv_len );
ctx->state |= CCM_STATE__STARTED; ctx->state |= CCM_STATE__STARTED;
ret = mbedtls_ccm_calculate_first_block(ctx); return mbedtls_ccm_calculate_first_block(ctx);
return ret;
} }
int mbedtls_ccm_set_lengths( mbedtls_ccm_context *ctx, int mbedtls_ccm_set_lengths( mbedtls_ccm_context *ctx,
@ -240,8 +249,6 @@ int mbedtls_ccm_set_lengths( mbedtls_ccm_context *ctx,
size_t plaintext_len, size_t plaintext_len,
size_t tag_len ) size_t tag_len )
{ {
int ret;
/* /*
* Check length requirements: SP800-38C A.1 * Check length requirements: SP800-38C A.1
* Additional requirement: a < 2^16 - 2^8 to simplify the code. * Additional requirement: a < 2^16 - 2^8 to simplify the code.
@ -255,6 +262,11 @@ int mbedtls_ccm_set_lengths( mbedtls_ccm_context *ctx,
if( total_ad_len >= 0xFF00 ) if( total_ad_len >= 0xFF00 )
return( MBEDTLS_ERR_CCM_BAD_INPUT ); return( MBEDTLS_ERR_CCM_BAD_INPUT );
if( ctx->state & CCM_STATE__ERROR )
{
mbedtls_ccm_clear_state(ctx);
}
/* /*
* First block B_0: * First block B_0:
* 0 .. 0 flags - set by: mbedtls_ccm_starts() and mbedtls_ccm_set_lenghts() * 0 .. 0 flags - set by: mbedtls_ccm_starts() and mbedtls_ccm_set_lenghts()
@ -273,9 +285,7 @@ int mbedtls_ccm_set_lengths( mbedtls_ccm_context *ctx,
ctx->plaintext_len = plaintext_len; ctx->plaintext_len = plaintext_len;
ctx->state |= CCM_STATE__LENGHTS_SET; ctx->state |= CCM_STATE__LENGHTS_SET;
ret = mbedtls_ccm_calculate_first_block(ctx); return mbedtls_ccm_calculate_first_block(ctx);
return ret;
} }
int mbedtls_ccm_update_ad( mbedtls_ccm_context *ctx, int mbedtls_ccm_update_ad( mbedtls_ccm_context *ctx,