commit d26a3d6da72e12e93d3384939bcc4241e47bcc99
author Dave Rodgman <dave.rodgman@arm.com> Mon Sep 11 18:25:16 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Mon Sep 18 19:09:45 2023 +0100
tree 9e79ab39a23ac63a0eea228576290fb94faf0d55
parent 8a7fb2d7992a0a3db46d825eff90557204e075bf

Eliminate duplicate ct memcmp

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/ccm.c

diff --git a/library/ccm.c b/library/ccm.c
index cd689c8..7b29775 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -33,6 +33,7 @@
 #include "mbedtls/ccm.h"
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
+#include "mbedtls/constant_time.h"
 
 #include <string.h>
 
@@ -533,13 +534,8 @@
                                     const unsigned char *tag2,
                                     size_t tag_len)
 {
-    unsigned char i;
-    int diff;
-
     /* Check tag in "constant-time" */
-    for (diff = 0, i = 0; i < tag_len; i++) {
-        diff |= tag1[i] ^ tag2[i];
-    }
+    int diff = mbedtls_ct_memcmp(tag1, tag2, tag_len);
 
     if (diff != 0) {
         return MBEDTLS_ERR_CCM_AUTH_FAILED;