@@ -140,6 +140,10 @@ block cipher mechanism that uses n-bit binary string parameter key with 128-bits
140140 #include <wolfssl/wolfcrypt/cryptocb.h>
141141#endif
142142
143+ #ifdef WOLFSSL_NXP_HASHCRYPT_AES
144+ #include <wolfssl/wolfcrypt/port/nxp/hashcrypt_port.h>
145+ #endif
146+
143147#ifdef WOLFSSL_SECO_CAAM
144148#include <wolfssl/wolfcrypt/port/caam/wolfcaam.h>
145149#endif
@@ -5103,7 +5107,8 @@ static void AesSetKey_C(Aes* aes, const byte* key, word32 keySz, int dir)
51035107
51045108 #if defined(WOLF_CRYPTO_CB) || (defined(WOLFSSL_DEVCRYPTO) && \
51055109 (defined(WOLFSSL_DEVCRYPTO_AES) || defined(WOLFSSL_DEVCRYPTO_CBC))) || \
5106- (defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_AES))
5110+ (defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_AES)) || \
5111+ defined(WOLFSSL_NXP_HASHCRYPT_AES)
51075112 #ifdef WOLF_CRYPTO_CB
51085113 if (aes->devId != INVALID_DEVID)
51095114 #endif
@@ -6477,6 +6482,9 @@ int wc_AesSetIV(Aes* aes, const byte* iv)
64776482#elif defined(WOLFSSL_DEVCRYPTO_CBC)
64786483 /* implemented in wolfcrypt/src/port/devcrypt/devcrypto_aes.c */
64796484
6485+ #elif defined(WOLFSSL_NXP_HASHCRYPT_AES)
6486+ /* implemented in wolfcrypt/src/port/nxp/hashcrypt_port.c */
6487+
64806488#elif defined(WOLFSSL_SILABS_SE_ACCEL)
64816489 /* implemented in wolfcrypt/src/port/silabs/silabs_aes.c */
64826490
@@ -7144,7 +7152,11 @@ int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
71447152 #define NEED_AES_CTR_SOFT
71457153
71467154 #elif defined(WOLFSSL_HAVE_PSA) && !defined(WOLFSSL_PSA_NO_AES)
7147- /* implemented in wolfcrypt/src/port/psa/psa_aes.c */
7155+ /* implemented in wolfcrypt/src/port/psa/psa_aes.c */
7156+
7157+ #elif defined(WOLFSSL_NXP_HASHCRYPT_AES)
7158+ /* implemented in wolfcrypt/src/port/nxp/hashcrypt_port.c */
7159+
71487160 #else
71497161
71507162 /* Use software based AES counter */
@@ -13939,6 +13951,9 @@ int wc_AesGetKeySize(Aes* aes, word32* keySize)
1393913951#elif defined(WOLFSSL_RISCV_ASM)
1394013952 /* implemented in wolfcrypt/src/port/riscv/riscv-64-aes.c */
1394113953
13954+ #elif defined(WOLFSSL_NXP_HASHCRYPT_AES)
13955+ /* implemented in wolfcrypt/src/port/nxp/hashcrypt_port.c */
13956+
1394213957#elif defined(WOLFSSL_SILABS_SE_ACCEL)
1394313958 /* implemented in wolfcrypt/src/port/silabs/silabs_aes.c */
1394413959
@@ -14234,7 +14249,10 @@ int wc_AesEcbDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
1423414249
1423514250#if defined(WOLFSSL_AES_CFB)
1423614251
14237- #if defined(WOLFSSL_PSOC6_CRYPTO)
14252+ #if defined(WOLFSSL_NXP_HASHCRYPT_AES)
14253+ /* implemented in wolfcrypt/src/port/nxp/hashcrypt_port.c */
14254+
14255+ #elif defined(WOLFSSL_PSOC6_CRYPTO)
1423814256
1423914257int wc_AesCfbEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
1424014258{
@@ -14683,6 +14701,10 @@ int wc_AesCfb8Decrypt(Aes* aes, byte* out, const byte* in, word32 sz)
1468314701#endif /* WOLFSSL_AES_CFB */
1468414702
1468514703#ifdef WOLFSSL_AES_OFB
14704+ #ifdef WOLFSSL_NXP_HASHCRYPT_AES
14705+ /* implemented in wolfcrypt/src/port/nxp/hashcrypt_port.c */
14706+
14707+ #else /* software */
1468614708/* OFB AES mode
1468714709 *
1468814710 * aes structure holding key to use for encryption
@@ -14785,6 +14807,7 @@ int wc_AesOfbDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
1478514807 return AesOfbCrypt_C(aes, out, in, sz);
1478614808}
1478714809#endif /* HAVE_AES_DECRYPT */
14810+ #endif /* software */
1478814811#endif /* WOLFSSL_AES_OFB */
1478914812
1479014813
0 commit comments