From 856c9a9a7ff4562bf0872b83e1898f4ffe3f8995 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Mon, 29 Jan 2024 00:17:19 -0600 Subject: [PATCH] wolfcrypt/src/port/arm/armv8-aes.c: revert changes in a0415ce855. --- wolfcrypt/src/port/arm/armv8-aes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/port/arm/armv8-aes.c b/wolfcrypt/src/port/arm/armv8-aes.c index 8430ec519..455d30bba 100644 --- a/wolfcrypt/src/port/arm/armv8-aes.c +++ b/wolfcrypt/src/port/arm/armv8-aes.c @@ -15624,7 +15624,7 @@ int wc_AesXtsEncrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz, : [blocks] "+r" (blocks), [in] "+r" (in), [out] "+r" (out), [sz] "+r" (sz) - : [key] "r" (xaes->aes_encrypt.key), [rounds] "r" (xaes->aes_encrypt.rounds), + : [key] "r" (xaes->aes.key), [rounds] "r" (xaes->aes.rounds), [key2] "r" (xaes->tweak.key), [i] "r" (i), [tmp] "r" (tmp) : "cc", "memory", @@ -15972,7 +15972,7 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz, : [blocks] "+r" (blocks), [in] "+r" (in), [out] "+r" (out), [sz] "+r" (sz) - : [key] "r" (xaes->aes_decrypt.key), [rounds] "r" (xaes->aes_decrypt.rounds), + : [key] "r" (xaes->aes.key), [rounds] "r" (xaes->aes.rounds), [key2] "r" (xaes->tweak.key), [i] "r" (i), [tmp] "r" (tmp) : "cc", "memory", @@ -16298,7 +16298,7 @@ int wc_AesXtsEncrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz, : [blocks] "+r" (blocks), [in] "+r" (in), [out] "+r" (out), [sz] "+r" (sz), [i] "+r" (i), [key2] "+r" (key2) - : [key] "r" (xaes->aes_encrypt.key), [rounds] "r" (xaes->aes_encrypt.rounds), + : [key] "r" (xaes->aes.key), [rounds] "r" (xaes->aes.rounds), [tmp] "r" (tmp) : "cc", "memory", "r9", "r10", "r11", "r12", "r14", @@ -16455,7 +16455,7 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz, : [blocks] "+r" (blocks), [in] "+r" (in), [out] "+r" (out), [sz] "+r" (sz), [i] "+r" (i), [key2] "+r" (key2) - : [key] "r" (xaes->aes_decrypt.key), [rounds] "r" (xaes->aes_decrypt.rounds), + : [key] "r" (xaes->aes.key), [rounds] "r" (xaes->aes.rounds), [tmp] "r" (tmp) : "cc", "memory", "r9", "r10", "r11", "r12", "r14",