commit 7bb6b84b293d7c621dc7a3f15bc1b13976bcf912
author Dave Rodgman <dave.rodgman@arm.com> Tue Nov 22 16:18:55 2022 +0000
committer Dave Rodgman <dave.rodgman@arm.com> Tue Nov 22 17:32:43 2022 +0000
tree 7d507427c5616b18a4d0ca22b322f371c1689e7b
parent a8cf607458dfda284ceaabdf033e5a7a99a45807

Use mbedtls_xor in ARIA

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

library/aria.c

diff --git a/library/aria.c b/library/aria.c
index 924f952..a1876b7 100644
--- a/library/aria.c
+++ b/library/aria.c
@@ -588,7 +588,6 @@
                             const unsigned char *input,
                             unsigned char *output )
 {
-    int i;
     unsigned char temp[MBEDTLS_ARIA_BLOCKSIZE];
 
     ARIA_VALIDATE_RET( ctx != NULL );
@@ -608,8 +607,7 @@
             memcpy( temp, input, MBEDTLS_ARIA_BLOCKSIZE );
             mbedtls_aria_crypt_ecb( ctx, input, output );
 
-            for( i = 0; i < MBEDTLS_ARIA_BLOCKSIZE; i++ )
-                output[i] = (unsigned char)( output[i] ^ iv[i] );
+            mbedtls_xor( output, output, iv, MBEDTLS_ARIA_BLOCKSIZE );
 
             memcpy( iv, temp, MBEDTLS_ARIA_BLOCKSIZE );
 
@@ -622,8 +620,7 @@
     {
         while( length > 0 )
         {
-            for( i = 0; i < MBEDTLS_ARIA_BLOCKSIZE; i++ )
-                output[i] = (unsigned char)( input[i] ^ iv[i] );
+            mbedtls_xor( output, input, iv, MBEDTLS_ARIA_BLOCKSIZE );
 
             mbedtls_aria_crypt_ecb( ctx, output, output );
             memcpy( iv, output, MBEDTLS_ARIA_BLOCKSIZE );