Skip to content

AArch64 XTS streaming and key schedule interop bug fix #11370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaleb-himes wants to merge 2 commits into
base: master
Choose a base branch
from
+1,942 −13
Open

AArch64 XTS streaming and key schedule interop bug fix #11370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8deff4
armasm64: AES-XTS streaming update
kaleb-himes Sep 3, 2026
2081e3b
aes: use the decrypt key schedule in the ARM and PPC XTS decrypt lanes
kaleb-himes Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions wolfcrypt/src/aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19361,17 +19361,17 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
* fallback is the software XTS (which dispatches per-block via
* wc_AesDecrypt). */
#ifdef WOLFSSL_ARM32_AES_DISPATCH
if (xaes->aes.use_aes_hw_crypto) {
AES_XTS_decrypt_AARCH32(in, out, sz, i, (byte*)xaes->aes.key,
(byte*)xaes->tweak.key, (byte*)xaes->aes.tmp, xaes->aes.rounds);
if (aes->use_aes_hw_crypto) {
AES_XTS_decrypt_AARCH32(in, out, sz, i, (byte*)aes->key,
(byte*)xaes->tweak.key, (byte*)aes->tmp, aes->rounds);
ret = 0;
}
else {
ret = AesXtsDecrypt_sw(xaes, out, in, sz, i);
}
#else
AES_XTS_decrypt_AARCH32(in, out, sz, i, (byte*)xaes->aes.key,
(byte*)xaes->tweak.key, (byte*)xaes->aes.tmp, xaes->aes.rounds);
AES_XTS_decrypt_AARCH32(in, out, sz, i, (byte*)aes->key,
(byte*)xaes->tweak.key, (byte*)aes->tmp, aes->rounds);
ret = 0;
#endif
#elif defined(WOLFSSL_AESNI)
Expand Down Expand Up @@ -19422,8 +19422,8 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
#elif defined(__aarch64__) && defined(WOLFSSL_ARMASM)
#if !defined(WOLFSSL_ARMASM_NO_HW_CRYPTO)
if (aes->use_aes_hw_crypto) {
AES_XTS_decrypt_AARCH64(in, out, sz, i, (byte*)xaes->aes.key,
(byte*)xaes->tweak.key, (byte*)xaes->aes.tmp, xaes->aes.rounds);
AES_XTS_decrypt_AARCH64(in, out, sz, i, (byte*)aes->key,
(byte*)xaes->tweak.key, (byte*)aes->tmp, aes->rounds);
ret = 0;
}
else
Expand All @@ -19433,8 +19433,8 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
if (sz >= 64)
#endif
{
AES_XTS_decrypt_NEON(in, out, sz, i, (byte*)xaes->aes.key,
(byte*)xaes->tweak.key, (byte*)xaes->aes.tmp, xaes->aes.rounds);
AES_XTS_decrypt_NEON(in, out, sz, i, (byte*)aes->key,
(byte*)xaes->tweak.key, (byte*)aes->tmp, aes->rounds);
ret = 0;
}
#ifndef WOLFSSL_ARMASM_NEON_NO_TABLE_LOOKUP
Expand All @@ -19443,14 +19443,14 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
#endif
#ifndef WOLFSSL_ARMASM_NEON_NO_TABLE_LOOKUP
{
AES_XTS_decrypt(in, out, sz, i, (byte*)xaes->aes.key,
(byte*)xaes->tweak.key, (byte*)xaes->aes.tmp, xaes->aes.rounds);
AES_XTS_decrypt(in, out, sz, i, (byte*)aes->key,
(byte*)xaes->tweak.key, (byte*)aes->tmp, aes->rounds);
ret = 0;
}
#endif
#elif defined(WOLFSSL_PPC64_ASM)
AES_XTS_decrypt(in, out, sz, i, (byte*)xaes->aes.key,
(byte*)xaes->tweak.key, (byte*)xaes->aes.tmp, xaes->aes.rounds);
AES_XTS_decrypt(in, out, sz, i, (byte*)aes->key,
(byte*)xaes->tweak.key, (byte*)aes->tmp, aes->rounds);
ret = 0;
#else
ret = AesXtsDecrypt_sw(xaes, out, in, sz, i);
Expand Down
Loading
Loading