From: Damjan Marion Date: Mon, 15 Jan 2024 10:37:33 +0000 (+0100) Subject: vppinfra: enable AES tests on ARM X-Git-Tag: v24.06-rc0~30 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=7e9513b8fcc838114ca58a093c751f3a50bafed6;p=vpp.git vppinfra: enable AES tests on ARM Type: improvement Change-Id: I30f3b2924ab219a8bace87f358b1b823e8bc83bb Signed-off-by: Damjan Marion --- diff --git a/src/vppinfra/crypto/aes_cbc.h b/src/vppinfra/crypto/aes_cbc.h index 64bc071e910..cb3d0784051 100644 --- a/src/vppinfra/crypto/aes_cbc.h +++ b/src/vppinfra/crypto/aes_cbc.h @@ -27,17 +27,10 @@ clib_aes_cbc_encrypt (const aes_cbc_key_data_t *kd, const u8 *src, uword len, for (int i = 0; i < len; i += 16) { int j; -#if __x86_64__ r = u8x16_xor3 (r, *(u8x16u *) (src + i), k[0]); for (j = 1; j < rounds; j++) r = aes_enc_round_x1 (r, k[j]); r = aes_enc_last_round_x1 (r, k[rounds]); -#else - r ^= *(u8x16u *) (src + i); - for (j = 1; j < rounds - 1; j++) - r = vaesmcq_u8 (vaeseq_u8 (r, k[j])); - r = vaeseq_u8 (r, k[j]) ^ k[rounds]; -#endif *(u8x16u *) (dst + i) = r; } } diff --git a/src/vppinfra/test/aes_cbc.c b/src/vppinfra/test/aes_cbc.c index bff439ab7b5..be5f8fb176a 100644 --- a/src/vppinfra/test/aes_cbc.c +++ b/src/vppinfra/test/aes_cbc.c @@ -2,7 +2,7 @@ * Copyright(c) 2021 Cisco Systems, Inc. */ -#ifdef __AES__ +#if defined(__AES__) || defined(__ARM_FEATURE_CRYPTO) #include #include #include diff --git a/src/vppinfra/test/aes_ctr.c b/src/vppinfra/test/aes_ctr.c index 1bf08b208d5..2892700fb27 100644 --- a/src/vppinfra/test/aes_ctr.c +++ b/src/vppinfra/test/aes_ctr.c @@ -2,7 +2,7 @@ * Copyright(c) 2024 Cisco Systems, Inc. */ -#if defined(__AES__) +#if defined(__AES__) || defined(__ARM_FEATURE_CRYPTO) #include #include #include diff --git a/src/vppinfra/test/aes_gcm.c b/src/vppinfra/test/aes_gcm.c index aeaf7cf8c15..caa36b0f710 100644 --- a/src/vppinfra/test/aes_gcm.c +++ b/src/vppinfra/test/aes_gcm.c @@ -2,7 +2,7 @@ * Copyright(c) 2021 Cisco Systems, Inc. */ -#if defined(__AES__) && defined(__PCLMUL__) +#if (defined(__AES__) && defined(__PCLMUL__)) || defined(__ARM_FEATURE_CRYPTO) #include #include #include