commit 28e4dc1e398f57230bba45f0f9451f24bf3b4016
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Mar 16 21:39:47 2023 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Mar 16 21:39:47 2023 +0100
tree d50759ff8d1ab57dc1bdceee939505a898243daf
parent 74b4223c81ac9256d531d5b688a7d5e8de5040b4

Fix use of arithmetic on void*

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/suites/test_suite_aes.function

diff --git a/tests/suites/test_suite_aes.function b/tests/suites/test_suite_aes.function
index a535086..363a5fd 100644
--- a/tests/suites/test_suite_aes.function
+++ b/tests/suites/test_suite_aes.function
@@ -529,81 +529,84 @@
     /* We test context copying multiple times, with different alignments
      * of the original and of the copies. */
 
-    void *src = NULL; // Memory block containing the original context
-    void *enc = NULL; // Memory block containing the copy doing encryption
-    void *dec = NULL; // Memory block containing the copy doing decryption
+    struct align0 {
+        mbedtls_aes_context ctx;
+    };
+    struct align0 *src0 = NULL;
+    struct align0 *enc0 = NULL;
+    struct align0 *dec0 = NULL;
 
     struct align1 {
         char bump;
         mbedtls_aes_context ctx;
     };
+    struct align1 *src1 = NULL;
+    struct align1 *enc1 = NULL;
+    struct align1 *dec1 = NULL;
 
     /* All peak alignment */
-    ASSERT_ALLOC(src, sizeof(mbedtls_aes_context));
-    ASSERT_ALLOC(enc, sizeof(mbedtls_aes_context));
-    ASSERT_ALLOC(dec, sizeof(mbedtls_aes_context));
-    if (!test_copy(key, src, enc, dec)) {
+    ASSERT_ALLOC(src0, 1);
+    ASSERT_ALLOC(enc0, 1);
+    ASSERT_ALLOC(dec0, 1);
+    if (!test_copy(key, &src0->ctx, &enc0->ctx, &dec0->ctx)) {
         goto exit;
     }
-    mbedtls_free(src);
-    src = NULL;
-    mbedtls_free(enc);
-    enc = NULL;
-    mbedtls_free(dec);
-    dec = NULL;
+    mbedtls_free(src0);
+    src0 = NULL;
+    mbedtls_free(enc0);
+    enc0 = NULL;
+    mbedtls_free(dec0);
+    dec0 = NULL;
 
     /* Original shifted */
-    ASSERT_ALLOC(src, sizeof(struct align1));
-    ASSERT_ALLOC(enc, sizeof(mbedtls_aes_context));
-    ASSERT_ALLOC(dec, sizeof(mbedtls_aes_context));
-    if (!test_copy(key, &((struct align1 *) src)->ctx, enc, dec)) {
+    ASSERT_ALLOC(src1, 1);
+    ASSERT_ALLOC(enc0, 1);
+    ASSERT_ALLOC(dec0, 1);
+    if (!test_copy(key, &src1->ctx, &enc0->ctx, &dec0->ctx)) {
         goto exit;
     }
-    mbedtls_free(src);
-    src = NULL;
-    mbedtls_free(enc);
-    enc = NULL;
-    mbedtls_free(dec);
-    dec = NULL;
+    mbedtls_free(src1);
+    src1 = NULL;
+    mbedtls_free(enc0);
+    enc0 = NULL;
+    mbedtls_free(dec0);
+    dec0 = NULL;
 
     /* Copies shifted */
-    ASSERT_ALLOC(src, sizeof(mbedtls_aes_context));
-    ASSERT_ALLOC(enc, sizeof(struct align1));
-    ASSERT_ALLOC(dec, sizeof(struct align1));
-    if (!test_copy(key,
-                   src,
-                   &((struct align1 *) enc)->ctx,
-                   &((struct align1 *) dec)->ctx)) {
+    ASSERT_ALLOC(src0, 1);
+    ASSERT_ALLOC(enc1, 1);
+    ASSERT_ALLOC(dec1, 1);
+    if (!test_copy(key, &src0->ctx, &enc1->ctx, &dec1->ctx)) {
         goto exit;
     }
-    mbedtls_free(src);
-    src = NULL;
-    mbedtls_free(enc);
-    enc = NULL;
-    mbedtls_free(dec);
-    dec = NULL;
+    mbedtls_free(src0);
+    src0 = NULL;
+    mbedtls_free(enc1);
+    enc1 = NULL;
+    mbedtls_free(dec1);
+    dec1 = NULL;
 
     /* Source and copies shifted */
-    ASSERT_ALLOC(src, sizeof(struct align1));
-    ASSERT_ALLOC(enc, sizeof(struct align1));
-    ASSERT_ALLOC(dec, sizeof(struct align1));
-    if (!test_copy(key,
-                   &((struct align1 *) src)->ctx,
-                   &((struct align1 *) enc)->ctx,
-                   &((struct align1 *) dec)->ctx)) {
+    ASSERT_ALLOC(src1, 1);
+    ASSERT_ALLOC(enc1, 1);
+    ASSERT_ALLOC(dec1, 1);
+    if (!test_copy(key, &src1->ctx, &enc1->ctx, &dec1->ctx)) {
         goto exit;
     }
-    mbedtls_free(src);
-    src = NULL;
-    mbedtls_free(enc);
-    enc = NULL;
-    mbedtls_free(dec);
-    dec = NULL;
+    mbedtls_free(src1);
+    src1 = NULL;
+    mbedtls_free(enc1);
+    enc1 = NULL;
+    mbedtls_free(dec1);
+    dec1 = NULL;
 
 exit:
-    mbedtls_free(src);
-    mbedtls_free(enc);
-    mbedtls_free(dec);
+    mbedtls_free(src0);
+    mbedtls_free(enc0);
+    mbedtls_free(dec0);
+    mbedtls_free(src1);
+    mbedtls_free(enc1);
+    mbedtls_free(dec1);
 }
 /* END_CASE */