From b169671c50e7c1779763ac89d35af11dc0997477 Mon Sep 17 00:00:00 2001
From: Dave Rodgman <dave.rodgman@arm.com>
Date: Thu, 13 Apr 2023 13:46:46 +0100
Subject: [PATCH] Tidy-up

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
---
 tests/suites/test_suite_alignment.function | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/suites/test_suite_alignment.function b/tests/suites/test_suite_alignment.function
index 3a5038e98..b027c4b11 100644
--- a/tests/suites/test_suite_alignment.function
+++ b/tests/suites/test_suite_alignment.function
@@ -20,13 +20,8 @@ int parse_hex_string(char *hex_string, uint64_t *result)
 
     /* If < 8 bytes, shift right and pad with leading zeros for big-endian */
     if (MBEDTLS_IS_BIG_ENDIAN && olen < 8) {
-        int offset = 8 - olen;
-        for (int i = olen - 1; i >= 0; i--) {
-            raw[i + offset] = raw[i];
-        }
-        for (int i = 0; i < offset; i++) {
-            raw[i] = 0;
-        }
+        memmove(raw + 8 - olen, raw, olen);
+        memset(raw, 0, 8 - olen);
     }
 
     *result = 0;