Merge pull request #9479 from josepho0918/aes-cbc-mmcau

dgarske · web-flow · commit dd40417fcac0 · 2025-12-02T07:58:17.000-08:00
Prefer ARMASM over MMCAU for AES CBC when both enabled
diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
@@ -5886,7 +5886,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
     }
     #endif /* HAVE_AES_DECRYPT */
 
-#elif defined(FREESCALE_MMCAU)
+#elif defined(FREESCALE_MMCAU) && !defined(WOLFSSL_ARMASM)
     int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
     {
         int offset = 0;

Original file line number	Diff line number	Diff line change
`@@ -5886,7 +5886,7 @@ int wc_AesSetIV(Aes* aes, const byte* iv)`
`5886`	`5886`	`}`
`5887`	`5887`	`#endif /* HAVE_AES_DECRYPT */`
`5888`	`5888`
`5889`		`-#elif defined(FREESCALE_MMCAU)`
	`5889`	`+#elif defined(FREESCALE_MMCAU) && !defined(WOLFSSL_ARMASM)`
`5890`	`5890`	`int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)`
`5891`	`5891`	`{`
`5892`	`5892`	`int offset = 0;`