commit 360e04f3791e62ab217f27cb145ebf309b2d75dc
author Dave Rodgman <dave.rodgman@arm.com> Fri Jun 09 17:18:32 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Fri Jun 09 17:23:15 2023 +0100
tree eff9d29fe21bd248f5c2145e2ea0e2e5cfa74ec9
parent f32176c0e38df6cf2d5b83c89501673303f32d3c

Fix AES-XTS perf regression

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

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index a137fb1..aa230fd 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1172,7 +1172,7 @@
     }
 
     while (blocks--) {
-        if (leftover && (mode == MBEDTLS_AES_DECRYPT) && blocks == 0) {
+        if (MBEDTLS_UNLIKELY(leftover && (mode == MBEDTLS_AES_DECRYPT) && blocks == 0)) {
             /* We are on the last block in a decrypt operation that has
              * leftover bytes, so we need to use the next tweak for this block,
              * and this tweak for the leftover bytes. Save the current tweak for