commit 4f2dd8aada0f75717db1ff9c0139de71f93a0321
author Mateusz Starzyk <mateusz.starzyk@mobica.com> Mon Aug 09 15:37:47 2021 +0200
committer Mateusz Starzyk <mateusz.starzyk@mobica.com> Tue Aug 10 14:00:14 2021 +0200
tree a6f9f04ed6c2eef7a5331229ec5e481677f83cb2
parent f337850738ca8d77dd0d31514fdb451381f6bd38

Fix errors returned by CCM functions.

Add new error code for calling functions in wrong order.

Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>

include/mbedtls/ccm.h

diff --git a/include/mbedtls/ccm.h b/include/mbedtls/ccm.h
index c903e68..d478414 100644
--- a/include/mbedtls/ccm.h
+++ b/include/mbedtls/ccm.h
@@ -61,6 +61,8 @@
 #define MBEDTLS_ERR_CCM_BAD_INPUT       -0x000D
 /** Authenticated decryption failed. */
 #define MBEDTLS_ERR_CCM_AUTH_FAILED     -0x000F
+/** CCM functions called in the wrong sequence. */
+#define MBEDTLS_ERR_CCM_BAD_SEQUENCE    -0x0011
 
 #ifdef __cplusplus
 extern "C" {

library/ccm.c

diff --git a/library/ccm.c b/library/ccm.c
index 13582d2..33c631a 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -269,7 +269,7 @@
     {
         if( ctx->state & CCM_STATE__AUTH_DATA_FINISHED )
         {
-            return ret;
+            return MBEDTLS_ERR_CCM_BAD_SEQUENCE;
         }
 
         if( ctx->processed == 0 )
@@ -430,22 +430,22 @@
 int mbedtls_ccm_finish( mbedtls_ccm_context *ctx,
                         unsigned char *tag, size_t tag_len )
 {
-    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
+    int ret;
     unsigned char i;
 
     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 ) )
     {
-        return ret;
+        return MBEDTLS_ERR_CCM_BAD_SEQUENCE;
     }
 
     if( ctx->plaintext_len > 0 && ctx->processed != ctx->plaintext_len )
     {
-        return ret;
+        return MBEDTLS_ERR_CCM_BAD_SEQUENCE;
     }
 
     /*