mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2024-12-26 18:20:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9809 from solardiz/development

Browse Source 
Specify previously missed register clobbers in AES-NI asm blocks
This commit is contained in:
Paul Elliott 2024-12-13 15:26:27 +00:00 committed by GitHub
commit 8ef932312f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.d/fix-aesni-asm-clobbers.txt Normal file
View File

@ -0,0 +1,5 @@
Bugfix
* Fix missing constraints on the AES-NI inline assembly which is used on
GCC-like compilers when building AES for generic x86_64 targets. This
may have resulted in incorrect code with some compilers, depending on
optimizations. Fixes #9819.

8
tf-psa-crypto/drivers/builtin/src/aesni.c
View File

@ -489,7 +489,7 @@ int mbedtls_aesni_crypt_ecb(mbedtls_aes_context *ctx,
"movdqu %%xmm0, (%4) \n\t" // export output "movdqu %%xmm0, (%4) \n\t" // export output
: :
: "r" (ctx->nr), "r" (ctx->buf + ctx->rk_offset), "r" (mode), "r" (input), "r" (output) : "r" (ctx->nr), "r" (ctx->buf + ctx->rk_offset), "r" (mode), "r" (input), "r" (output)
: "memory", "cc", "xmm0", "xmm1"); : "memory", "cc", "xmm0", "xmm1", "0", "1");
return 0; return 0;
@ -679,7 +679,7 @@ static void aesni_setkey_enc_128(unsigned char *rk,
AESKEYGENA(xmm0_xmm1, "0x36") "call 1b \n\t" AESKEYGENA(xmm0_xmm1, "0x36") "call 1b \n\t"
: :
: "r" (rk), "r" (key) : "r" (rk), "r" (key)
: "memory", "cc", "0"); : "memory", "cc", "xmm0", "xmm1", "0");
} }
/* /*
@ -737,7 +737,7 @@ static void aesni_setkey_enc_192(unsigned char *rk,
: :
: "r" (rk), "r" (key) : "r" (rk), "r" (key)
: "memory", "cc", "0"); : "memory", "cc", "xmm0", "xmm1", "xmm2", "0");
} }
#endif /* !MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH */ #endif /* !MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH */
@ -805,7 +805,7 @@ static void aesni_setkey_enc_256(unsigned char *rk,
AESKEYGENA(xmm1_xmm2, "0x40") "call 1b \n\t" AESKEYGENA(xmm1_xmm2, "0x40") "call 1b \n\t"
: :
: "r" (rk), "r" (key) : "r" (rk), "r" (key)
: "memory", "cc", "0"); : "memory", "cc", "xmm0", "xmm1", "xmm2", "0");
} }
#endif /* !MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH */ #endif /* !MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH */