lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Fix errors returned by CCM functions.

Browse Source 
Add new error code for calling functions in wrong order.

Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
This commit is contained in:
Mateusz Starzyk
2021-08-09 15:37:47 +02:00
parent f337850738
commit 4f2dd8aada
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/ccm.h
View File

@ -61,6 +61,8 @@
#define MBEDTLS_ERR_CCM_BAD_INPUT -0x000D #define MBEDTLS_ERR_CCM_BAD_INPUT -0x000D
/** Authenticated decryption failed. */ /** Authenticated decryption failed. */
#define MBEDTLS_ERR_CCM_AUTH_FAILED -0x000F #define MBEDTLS_ERR_CCM_AUTH_FAILED -0x000F
/** CCM functions called in the wrong sequence. */
#define MBEDTLS_ERR_CCM_BAD_SEQUENCE -0x0011
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

10
library/ccm.c
View File

@ -269,7 +269,7 @@ int mbedtls_ccm_update_ad( mbedtls_ccm_context *ctx,
{ {
if( ctx->state & CCM_STATE__AUTH_DATA_FINISHED ) if( ctx->state & CCM_STATE__AUTH_DATA_FINISHED )
{ {
return ret; return MBEDTLS_ERR_CCM_BAD_SEQUENCE;
} }
if( ctx->processed == 0 ) if( ctx->processed == 0 )
@ -430,22 +430,22 @@ exit:
int mbedtls_ccm_finish( mbedtls_ccm_context *ctx, int mbedtls_ccm_finish( mbedtls_ccm_context *ctx,
unsigned char *tag, size_t tag_len ) unsigned char *tag, size_t tag_len )
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret;
unsigned char i; unsigned char i;
if( ctx->state & CCM_STATE__ERROR ) if( ctx->state & CCM_STATE__ERROR )
{ {
return ret; return MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
} }
if( ctx->add_len > 0 && !( ctx->state & CCM_STATE__AUTH_DATA_FINISHED ) ) if( ctx->add_len > 0 && !( ctx->state & CCM_STATE__AUTH_DATA_FINISHED ) )
{ {
return ret; return MBEDTLS_ERR_CCM_BAD_SEQUENCE;
} }
if( ctx->plaintext_len > 0 && ctx->processed != ctx->plaintext_len ) if( ctx->plaintext_len > 0 && ctx->processed != ctx->plaintext_len )
{ {
return ret; return MBEDTLS_ERR_CCM_BAD_SEQUENCE;
} }
/* /*