commit ea3a6114e6fd8feada89ba550d563546aa521cc9
author Valerio Setti <valerio.setti@nordicsemi.no> Mon Jan 29 10:37:14 2024 +0100
committer Valerio Setti <valerio.setti@nordicsemi.no> Mon Jan 29 12:00:21 2024 +0100
tree f16043bbfea7efa926ac816e0a1b7c370c937c4d
parent a45a399a6b7418118fd441b4240b583ae3b60a32

aria: replace ARIA_VALIDATE_RET() with a simple "if" block

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

library/aria.c

diff --git a/library/aria.c b/library/aria.c
index 2c36598..a4d6c50 100644
--- a/library/aria.c
+++ b/library/aria.c
@@ -517,8 +517,10 @@
                            unsigned char *output)
 {
     unsigned char temp[MBEDTLS_ARIA_BLOCKSIZE];
-    ARIA_VALIDATE_RET(mode == MBEDTLS_ARIA_ENCRYPT ||
-                      mode == MBEDTLS_ARIA_DECRYPT);
+
+    if ((mode != MBEDTLS_ARIA_ENCRYPT) && (mode != MBEDTLS_ARIA_DECRYPT)) {
+        return MBEDTLS_ERR_ARIA_BAD_INPUT_DATA;
+    }
 
     if (length % MBEDTLS_ARIA_BLOCKSIZE) {
         return MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH;
@@ -568,8 +570,10 @@
 {
     unsigned char c;
     size_t n;
-    ARIA_VALIDATE_RET(mode == MBEDTLS_ARIA_ENCRYPT ||
-                      mode == MBEDTLS_ARIA_DECRYPT);
+
+    if ((mode != MBEDTLS_ARIA_ENCRYPT) && (mode != MBEDTLS_ARIA_DECRYPT)) {
+        return MBEDTLS_ERR_ARIA_BAD_INPUT_DATA;
+    }
 
     n = *iv_off;
 
@@ -625,9 +629,6 @@
     int c, i;
     size_t n;
 
-    ARIA_VALIDATE_RET(length == 0 || input  != NULL);
-    ARIA_VALIDATE_RET(length == 0 || output != NULL);
-
     n = *nc_off;
     /* An overly large value of n can lead to an unlimited
      * buffer overflow. Therefore, guard against this