commit 7656a373b60bb89a46c58932916c5a12cebb912f
author Werner Lewis <werner.lewis@arm.com> Mon Jun 13 12:28:20 2022 +0100
committer Werner Lewis <werner.lewis@arm.com> Wed Jun 29 16:17:50 2022 +0100
tree d5d46e85be5cfbe014657befbf456a4f03804449
parent 6d71944f0decef38b35c610ce950a16788c3e411

Reformat AES changes for readability

Signed-off-by: Werner Lewis <werner.lewis@arm.com>

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index af13d63..ca94e0a 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -550,15 +550,14 @@
     }
 #endif
 
+    ctx->rk_offset = 0;
 #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16)
     if( aes_padlock_ace == -1 )
         aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE );
 
     if( aes_padlock_ace )
         ctx->rk_offset = MBEDTLS_PADLOCK_ALIGN16( ctx->buf ) - ctx->buf;
-    else
 #endif
-    ctx->rk_offset = 0;
     RK = ctx->buf + ctx->rk_offset;
 
 #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
@@ -655,15 +654,14 @@
 
     mbedtls_aes_init( &cty );
 
+    ctx->rk_offset = 0;
 #if defined(MBEDTLS_PADLOCK_C) && defined(MBEDTLS_PADLOCK_ALIGN16)
     if( aes_padlock_ace == -1 )
         aes_padlock_ace = mbedtls_padlock_has_support( MBEDTLS_PADLOCK_ACE );
 
     if( aes_padlock_ace )
         ctx->rk_offset = MBEDTLS_PADLOCK_ALIGN16( ctx->buf ) - ctx->buf;
-    else
 #endif
-    ctx->rk_offset = 0;
     RK = ctx->buf + ctx->rk_offset;
 
     /* Also checks keybits */