diff options
| -rw-r--r-- | src/plugins/crypto_native/aes_cbc.c | 31 | ||||
| -rw-r--r-- | src/vppinfra/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/vppinfra/crypto/aes.h | 86 | ||||
| -rw-r--r-- | src/vppinfra/crypto/aes_cbc.h | 28 | ||||
| -rw-r--r-- | src/vppinfra/crypto/aes_ctr.h | 190 | ||||
| -rw-r--r-- | src/vppinfra/crypto/aes_gcm.h | 274 | ||||
| -rw-r--r-- | src/vppinfra/test/aes_ctr.c | 481 |
7 files changed, 882 insertions, 210 deletions
diff --git a/src/plugins/crypto_native/aes_cbc.c b/src/plugins/crypto_native/aes_cbc.c index 1f21dc149fa..f2d700a0796 100644 --- a/src/plugins/crypto_native/aes_cbc.c +++ b/src/plugins/crypto_native/aes_cbc.c @@ -26,21 +26,18 @@ #endif #if defined(__VAES__) && defined(__AVX512F__) -#define N 16 #define u8xN u8x64 #define u32xN u32x16 #define u32xN_min_scalar u32x16_min_scalar #define u32xN_is_all_zero u32x16_is_all_zero #define u32xN_splat u32x16_splat #elif defined(__VAES__) -#define N 8 #define u8xN u8x32 #define u32xN u32x8 #define u32xN_min_scalar u32x8_min_scalar #define u32xN_is_all_zero u32x8_is_all_zero #define u32xN_splat u32x8_splat #else -#define N 4 #define u8xN u8x16 #define u32xN u32x4 #define u32xN_min_scalar u32x4_min_scalar @@ -58,17 +55,17 @@ aes_ops_enc_aes_cbc (vlib_main_t * vm, vnet_crypto_op_t * ops[], u32 i, j, count, n_left = n_ops; u32xN placeholder_mask = { }; u32xN len = { }; - vnet_crypto_key_index_t key_index[N]; - u8 *src[N] = { }; - u8 *dst[N] = { }; + vnet_crypto_key_index_t key_index[N_AES_BYTES]; + u8 *src[N_AES_BYTES] = {}; + u8 *dst[N_AES_BYTES] = {}; u8xN r[4] = {}; u8xN k[15][4] = {}; - for (i = 0; i < N; i++) + for (i = 0; i < N_AES_BYTES; i++) key_index[i] = ~0; more: - for (i = 0; i < N; i++) + for (i = 0; i < N_AES_BYTES; i++) if (len[i] == 0) { if (n_left == 0) @@ -160,16 +157,16 @@ more: for (j = 1; j < rounds; j++) { - r[0] = aes_enc_round (r[0], k[j][0]); - r[1] = aes_enc_round (r[1], k[j][1]); - r[2] = aes_enc_round (r[2], k[j][2]); - r[3] = aes_enc_round (r[3], k[j][3]); + r[0] = aes_enc_round_x1 (r[0], k[j][0]); + r[1] = aes_enc_round_x1 (r[1], k[j][1]); + r[2] = aes_enc_round_x1 (r[2], k[j][2]); + r[3] = aes_enc_round_x1 (r[3], k[j][3]); } - r[0] = aes_enc_last_round (r[0], k[j][0]); - r[1] = aes_enc_last_round (r[1], k[j][1]); - r[2] = aes_enc_last_round (r[2], k[j][2]); - r[3] = aes_enc_last_round (r[3], k[j][3]); + r[0] = aes_enc_last_round_x1 (r[0], k[j][0]); + r[1] = aes_enc_last_round_x1 (r[1], k[j][1]); + r[2] = aes_enc_last_round_x1 (r[2], k[j][2]); + r[3] = aes_enc_last_round_x1 (r[3], k[j][3]); aes_block_store (dst[0] + i, r[0]); aes_block_store (dst[1] + i, r[1]); @@ -201,7 +198,7 @@ more: len -= u32xN_splat (count); - for (i = 0; i < N; i++) + for (i = 0; i < N_AES_BYTES; i++) { src[i] += count; dst[i] += count; diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt index d64847161bd..6976ac59fc5 100644 --- a/src/vppinfra/CMakeLists.txt +++ b/src/vppinfra/CMakeLists.txt @@ -132,6 +132,7 @@ set(VPPINFRA_HEADERS crypto/ghash.h crypto/aes.h crypto/aes_cbc.h + crypto/aes_ctr.h crypto/aes_gcm.h crypto/poly1305.h dlist.h @@ -285,6 +286,7 @@ endif(VPP_BUILD_VPPINFRA_TESTS) set(test_files test/aes_cbc.c + test/aes_ctr.c test/aes_gcm.c test/poly1305.c test/array_mask.c diff --git a/src/vppinfra/crypto/aes.h b/src/vppinfra/crypto/aes.h index a5e286e4c6e..0aa154187a8 100644 --- a/src/vppinfra/crypto/aes.h +++ b/src/vppinfra/crypto/aes.h @@ -15,8 +15,8 @@ *------------------------------------------------------------------ */ -#ifndef __aesni_h__ -#define __aesni_h__ +#ifndef __aes_h__ +#define __aes_h__ typedef enum { @@ -35,7 +35,7 @@ aes_block_load (u8 * p) } static_always_inline u8x16 -aes_enc_round (u8x16 a, u8x16 k) +aes_enc_round_x1 (u8x16 a, u8x16 k) { #if defined (__AES__) return (u8x16) _mm_aesenc_si128 ((__m128i) a, (__m128i) k); @@ -97,7 +97,7 @@ aes_dec_last_round_x2 (u8x32 a, u8x32 k) #endif static_always_inline u8x16 -aes_enc_last_round (u8x16 a, u8x16 k) +aes_enc_last_round_x1 (u8x16 a, u8x16 k) { #if defined (__AES__) return (u8x16) _mm_aesenclast_si128 ((__m128i) a, (__m128i) k); @@ -109,13 +109,13 @@ aes_enc_last_round (u8x16 a, u8x16 k) #ifdef __x86_64__ static_always_inline u8x16 -aes_dec_round (u8x16 a, u8x16 k) +aes_dec_round_x1 (u8x16 a, u8x16 k) { return (u8x16) _mm_aesdec_si128 ((__m128i) a, (__m128i) k); } static_always_inline u8x16 -aes_dec_last_round (u8x16 a, u8x16 k) +aes_dec_last_round_x1 (u8x16 a, u8x16 k) { return (u8x16) _mm_aesdeclast_si128 ((__m128i) a, (__m128i) k); } @@ -133,8 +133,8 @@ aes_encrypt_block (u8x16 block, const u8x16 * round_keys, aes_key_size_t ks) int rounds = AES_KEY_ROUNDS (ks); block ^= round_keys[0]; for (int i = 1; i < rounds; i += 1) - block = aes_enc_round (block, round_keys[i]); - return aes_enc_last_round (block, round_keys[rounds]); + block = aes_enc_round_x1 (block, round_keys[i]); + return aes_enc_last_round_x1 (block, round_keys[rounds]); } static_always_inline u8x16 @@ -427,13 +427,67 @@ aes_key_enc_to_dec (u8x16 * ke, u8x16 * kd, aes_key_size_t ks) kd[rounds / 2] = aes_inv_mix_column (ke[rounds / 2]); } +#if defined(__VAES__) && defined(__AVX512F__) +#define N_AES_LANES 4 +#define aes_load_partial(p, n) u8x64_load_partial ((u8 *) (p), n) +#define aes_store_partial(v, p, n) u8x64_store_partial (v, (u8 *) (p), n) +#define aes_reflect(r) u8x64_reflect_u8x16 (r) +typedef u8x64 aes_data_t; +typedef u8x64u aes_mem_t; +typedef u32x16 aes_counter_t; +#elif defined(__VAES__) +#define N_AES_LANES 2 +#define aes_load_partial(p, n) u8x32_load_partial ((u8 *) (p), n) +#define aes_store_partial(v, p, n) u8x32_store_partial (v, (u8 *) (p), n) +#define aes_reflect(r) u8x32_reflect_u8x16 (r) +typedef u8x32 aes_data_t; +typedef u8x32u aes_mem_t; +typedef u32x8 aes_counter_t; +#else +#define N_AES_LANES 1 +#define aes_load_partial(p, n) u8x16_load_partial ((u8 *) (p), n) +#define aes_store_partial(v, p, n) u8x16_store_partial (v, (u8 *) (p), n) +#define aes_reflect(r) u8x16_reflect (r) +typedef u8x16 aes_data_t; +typedef u8x16u aes_mem_t; +typedef u32x4 aes_counter_t; +#endif -#endif /* __aesni_h__ */ +#define N_AES_BYTES (N_AES_LANES * 16) -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ +typedef union +{ + u8x16 x1; + u8x32 x2; + u8x64 x4; + u8x16 lanes[4]; +} aes_expaned_key_t; + +static_always_inline void +aes_enc_round (aes_data_t *r, const aes_expaned_key_t *ek, uword n_blocks) +{ + for (int i = 0; i < n_blocks; i++) +#if N_AES_LANES == 4 + r[i] = aes_enc_round_x4 (r[i], ek->x4); +#elif N_AES_LANES == 2 + r[i] = aes_enc_round_x2 (r[i], ek->x2); +#else + r[i] = aes_enc_round_x1 (r[i], ek->x1); +#endif +} + +static_always_inline void +aes_enc_last_round (aes_data_t *r, aes_data_t *d, const aes_expaned_key_t *ek, + uword n_blocks) +{ + for (int i = 0; i < n_blocks; i++) +#if N_AES_LANES == 4 + d[i] ^= r[i] = aes_enc_last_round_x4 (r[i], ek->x4); +#elif N_AES_LANES == 2 + d[i] ^= r[i] = aes_enc_last_round_x2 (r[i], ek->x2); +#else + d[i] ^= r[i] = aes_enc_last_round_x1 (r[i], ek->x1); +#endif +} + +#endif /* __aes_h__ */ diff --git a/src/vppinfra/crypto/aes_cbc.h b/src/vppinfra/crypto/aes_cbc.h index 3f0f1f1f797..64bc071e910 100644 --- a/src/vppinfra/crypto/aes_cbc.h +++ b/src/vppinfra/crypto/aes_cbc.h @@ -30,8 +30,8 @@ clib_aes_cbc_encrypt (const aes_cbc_key_data_t *kd, const u8 *src, uword len, #if __x86_64__ r = u8x16_xor3 (r, *(u8x16u *) (src + i), k[0]); for (j = 1; j < rounds; j++) - r = aes_enc_round (r, k[j]); - r = aes_enc_last_round (r, k[rounds]); + 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++) @@ -85,16 +85,16 @@ aes_cbc_dec (const u8x16 *k, u8x16u *src, u8x16u *dst, u8x16u *iv, int count, for (int i = 1; i < rounds; i++) { - r[0] = aes_dec_round (r[0], k[i]); - r[1] = aes_dec_round (r[1], k[i]); - r[2] = aes_dec_round (r[2], k[i]); - r[3] = aes_dec_round (r[3], k[i]); + r[0] = aes_dec_round_x1 (r[0], k[i]); + r[1] = aes_dec_round_x1 (r[1], k[i]); + r[2] = aes_dec_round_x1 (r[2], k[i]); + r[3] = aes_dec_round_x1 (r[3], k[i]); } - r[0] = aes_dec_last_round (r[0], k[rounds]); - r[1] = aes_dec_last_round (r[1], k[rounds]); - r[2] = aes_dec_last_round (r[2], k[rounds]); - r[3] = aes_dec_last_round (r[3], k[rounds]); + r[0] = aes_dec_last_round_x1 (r[0], k[rounds]); + r[1] = aes_dec_last_round_x1 (r[1], k[rounds]); + r[2] = aes_dec_last_round_x1 (r[2], k[rounds]); + r[3] = aes_dec_last_round_x1 (r[3], k[rounds]); #else for (int i = 0; i < rounds - 1; i++) { @@ -125,8 +125,8 @@ aes_cbc_dec (const u8x16 *k, u8x16u *src, u8x16u *dst, u8x16u *iv, int count, #if __x86_64__ r[0] ^= k[0]; for (int i = 1; i < rounds; i++) - r[0] = aes_dec_round (r[0], k[i]); - r[0] = aes_dec_last_round (r[0], k[rounds]); + r[0] = aes_dec_round_x1 (r[0], k[i]); + r[0] = aes_dec_last_round_x1 (r[0], k[rounds]); #else c[0] = r[0] = src[0]; for (int i = 0; i < rounds - 1; i++) @@ -469,8 +469,8 @@ aes2_cbc_dec (const u8x16 *k, u8x32u *src, u8x32u *dst, u8x16u *iv, int count, { u8x16 rl = *(u8x16u *) src ^ k[0]; for (i = 1; i < rounds; i++) - rl = aes_dec_round (rl, k[i]); - rl = aes_dec_last_round (rl, k[i]); + rl = aes_dec_round_x1 (rl, k[i]); + rl = aes_dec_last_round_x1 (rl, k[i]); *(u8x16u *) dst = rl ^ u8x32_extract_hi (f); } } diff --git a/src/vppinfra/crypto/aes_ctr.h b/src/vppinfra/crypto/aes_ctr.h new file mode 100644 index 00000000000..74a9f96d90d --- /dev/null +++ b/src/vppinfra/crypto/aes_ctr.h @@ -0,0 +1,190 @@ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright(c) 2024 Cisco Systems, Inc. + */ + +#ifndef __crypto_aes_ctr_h__ +#define __crypto_aes_ctr_h__ + +#include <vppinfra/clib.h> +#include <vppinfra/vector.h> +#include <vppinfra/cache.h> +#include <vppinfra/string.h> +#include <vppinfra/crypto/aes.h> + +typedef struct +{ + const aes_expaned_key_t exp_key[AES_KEY_ROUNDS (AES_KEY_256) + 1]; +} aes_ctr_key_data_t; + +typedef struct +{ + const aes_expaned_key_t exp_key[AES_KEY_ROUNDS (AES_KEY_256) + 1]; + aes_counter_t ctr; /* counter (reflected) */ + u8 keystream_bytes[N_AES_BYTES]; /* keystream leftovers */ + u32 n_keystream_bytes; /* number of keystream leftovers */ +} aes_ctr_ctx_t; + +static_always_inline aes_counter_t +aes_ctr_one_block (aes_ctr_ctx_t *ctx, aes_counter_t ctr, const u8 *src, + u8 *dst, u32 n_parallel, u32 n_bytes, int rounds, int last) +{ + u32 __clib_aligned (N_AES_BYTES) + inc[] = { N_AES_LANES, 0, 0, 0, N_AES_LANES, 0, 0, 0, + N_AES_LANES, 0, 0, 0, N_AES_LANES, 0, 0, 0 }; + const aes_expaned_key_t *k = ctx->exp_key; + const aes_mem_t *sv = (aes_mem_t *) src; + aes_mem_t *dv = (aes_mem_t *) dst; + aes_data_t d[4], t[4]; + u32 r; + + n_bytes -= (n_parallel - 1) * N_AES_BYTES; + + /* AES First Round */ + for (int i = 0; i < n_parallel; i++) + { +#if N_AES_LANES == 4 + t[i] = k[0].x4 ^ (u8x64) aes_reflect ((u8x64) ctr); +#elif N_AES_LANES == 2 + t[i] = k[0].x2 ^ (u8x32) aes_reflect ((u8x32) ctr); +#else + t[i] = k[0].x1 ^ (u8x16) aes_reflect ((u8x16) ctr); +#endif + ctr += *(aes_counter_t *) inc; + } + + /* Load Data */ + for (int i = 0; i < n_parallel - last; i++) + d[i] = sv[i]; + + if (last) + d[n_parallel - 1] = + aes_load_partial ((u8 *) (sv + n_parallel - 1), n_bytes); + + /* AES Intermediate Rounds */ + for (r = 1; r < rounds; r++) + aes_enc_round (t, k + r, n_parallel); + + /* AES Last Round */ + aes_enc_last_round (t, d, k + r, n_parallel); + + /* Store Data */ + for (int i = 0; i < n_parallel - last; i++) + dv[i] = d[i]; + + if (last) + { + aes_store_partial (d[n_parallel - 1], dv + n_parallel - 1, n_bytes); + *(aes_data_t *) ctx->keystream_bytes = t[n_parallel - 1]; + ctx->n_keystream_bytes = N_AES_BYTES - n_bytes; + } + + return ctr; +} + +static_always_inline void +clib_aes_ctr_init (aes_ctr_ctx_t *ctx, const aes_ctr_key_data_t *kd, + const u8 *iv, aes_key_size_t ks) +{ + u32x4 ctr = (u32x4) u8x16_reflect (*(u8x16u *) iv); +#if N_AES_LANES == 4 + ctx->ctr = (aes_counter_t) u32x16_splat_u32x4 (ctr) + + (u32x16){ 0, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0 }; +#elif N_AES_LANES == 2 + ctx->ctr = (aes_counter_t) u32x8_splat_u32x4 (ctr) + + (u32x8){ 0, 0, 0, 0, 1, 0, 0, 0 }; +#else + ctx->ctr = ctr; +#endif + for (int i = 0; i < AES_KEY_ROUNDS (ks) + 1; i++) + ((aes_expaned_key_t *) ctx->exp_key)[i] = kd->exp_key[i]; + ctx->n_keystream_bytes = 0; +} + +static_always_inline void +clib_aes_ctr_transform (aes_ctr_ctx_t *ctx, const u8 *src, u8 *dst, + u32 n_bytes, aes_key_size_t ks) +{ + int r = AES_KEY_ROUNDS (ks); + aes_counter_t ctr = ctx->ctr; + + if (ctx->n_keystream_bytes) + { + u8 *ks = ctx->keystream_bytes + N_AES_BYTES - ctx->n_keystream_bytes; + + if (ctx->n_keystream_bytes >= n_bytes) + { + for (int i = 0; i < n_bytes; i++) + dst[i] = src[i] ^ ks[i]; + ctx->n_keystream_bytes -= n_bytes; + return; + } + + for (int i = 0; i < ctx->n_keystream_bytes; i++) + dst++[0] = src++[0] ^ ks[i]; + + n_bytes -= ctx->n_keystream_bytes; + ctx->n_keystream_bytes = 0; + } + + /* main loop */ + for (int n = 4 * N_AES_BYTES; n_bytes >= n; n_bytes -= n, dst += n, src += n) + ctr = aes_ctr_one_block (ctx, ctr, src, dst, 4, n, r, 0); + + if (n_bytes) + { + if (n_bytes > 3 * N_AES_BYTES) + ctr = aes_ctr_one_block (ctx, ctr, src, dst, 4, n_bytes, r, 1); + else if (n_bytes > 2 * N_AES_BYTES) + ctr = aes_ctr_one_block (ctx, ctr, src, dst, 3, n_bytes, r, 1); + else if (n_bytes > N_AES_BYTES) + ctr = aes_ctr_one_block (ctx, ctr, src, dst, 2, n_bytes, r, 1); + else + ctr = aes_ctr_one_block (ctx, ctr, src, dst, 1, n_bytes, r, 1); + } + else + ctx->n_keystream_bytes = 0; + + ctx->ctr = ctr; +} + +static_always_inline void +clib_aes_ctr_key_expand (aes_ctr_key_data_t *kd, const u8 *key, + aes_key_size_t ks) +{ + u8x16 ek[AES_KEY_ROUNDS (AES_KEY_256) + 1]; + aes_expaned_key_t *k = (aes_expaned_key_t *) kd->exp_key; + + /* expand AES key */ + aes_key_expand (ek, key, ks); + for (int i = 0; i < AES_KEY_ROUNDS (ks) + 1; i++) + k[i].lanes[0] = k[i].lanes[1] = k[i].lanes[2] = k[i].lanes[3] = ek[i]; +} + +static_always_inline void +clib_aes128_ctr (const aes_ctr_key_data_t *kd, const u8 *src, u32 n_bytes, + const u8 *iv, u8 *dst) +{ + aes_ctr_ctx_t ctx; + clib_aes_ctr_init (&ctx, kd, iv, AES_KEY_128); + clib_aes_ctr_transform (&ctx, src, dst, n_bytes, AES_KEY_128); +} + +static_always_inline void +clib_aes192_ctr (const aes_ctr_key_data_t *kd, const u8 *src, u32 n_bytes, + const u8 *iv, u8 *dst) +{ + aes_ctr_ctx_t ctx; + clib_aes_ctr_init (&ctx, kd, iv, AES_KEY_192); + clib_aes_ctr_transform (&ctx, src, dst, n_bytes, AES_KEY_192); +} + +static_always_inline void +clib_aes256_ctr (const aes_ctr_key_data_t *kd, const u8 *src, u32 n_bytes, + const u8 *iv, u8 *dst) +{ + aes_ctr_ctx_t ctx; + clib_aes_ctr_init (&ctx, kd, iv, AES_KEY_256); + clib_aes_ctr_transform (&ctx, src, dst, n_bytes, AES_KEY_256); +} + +#endif /* __crypto_aes_ctr_h__ */ diff --git a/src/vppinfra/crypto/aes_gcm.h b/src/vppinfra/crypto/aes_gcm.h index 3d1b220f7b8..5b628c87745 100644 --- a/src/vppinfra/crypto/aes_gcm.h +++ b/src/vppinfra/crypto/aes_gcm.h @@ -13,47 +13,25 @@ #include <vppinfra/crypto/ghash.h> #define NUM_HI 36 -#if defined(__VAES__) && defined(__AVX512F__) -typedef u8x64 aes_data_t; +#if N_AES_LANES == 4 typedef u8x64u aes_ghash_t; -typedef u8x64u aes_mem_t; -typedef u32x16 aes_gcm_counter_t; -#define N 64 -#define aes_gcm_load_partial(p, n) u8x64_load_partial ((u8 *) (p), n) -#define aes_gcm_store_partial(v, p, n) u8x64_store_partial (v, (u8 *) (p), n) #define aes_gcm_splat(v) u8x64_splat (v) -#define aes_gcm_reflect(r) u8x64_reflect_u8x16 (r) #define aes_gcm_ghash_reduce(c) ghash4_reduce (&(c)->gd) #define aes_gcm_ghash_reduce2(c) ghash4_reduce2 (&(c)->gd) #define aes_gcm_ghash_final(c) (c)->T = ghash4_final (&(c)->gd) -#elif defined(__VAES__) -typedef u8x32 aes_data_t; +#elif N_AES_LANES == 2 typedef u8x32u aes_ghash_t; -typedef u8x32u aes_mem_t; -typedef u32x8 aes_gcm_counter_t; -#define N 32 -#define aes_gcm_load_partial(p, n) u8x32_load_partial ((u8 *) (p), n) -#define aes_gcm_store_partial(v, p, n) u8x32_store_partial (v, (u8 *) (p), n) #define aes_gcm_splat(v) u8x32_splat (v) -#define aes_gcm_reflect(r) u8x32_reflect_u8x16 (r) #define aes_gcm_ghash_reduce(c) ghash2_reduce (&(c)->gd) #define aes_gcm_ghash_reduce2(c) ghash2_reduce2 (&(c)->gd) #define aes_gcm_ghash_final(c) (c)->T = ghash2_final (&(c)->gd) #else -typedef u8x16 aes_data_t; typedef u8x16 aes_ghash_t; -typedef u8x16u aes_mem_t; -typedef u32x4 aes_gcm_counter_t; -#define N 16 -#define aes_gcm_load_partial(p, n) u8x16_load_partial ((u8 *) (p), n) -#define aes_gcm_store_partial(v, p, n) u8x16_store_partial (v, (u8 *) (p), n) #define aes_gcm_splat(v) u8x16_splat (v) -#define aes_gcm_reflect(r) u8x16_reflect (r) #define aes_gcm_ghash_reduce(c) ghash_reduce (&(c)->gd) #define aes_gcm_ghash_reduce2(c) ghash_reduce2 (&(c)->gd) #define aes_gcm_ghash_final(c) (c)->T = ghash_final (&(c)->gd) #endif -#define N_LANES (N / 16) typedef enum { @@ -63,21 +41,12 @@ typedef enum AES_GCM_OP_GMAC } aes_gcm_op_t; -typedef union -{ - u8x16 x1; - u8x32 x2; - u8x64 x4; - u8x16 lanes[4]; -} __clib_aligned (64) -aes_gcm_expaned_key_t; - typedef struct { /* pre-calculated hash key values */ const u8x16 Hi[NUM_HI]; /* extracted AES key */ - const aes_gcm_expaned_key_t Ke[AES_KEY_ROUNDS (AES_KEY_256) + 1]; + const aes_expaned_key_t Ke[AES_KEY_ROUNDS (AES_KEY_256) + 1]; } aes_gcm_key_data_t; typedef struct @@ -95,12 +64,12 @@ typedef struct const aes_ghash_t *next_Hi; /* expaded keys */ - const aes_gcm_expaned_key_t *Ke; + const aes_expaned_key_t *Ke; /* counter */ u32 counter; u8x16 EY0; - aes_gcm_counter_t Y; + aes_counter_t Y; /* ghash */ ghash_ctx_t gd; @@ -117,39 +86,39 @@ aes_gcm_ghash_mul_first (aes_gcm_ctx_t *ctx, aes_data_t data, u32 n_lanes) { uword hash_offset = NUM_HI - n_lanes; ctx->next_Hi = (aes_ghash_t *) (ctx->Hi + hash_offset); -#if N_LANES == 4 +#if N_AES_LANES == 4 u8x64 tag4 = {}; tag4 = u8x64_insert_u8x16 (tag4, ctx->T, 0); - ghash4_mul_first (&ctx->gd, aes_gcm_reflect (data) ^ tag4, *ctx->next_Hi++); -#elif N_LANES == 2 + ghash4_mul_first (&ctx->gd, aes_reflect (data) ^ tag4, *ctx->next_Hi++); +#elif N_AES_LANES == 2 u8x32 tag2 = {}; tag2 = u8x32_insert_lo (tag2, ctx->T); - ghash2_mul_first (&ctx->gd, aes_gcm_reflect (data) ^ tag2, *ctx->next_Hi++); + ghash2_mul_first (&ctx->gd, aes_reflect (data) ^ tag2, *ctx->next_Hi++); #else - ghash_mul_first (&ctx->gd, aes_gcm_reflect (data) ^ ctx->T, *ctx->next_Hi++); + ghash_mul_first (&ctx->gd, aes_reflect (data) ^ ctx->T, *ctx->next_Hi++); #endif } static_always_inline void aes_gcm_ghash_mul_next (aes_gcm_ctx_t *ctx, aes_data_t data) { -#if N_LANES == 4 - ghash4_mul_next (&ctx->gd, aes_gcm_reflect (data), *ctx->next_Hi++); -#elif N_LANES == 2 - ghash2_mul_next (&ctx->gd, aes_gcm_reflect (data), *ctx->next_Hi++); +#if N_AES_LANES == 4 + ghash4_mul_next (&ctx->gd, aes_reflect (data), *ctx->next_Hi++); +#elif N_AES_LANES == 2 + ghash2_mul_next (&ctx->gd, aes_reflect (data), *ctx->next_Hi++); #else - ghash_mul_next (&ctx->gd, aes_gcm_reflect (data), *ctx->next_Hi++); + ghash_mul_next (&ctx->gd, aes_reflect (data), *ctx->next_Hi++); #endif } static_always_inline void aes_gcm_ghash_mul_final_block (aes_gcm_ctx_t *ctx) { -#if N_LANES == 4 +#if N_AES_LANES == 4 u8x64 h = u8x64_insert_u8x16 (u8x64_zero (), ctx->Hi[NUM_HI - 1], 0); u8x64 r4 = u8x64_insert_u8x16 (u8x64_zero (), aes_gcm_final_block (ctx), 0); ghash4_mul_next (&ctx->gd, r4, h); -#elif N_LANES == 2 +#elif N_AES_LANES == 2 u8x32 h = u8x32_insert_lo (u8x32_zero (), ctx->Hi[NUM_HI - 1]); u8x32 r2 = u8x32_insert_lo (u8x32_zero (), aes_gcm_final_block (ctx)); ghash2_mul_next (&ctx->gd, r2, h); @@ -164,9 +133,9 @@ aes_gcm_enc_ctr0_round (aes_gcm_ctx_t *ctx, int aes_round) if (aes_round == 0) ctx->EY0 ^= ctx->Ke[0].x1; else if (aes_round == ctx->rounds) - ctx->EY0 = aes_enc_last_round (ctx->EY0, ctx->Ke[aes_round].x1); + ctx->EY0 = aes_enc_last_round_x1 (ctx->EY0, ctx->Ke[aes_round].x1); else - ctx->EY0 = aes_enc_round (ctx->EY0, ctx->Ke[aes_round].x1); + ctx->EY0 = aes_enc_round_x1 (ctx->EY0, ctx->Ke[aes_round].x1); } static_always_inline void @@ -176,11 +145,11 @@ aes_gcm_ghash (aes_gcm_ctx_t *ctx, u8 *data, u32 n_left) aes_data_t r = {}; const aes_mem_t *d = (aes_mem_t *) data; - for (; n_left >= 8 * N; n_left -= 8 * N, d += 8) + for (int n = 8 * N_AES_BYTES; n_left >= n; n_left -= n, d += 8) { - if (ctx->operation == AES_GCM_OP_GMAC && n_left == N * 8) + if (ctx->operation == AES_GCM_OP_GMAC && n_left == n) { - aes_gcm_ghash_mul_first (ctx, d[0], 8 * N_LANES + 1); + aes_gcm_ghash_mul_first (ctx, d[0], 8 * N_AES_LANES + 1); for (i = 1; i < 8; i++) aes_gcm_ghash_mul_next (ctx, d[i]); aes_gcm_ghash_mul_final_block (ctx); @@ -190,7 +159,7 @@ aes_gcm_ghash (aes_gcm_ctx_t *ctx, u8 *data, u32 n_left) goto done; } - aes_gcm_ghash_mul_first (ctx, d[0], 8 * N_LANES); + aes_gcm_ghash_mul_first (ctx, d[0], 8 * N_AES_LANES); for (i = 1; i < 8; i++) aes_gcm_ghash_mul_next (ctx, d[i]); aes_gcm_ghash_reduce (ctx); @@ -205,7 +174,7 @@ aes_gcm_ghash (aes_gcm_ctx_t *ctx, u8 *data, u32 n_left) if (ctx->operation == AES_GCM_OP_GMAC) n_lanes++; - if (n_left < N) + if (n_left < N_AES_BYTES) { clib_memcpy_fast (&r, d, n_left); aes_gcm_ghash_mul_first (ctx, r, n_lanes); @@ -213,30 +182,30 @@ aes_gcm_ghash (aes_gcm_ctx_t *ctx, u8 *data, u32 n_left) else { aes_gcm_ghash_mul_first (ctx, d[0], n_lanes); - n_left -= N; + n_left -= N_AES_BYTES; i = 1; - if (n_left >= 4 * N) + if (n_left >= 4 * N_AES_BYTES) { aes_gcm_ghash_mul_next (ctx, d[i]); aes_gcm_ghash_mul_next (ctx, d[i + 1]); aes_gcm_ghash_mul_next (ctx, d[i + 2]); aes_gcm_ghash_mul_next (ctx, d[i + 3]); - n_left -= 4 * N; + n_left -= 4 * N_AES_BYTES; i += 4; } - if (n_left >= 2 * N) + if (n_left >= 2 * N_AES_BYTES) { aes_gcm_ghash_mul_next (ctx, d[i]); aes_gcm_ghash_mul_next (ctx, d[i + 1]); - n_left -= 2 * N; + n_left -= 2 * N_AES_BYTES; i += 2; } - if (n_left >= N) + if (n_left >= N_AES_BYTES) { aes_gcm_ghash_mul_next (ctx, d[i]); - n_left -= N; + n_left -= N_AES_BYTES; i += 1; } @@ -267,7 +236,7 @@ done: static_always_inline void aes_gcm_enc_first_round (aes_gcm_ctx_t *ctx, aes_data_t *r, uword n_blocks) { - const aes_gcm_expaned_key_t Ke0 = ctx->Ke[0]; + const aes_expaned_key_t Ke0 = ctx->Ke[0]; uword i = 0; /* As counter is stored in network byte order for performance reasons we @@ -275,7 +244,7 @@ aes_gcm_enc_first_round (aes_gcm_ctx_t *ctx, aes_data_t *r, uword n_blocks) overlow. As we are processing four 128, 256 or 512-blocks in parallel except the last round, overflow can happen only when n_blocks == 4 */ -#if N_LANES == 4 +#if N_AES_LANES == 4 const u32x16 ctr_inv_4444 = { 0, 0, 0, 4 << 24, 0, 0, 0, 4 << 24, 0, 0, 0, 4 << 24, 0, 0, 0, 4 << 24 }; @@ -292,13 +261,13 @@ aes_gcm_enc_first_round (aes_gcm_ctx_t *ctx, aes_data_t *r, uword n_blocks) if (n_blocks == 4 && PREDICT_FALSE ((u8) ctx->counter == 242)) { - u32x16 Yr = (u32x16) aes_gcm_reflect ((u8x64) ctx->Y); + u32x16 Yr = (u32x16) aes_reflect ((u8x64) ctx->Y); for (; i < n_blocks; i++) { r[i] = Ke0.x4 ^ (u8x64) ctx->Y; /* Initial AES round */ Yr += ctr_4444; - ctx->Y = (u32x16) aes_gcm_reflect ((u8x64) Yr); + ctx->Y = (u32x16) aes_reflect ((u8x64) Yr); } } else @@ -310,7 +279,7 @@ aes_gcm_enc_first_round (aes_gcm_ctx_t *ctx, aes_data_t *r, uword n_blocks) } } ctx->counter += n_blocks * 4; -#elif N_LANES == 2 +#elif N_AES_LANES == 2 const u32x8 ctr_inv_22 = { 0, 0, 0, 2 << 24, 0, 0, 0, 2 << 24 }; const u32x8 ctr_22 = { 2, 0, 0, 0, 2, 0, 0, 0 }; @@ -323,13 +292,13 @@ aes_gcm_enc_first_round (aes_gcm_ctx_t *ctx, aes_data_t *r, uword n_blocks) if (n_blocks == 4 && PREDICT_FALSE ((u8) ctx->counter == 250)) { - u32x8 Yr = (u32x8) aes_gcm_reflect ((u8x32) ctx->Y); + u32x8 Yr = (u32x8) aes_reflect ((u8x32) ctx->Y); for (; i < n_blocks; i++) { r[i] = Ke0.x2 ^ (u8x32) ctx->Y; /* Initial AES round */ Yr += ctr_22; - ctx->Y = (u32x8) aes_gcm_reflect ((u8x32) Yr); + ctx->Y = (u32x8) aes_reflect ((u8x32) Yr); } } else @@ -370,42 +339,21 @@ aes_gcm_enc_first_round (aes_gcm_ctx_t *ctx, aes_data_t *r, uword n_blocks) } static_always_inline void -aes_gcm_enc_round (aes_data_t *r, const aes_gcm_expaned_key_t *Ke, - uword n_blocks) -{ - for (int i = 0; i < n_blocks; i++) -#if N_LANES == 4 - r[i] = aes_enc_round_x4 (r[i], Ke->x4); -#elif N_LANES == 2 - r[i] = aes_enc_round_x2 (r[i], Ke->x2); -#else - r[i] = aes_enc_round (r[i], Ke->x1); -#endif -} - -static_always_inline void aes_gcm_enc_last_round (aes_gcm_ctx_t *ctx, aes_data_t *r, aes_data_t *d, - const aes_gcm_expaned_key_t *Ke, uword n_blocks) + const aes_expaned_key_t *Ke, uword n_blocks) { /* additional ronuds for AES-192 and AES-256 */ for (int i = 10; i < ctx->rounds; i++) - aes_gcm_enc_round (r, Ke + i, n_blocks); + aes_enc_round (r, Ke + i, n_blocks); - for (int i = 0; i < n_blocks; i++) -#if N_LANES == 4 - d[i] ^= aes_enc_last_round_x4 (r[i], Ke[ctx->rounds].x4); -#elif N_LANES == 2 - d[i] ^= aes_enc_last_round_x2 (r[i], Ke[ctx->rounds].x2); -#else - d[i] ^= aes_enc_last_round (r[i], Ke[ctx->rounds].x1); -#endif + aes_enc_last_round (r, d, Ke + ctx->rounds, n_blocks); } static_always_inline void aes_gcm_calc (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst, u32 n, u32 n_bytes, int with_ghash) { - const aes_gcm_expaned_key_t *k = ctx->Ke; + const aes_expaned_key_t *k = ctx->Ke; const aes_mem_t *sv = (aes_mem_t *) src; aes_mem_t *dv = (aes_mem_t *) dst; uword ghash_blocks, gc = 1; @@ -415,23 +363,23 @@ aes_gcm_calc (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst, u32 n, if (ctx->operation == AES_GCM_OP_ENCRYPT) { ghash_blocks = 4; - n_lanes = N_LANES * 4; + n_lanes = N_AES_LANES * 4; } else { ghash_blocks = n; - n_lanes = n * N_LANES; -#if N_LANES != 1 + n_lanes = n * N_AES_LANES; +#if N_AES_LANES != 1 if (ctx->last) n_lanes = (n_bytes + 15) / 16; #endif } - n_bytes -= (n - 1) * N; + n_bytes -= (n - 1) * N_AES_BYTES; /* AES rounds 0 and 1 */ aes_gcm_enc_first_round (ctx, r, n); - aes_gcm_enc_round (r, k + 1, n); + aes_enc_round (r, k + 1, n); /* load data - decrypt round */ if (ctx->operation == AES_GCM_OP_DECRYPT) @@ -440,7 +388,7 @@ aes_gcm_calc (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst, u32 n, d[i] = sv[i]; if (ctx->last) - d[n - 1] = aes_gcm_load_partial ((u8 *) (sv + n - 1), n_bytes); + d[n - 1] = aes_load_partial ((u8 *) (sv + n - 1), n_bytes); } /* GHASH multiply block 0 */ @@ -448,24 +396,24 @@ aes_gcm_calc (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst, u32 n, aes_gcm_ghash_mul_first (ctx, d[0], n_lanes); /* AES rounds 2 and 3 */ - aes_gcm_enc_round (r, k + 2, n); - aes_gcm_enc_round (r, k + 3, n); + aes_enc_round (r, k + 2, n); + aes_enc_round (r, k + 3, n); /* GHASH multiply block 1 */ if (with_ghash && gc++ < ghash_blocks) aes_gcm_ghash_mul_next (ctx, (d[1])); /* AES rounds 4 and 5 */ - aes_gcm_enc_round (r, k + 4, n); - aes_gcm_enc_round (r, k + 5, n); + aes_enc_round (r, k + 4, n); + aes_enc_round (r, k + 5, n); /* GHASH multiply block 2 */ if (with_ghash && gc++ < ghash_blocks) aes_gcm_ghash_mul_next (ctx, (d[2])); /* AES rounds 6 and 7 */ - aes_gcm_enc_round (r, k + 6, n); - aes_gcm_enc_round (r, k + 7, n); + aes_enc_round (r, k + 6, n); + aes_enc_round (r, k + 7, n); /* GHASH multiply block 3 */ if (with_ghash && gc++ < ghash_blocks) @@ -478,12 +426,12 @@ aes_gcm_calc (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst, u32 n, d[i] = sv[i]; if (ctx->last) - d[n - 1] = aes_gcm_load_partial (sv + n - 1, n_bytes); + d[n - 1] = aes_load_partial (sv + n - 1, n_bytes); } /* AES rounds 8 and 9 */ - aes_gcm_enc_round (r, k + 8, n); - aes_gcm_enc_round (r, k + 9, n); + aes_enc_round (r, k + 8, n); + aes_enc_round (r, k + 9, n); /* AES last round(s) */ aes_gcm_enc_last_round (ctx, r, d, k, n); @@ -493,7 +441,7 @@ aes_gcm_calc (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst, u32 n, dv[i] = d[i]; if (ctx->last) - aes_gcm_store_partial (d[n - 1], dv + n - 1, n_bytes); + aes_store_partial (d[n - 1], dv + n - 1, n_bytes); /* GHASH reduce 1st step */ aes_gcm_ghash_reduce (ctx); @@ -510,14 +458,14 @@ aes_gcm_calc (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst, u32 n, static_always_inline void aes_gcm_calc_double (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst) { - const aes_gcm_expaned_key_t *k = ctx->Ke; + const aes_expaned_key_t *k = ctx->Ke; const aes_mem_t *sv = (aes_mem_t *) src; aes_mem_t *dv = (aes_mem_t *) dst; aes_data_t r[4]; /* AES rounds 0 and 1 */ aes_gcm_enc_first_round (ctx, r, 4); - aes_gcm_enc_round (r, k + 1, 4); + aes_enc_round (r, k + 1, 4); /* load 4 blocks of data - decrypt round */ if (ctx->operation == AES_GCM_OP_DECRYPT) @@ -525,32 +473,32 @@ aes_gcm_calc_double (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst) d[i] = sv[i]; /* GHASH multiply block 0 */ - aes_gcm_ghash_mul_first (ctx, d[0], N_LANES * 8); + aes_gcm_ghash_mul_first (ctx, d[0], N_AES_LANES * 8); /* AES rounds 2 and 3 */ - aes_gcm_enc_round (r, k + 2, 4); - aes_gcm_enc_round (r, k + 3, 4); + aes_enc_round (r, k + 2, 4); + aes_enc_round (r, k + 3, 4); /* GHASH multiply block 1 */ aes_gcm_ghash_mul_next (ctx, (d[1])); /* AES rounds 4 and 5 */ - aes_gcm_enc_round (r, k + 4, 4); - aes_gcm_enc_round (r, k + 5, 4); + aes_enc_round (r, k + 4, 4); + aes_enc_round (r, k + 5, 4); /* GHASH multiply block 2 */ aes_gcm_ghash_mul_next (ctx, (d[2])); /* AES rounds 6 and 7 */ - aes_gcm_enc_round (r, k + 6, 4); - aes_gcm_enc_round (r, k + 7, 4); + aes_enc_round (r, k + 6, 4); + aes_enc_round (r, k + 7, 4); /* GHASH multiply block 3 */ aes_gcm_ghash_mul_next (ctx, (d[3])); /* AES rounds 8 and 9 */ - aes_gcm_enc_round (r, k + 8, 4); - aes_gcm_enc_round (r, k + 9, 4); + aes_enc_round (r, k + 8, 4); + aes_enc_round (r, k + 9, 4); /* load 4 blocks of data - encrypt round */ if (ctx->operation == AES_GCM_OP_ENCRYPT) @@ -574,35 +522,35 @@ aes_gcm_calc_double (aes_gcm_ctx_t *ctx, aes_data_t *d, const u8 *src, u8 *dst) /* AES rounds 0 and 1 */ aes_gcm_enc_first_round (ctx, r, 4); - aes_gcm_enc_round (r, k + 1, 4); + aes_enc_round (r, k + 1, 4); /* GHASH multiply block 5 */ aes_gcm_ghash_mul_next (ctx, (d[1])); /* AES rounds 2 and 3 */ - aes_gcm_enc_round (r, k + 2, 4); - aes_gcm_enc_round (r, k + 3, 4); + aes_enc_round (r, k + 2, 4); + aes_enc_round (r, k + 3, 4); /* GHASH multiply block 6 */ aes_gcm_ghash_mul_next (ctx, (d[2])); /* AES rounds 4 and 5 */ - aes_gcm_enc_round (r, k + 4, 4); - aes_gcm_enc_round (r, k + 5, 4); + aes_enc_round (r, k + 4, 4); + aes_enc_round (r, k + 5, 4); /* GHASH multiply block 7 */ aes_gcm_ghash_mul_next (ctx, (d[3])); /* AES rounds 6 and 7 */ - aes_gcm_enc_round (r, k + 6, 4); - aes_gcm_enc_round (r, k + 7, 4); + aes_enc_round (r, k + 6, 4); + aes_enc_round (r, k + 7, 4); /* GHASH reduce 1st step */ aes_gcm_ghash_reduce (ctx); /* AES rounds 8 and 9 */ - aes_gcm_enc_round (r, k + 8, 4); - aes_gcm_enc_round (r, k + 9, 4); + aes_enc_round (r, k + 8, 4); + aes_enc_round (r, k + 9, 4); /* GHASH reduce 2nd step */ aes_gcm_ghash_reduce2 (ctx); @@ -644,14 +592,14 @@ static_always_inline void aes_gcm_calc_last (aes_gcm_ctx_t *ctx, aes_data_t *d, int n_blocks, u32 n_bytes) { - int n_lanes = (N_LANES == 1 ? n_blocks : (n_bytes + 15) / 16) + 1; - n_bytes -= (n_blocks - 1) * N; + int n_lanes = (N_AES_LANES == 1 ? n_blocks : (n_bytes + 15) / 16) + 1; + n_bytes -= (n_blocks - 1) * N_AES_BYTES; int i; aes_gcm_enc_ctr0_round (ctx, 0); aes_gcm_enc_ctr0_round (ctx, 1); - if (n_bytes != N) + if (n_bytes != N_AES_BYTES) aes_gcm_mask_bytes (d + n_blocks - 1, n_bytes); aes_gcm_ghash_mul_first (ctx, d[0], n_lanes); @@ -703,20 +651,20 @@ aes_gcm_enc (aes_gcm_ctx_t *ctx, const u8 *src, u8 *dst, u32 n_left) return; } - if (n_left < 4 * N) + if (n_left < 4 * N_AES_BYTES) { ctx->last = 1; - if (n_left > 3 * N) + if (n_left > 3 * N_AES_BYTES) { aes_gcm_calc (ctx, d, src, dst, 4, n_left, /* with_ghash */ 0); aes_gcm_calc_last (ctx, d, 4, n_left); } - else if (n_left > 2 * N) + else if (n_left > 2 * N_AES_BYTES) { aes_gcm_calc (ctx, d, src, dst, 3, n_left, /* with_ghash */ 0); aes_gcm_calc_last (ctx, d, 3, n_left); } - else if (n_left > N) + else if (n_left > N_AES_BYTES) { aes_gcm_calc (ctx, d, src, dst, 2, n_left, /* with_ghash */ 0); aes_gcm_calc_last (ctx, d, 2, n_left); @@ -729,45 +677,45 @@ aes_gcm_enc (aes_gcm_ctx_t *ctx, const u8 *src, u8 *dst, u32 n_left) return; } - aes_gcm_calc (ctx, d, src, dst, 4, 4 * N, /* with_ghash */ 0); + aes_gcm_calc (ctx, d, src, dst, 4, 4 * N_AES_BYTES, /* with_ghash */ 0); /* next */ - n_left -= 4 * N; - dst += 4 * N; - src += 4 * N; + n_left -= 4 * N_AES_BYTES; + dst += 4 * N_AES_BYTES; + src += 4 * N_AES_BYTES; - for (; n_left >= 8 * N; n_left -= 8 * N, src += 8 * N, dst += 8 * N) + for (int n = 8 * N_AES_BYTES; n_left >= n; n_left -= n, src += n, dst += n) aes_gcm_calc_double (ctx, d, src, dst); - if (n_left >= 4 * N) + if (n_left >= 4 * N_AES_BYTES) { - aes_gcm_calc (ctx, d, src, dst, 4, 4 * N, /* with_ghash */ 1); + aes_gcm_calc (ctx, d, src, dst, 4, 4 * N_AES_BYTES, /* with_ghash */ 1); /* next */ - n_left -= 4 * N; - dst += 4 * N; - src += 4 * N; + n_left -= 4 * N_AES_BYTES; + dst += 4 * N_AES_BYTES; + src += 4 * N_AES_BYTES; } if (n_left == 0) { - aes_gcm_calc_last (ctx, d, 4, 4 * N); + aes_gcm_calc_last (ctx, d, 4, 4 * N_AES_BYTES); return; } ctx->last = 1; - if (n_left > 3 * N) + if (n_left > 3 * N_AES_BYTES) { aes_gcm_calc (ctx, d, src, dst, 4, n_left, /* with_ghash */ 1); aes_gcm_calc_last (ctx, d, 4, n_left); } - else if (n_left > 2 * N) + else if (n_left > 2 * N_AES_BYTES) { aes_gcm_calc (ctx, d, src, dst, 3, n_left, /* with_ghash */ 1); aes_gcm_calc_last (ctx, d, 3, n_left); } - else if (n_left > N) + else if (n_left > N_AES_BYTES) { aes_gcm_calc (ctx, d, src, dst, 2, n_left, /* with_ghash */ 1); aes_gcm_calc_last (ctx, d, 2, n_left); @@ -786,28 +734,28 @@ aes_gcm_dec (aes_gcm_ctx_t *ctx, const u8 *src, u8 *dst, uword n_left) ghash_ctx_t gd; /* main encryption loop */ - for (; n_left >= 8 * N; n_left -= 8 * N, dst += 8 * N, src += 8 * N) + for (int n = 8 * N_AES_BYTES; n_left >= n; n_left -= n, dst += n, src += n) aes_gcm_calc_double (ctx, d, src, dst); - if (n_left >= 4 * N) + if (n_left >= 4 * N_AES_BYTES) { - aes_gcm_calc (ctx, d, src, dst, 4, 4 * N, /* with_ghash */ 1); + aes_gcm_calc (ctx, d, src, dst, 4, 4 * N_AES_BYTES, /* with_ghash */ 1); /* next */ - n_left -= 4 * N; - dst += N * 4; - src += N * 4; + n_left -= 4 * N_AES_BYTES; + dst += N_AES_BYTES * 4; + src += N_AES_BYTES * 4; } if (n_left) { ctx->last = 1; - if (n_left > 3 * N) + if (n_left > 3 * N_AES_BYTES) aes_gcm_calc (ctx, d, src, dst, 4, n_left, /* with_ghash */ 1); - else if (n_left > 2 * N) + else if (n_left > 2 * N_AES_BYTES) aes_gcm_calc (ctx, d, src, dst, 3, n_left, /* with_ghash */ 1); - else if (n_left > N) + else if (n_left > N_AES_BYTES) aes_gcm_calc (ctx, d, src, dst, 2, n_left, /* with_ghash */ 1); else aes_gcm_calc (ctx, d, src, dst, 1, n_left, /* with_ghash */ 1); @@ -867,11 +815,11 @@ aes_gcm (const u8 *src, u8 *dst, const u8 *aad, u8 *ivp, u8 *tag, Y0[3] = 1 << 24; ctx->EY0 = (u8x16) Y0; -#if N_LANES == 4 +#if N_AES_LANES == 4 ctx->Y = u32x16_splat_u32x4 (Y0) + (u32x16){ 0, 0, 0, 1 << 24, 0, 0, 0, 2 << 24, 0, 0, 0, 3 << 24, 0, 0, 0, 4 << 24, }; -#elif N_LANES == 2 +#elif N_AES_LANES == 2 ctx->Y = u32x8_splat_u32x4 (Y0) + (u32x8){ 0, 0, 0, 1 << 24, 0, 0, 0, 2 << 24 }; #else @@ -926,7 +874,7 @@ clib_aes_gcm_key_expand (aes_gcm_key_data_t *kd, const u8 *key, { u8x16 H; u8x16 ek[AES_KEY_ROUNDS (AES_KEY_256) + 1]; - aes_gcm_expaned_key_t *Ke = (aes_gcm_expaned_key_t *) kd->Ke; + aes_expaned_key_t *Ke = (aes_expaned_key_t *) kd->Ke; /* expand AES key */ aes_key_expand (ek, key, ks); diff --git a/src/vppinfra/test/aes_ctr.c b/src/vppinfra/test/aes_ctr.c new file mode 100644 index 00000000000..1bf08b208d5 --- /dev/null +++ b/src/vppinfra/test/aes_ctr.c @@ -0,0 +1,481 @@ +/* SPDX-License-Identifier: Apache-2.0 + * Copyright(c) 2024 Cisco Systems, Inc. + */ + +#if defined(__AES__) +#include <vppinfra/format.h> +#include <vppinfra/test/test.h> +#include <vppinfra/crypto/aes_ctr.h> + +static const struct +{ + char *name; + const u8 *pt, *key, *ct, *iv; + u32 data_len; +} test_cases128[] = { + /* test cases */ + { .name = "RFC3686 Test Vector #1", + .key = (const u8[16]){ 0xae, 0x68, 0x52, 0xf8, 0x12, 0x10, 0x67, 0xcc, + 0x4b, 0xf7, 0xa5, 0x76, 0x55, 0x77, 0xf3, 0x9e }, + .iv = (const u8[16]){ 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }, + + .pt = (const u8 *) "Single block msg", + .ct = (const u8[16]){ 0xe4, 0x09, 0x5d, 0x4f, 0xb7, 0xa7, 0xb3, 0x79, 0x2d, + 0x61, 0x75, 0xa3, 0x26, 0x13, 0x11, 0xb8 }, + .data_len = 16 }, + { .name = "RFC3686 Test Vector #2", + .key = (const u8[16]){ 0x7e, 0x24, 0x06, 0x78, 0x17, 0xfa, 0xe0, 0xd7, + 0x43, 0xd6, 0xce, 0x1f, 0x32, 0x53, 0x91, 0x63 }, + .iv = (const u8[16]){ 0x00, 0x6c, 0xb6, 0xdb, 0xc0, 0x54, 0x3b, 0x59, 0xda, + 0x48, 0xd9, 0x0b, 0x00, 0x00, 0x00, 0x01 }, + .pt = (const u8[32]){ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, + .ct = (const u8[32]){ 0x51, 0x04, 0xa1, 0x06, 0x16, 0x8a, 0x72, 0xd9, + 0x79, 0x0d, 0x41, 0xee, 0x8e, 0xda, 0xd3, 0x88, + 0xeb, 0x2e, 0x1e, 0xfc, 0x46, 0xda, 0x57, 0xc8, + 0xfc, 0xe6, 0x30, 0xdf, 0x91, 0x41, 0xbe, 0x28 }, + .data_len = 32 }, + { .name = "RFC3686 Test Vector #3", + .key = (const u8[16]){ 0x76, 0x91, 0xbe, 0x03, 0x5e, 0x50, 0x20, 0xa8, + 0xac, 0x6e, 0x61, 0x85, 0x29, 0xf9, 0xa0, 0xdc }, + .iv = (const u8[16]){ 0x00, 0xe0, 0x01, 0x7b, 0x27, 0x77, 0x7f, 0x3f, 0x4a, + 0x17, 0x86, 0xf0, 0x00, 0x00, 0x00, 0x01 }, + .pt = + (const u8[36]){ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, + 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, + 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23 }, + .ct = + (const u8[36]){ 0xc1, 0xcf, 0x48, 0xa8, 0x9f, 0x2f, 0xfd, 0xd9, 0xcf, + 0x46, 0x52, 0xe9, 0xef, 0xdb, 0x72, 0xd7, 0x45, 0x40, + 0xa4, 0x2b, 0xde, 0x6d, 0x78, 0x36, 0xd5, 0x9a, 0x5c, + 0xea, 0xae, 0xf3, 0x10, 0x53, 0x25, 0xb2, 0x07, 0x2f }, + .data_len = 36 }, +}, test_cases192[] = { + { .name = "RFC3686 Test Vector #4", + .key = (const u8[24]){ 0x16, 0xaf, 0x5b, 0x14, 0x5f, 0xc9, 0xf5, 0x79, + 0xc1, 0x75, 0xf9, 0x3e, 0x3b, 0xfb, 0x0e, 0xed, + 0x86, 0x3d, 0x06, 0xcc, 0xfd, 0xb7, 0x85, 0x15 }, + .iv = (const u8[16]){ 0x00, 0x00, 0x00, 0x48, 0x36, 0x73, 0x3c, 0x14, 0x7d, + 0x6d, 0x93, 0xcb, 0x00, 0x00, 0x00, 0x01 }, + .pt = (const u8[16]){ 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x62, 0x6c, + 0x6f, 0x63, 0x6b, 0x20, 0x6d, 0x73, 0x67 }, + .ct = (const u8[16]){ 0x4b, 0x55, 0x38, 0x4f, 0xe2, 0x59, 0xc9, 0xc8, 0x4e, + 0x79, 0x35, 0xa0, 0x03, 0xcb, 0xe9, 0x28 }, + .data_len = 16 }, + { .name = "RFC3686 Test Vector #5", + .key = (const u8[24]){ 0x7c, 0x5c, 0xb2, 0x40, 0x1b, 0x3d, 0xc3, 0x3c, + 0x19, 0xe7, 0x34, 0x08, 0x19, 0xe0, 0xf6, 0x9c, + 0x67, 0x8c, 0x3d, 0xb8, 0xe6, 0xf6, 0xa9, 0x1a }, + .iv = (const u8[16]){ 0x00, 0x96, 0xb0, 0x3b, 0x02, 0x0c, 0x6e, 0xad, 0xc2, + 0xcb, 0x50, 0x0d, 0x00, 0x00, 0x00, 0x01 }, + .pt = (const u8[32]){ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, + .ct = (const u8[32]){ 0x45, 0x32, 0x43, 0xfc, 0x60, 0x9b, 0x23, 0x32, + 0x7e, 0xdf, 0xaa, 0xfa, 0x71, 0x31, 0xcd, 0x9f, + 0x84, 0x90, 0x70, 0x1c, 0x5a, 0xd4, 0xa7, 0x9c, + 0xfc, 0x1f, 0xe0, 0xff, 0x42, 0xf4, 0xfb, 0x00 }, + .data_len = 32 }, + { .name = "RFC3686 Test Vector #6", + .key = (const u8[24]){ 0x02, 0xBF, 0x39, 0x1E, 0xE8, 0xEC, 0xB1, 0x59, + 0xB9, 0x59, 0x61, 0x7B, 0x09, 0x65, 0x27, 0x9B, + 0xF5, 0x9B, 0x60, 0xA7, 0x86, 0xD3, 0xE0, 0xFE }, + .iv = (const u8[16]){ 0x00, 0x07, 0xBD, 0xFD, 0x5C, 0xBD, 0x60, 0x27, 0x8D, + 0xCC, 0x09, 0x12, 0x00, 0x00, 0x00, 0x01 }, + .pt = + (const u8[36]){ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, + 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, + 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23 }, + .ct = + (const u8[36]){ 0x96, 0x89, 0x3F, 0xC5, 0x5E, 0x5C, 0x72, 0x2F, 0x54, + 0x0B, 0x7D, 0xD1, 0xDD, 0xF7, 0xE7, 0x58, 0xD2, 0x88, + 0xBC, 0x95, 0xC6, 0x91, 0x65, 0x88, 0x45, 0x36, 0xC8, + 0x11, 0x66, 0x2F, 0x21, 0x88, 0xAB, 0xEE, 0x09, 0x35 }, + .data_len = 36 }, + +}, test_cases256[] = { + { .name = "RFC3686 Test Vector #7", + .key = (const u8[32]){ 0x77, 0x6b, 0xef, 0xf2, 0x85, 0x1d, 0xb0, 0x6f, + 0x4c, 0x8a, 0x05, 0x42, 0xc8, 0x69, 0x6f, 0x6c, + 0x6a, 0x81, 0xaf, 0x1e, 0xec, 0x96, 0xb4, 0xd3, + 0x7f, 0xc1, 0xd6, 0x89, 0xe6, 0xc1, 0xc1, 0x04 }, + .iv = (const u8[16]){ 0x00, 0x00, 0x00, 0x60, 0xdb, 0x56, 0x72, 0xc9, 0x7a, + 0xa8, 0xf0, 0xb2, 0x00, 0x00, 0x00, 0x01 }, + .pt = (const u8 *) "Single block msg", + .ct = (const u8[16]){ 0x14, 0x5a, 0xd0, 0x1d, 0xbf, 0x82, 0x4e, 0xc7, 0x56, + 0x08, 0x63, 0xdc, 0x71, 0xe3, 0xe0, 0xc0 }, + .data_len = 16 }, + { .name = "RFC3686 Test Vector #8", + .key = (const u8[32]){ 0xf6, 0xd6, 0x6d, 0x6b, 0xd5, 0x2d, 0x59, 0xbb, + 0x07, 0x96, 0x36, 0x58, 0x79, 0xef, 0xf8, 0x86, + 0xc6, 0x6d, 0xd5, 0x1a, 0x5b, 0x6a, 0x99, 0x74, + 0x4b, 0x50, 0x59, 0x0c, 0x87, 0xa2, 0x38, 0x84 }, + .iv = (const u8[16]){ 0x00, 0xfa, 0xac, 0x24, 0xc1, 0x58, 0x5e, 0xf1, 0x5a, + 0x43, 0xd8, 0x75, 0x00, 0x00, 0x00, 0x01 }, + .pt = (const u8[32]){ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, + 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, + .ct = (const u8[32]){ 0xf0, 0x5e, 0x23, 0x1b, 0x38, 0x94, 0x61, 0x2c, + 0x49, 0xee, 0x00, 0x0b, 0x80, 0x4e, 0xb2, 0xa9, + 0xb8, 0x30, 0x6b, 0x50, 0x8f, 0x83, 0x9d, 0x6a, + 0x55, 0x30, 0x83, 0x1d, 0x93, 0x44, 0xaf, 0x1c }, + .data_len = 32 }, + { .name = "RFC3686 Test Vector #9", + .key = (const u8[32]){ 0xff, 0x7a, 0x61, 0x7c, 0xe6, 0x91, 0x48, 0xe4, + 0xf1, 0x72, 0x6e, 0x2f, 0x43, 0x58, 0x1d, 0xe2, + 0xaa, 0x62, 0xd9, 0xf8, 0x05, 0x53, 0x2e, 0xdf, + 0xf1, 0xee, 0xd6, 0x87, 0xfb, 0x54, 0x15, 0x3d }, + .iv = (const u8[16]){ 0x00, 0x1c, 0xc5, 0xb7, 0x51, 0xa5, 0x1d, 0x70, 0xa1, + 0xc1, 0x11, 0x48, 0x00, 0x00, 0x00, 0x01 }, + .pt = + (const u8[36]){ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, + 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, + 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23 }, + .ct = + (const u8[36]){ 0xeb, 0x6c, 0x52, 0x82, 0x1d, 0x0b, 0xbb, 0xf7, 0xce, + 0x75, 0x94, 0x46, 0x2a, 0xca, 0x4f, 0xaa, 0xb4, 0x07, + 0xdf, 0x86, 0x65, 0x69, 0xfd, 0x07, 0xf4, 0x8c, 0xc0, + 0xb5, 0x83, 0xd6, 0x07, 0x1f, 0x1e, 0xc0, 0xe6, 0xb8 }, + .data_len = 36 } +}; + +#define MAX_TEST_DATA_LEN 256 + +#define INC_TEST_BYTES (256 * 16 + 1) + +static u8 inc_key128[] = { + 0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, + 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c, +}; + +static u8 inc_iv[] = { + 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, + 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, +}; + +static u64 inc_ct128[] = { + 0xb77a659c70dd8dec, 0xebaf93e67e1cdbfa, 0x744766732f6e3a26, + 0xb16d4de0cc6db900, 0x6811ac5c5be10d4a, 0x6b42973b30e29d96, + 0xf1aec4c4ac0badd8, 0xc1955129e00b33ec, 0x49d7cf50bb054cf0, + 0x4deb06dcdc7a21b8, 0xa257b4190916c808, 0x44b7d421c38b934b, + 0x9e4dbb2d1aceb85b, 0x2d1c952f53c6000d, 0x7e25b633f3bceb0d, + 0xcee9f88cd3c2236d, 0x10ce6bc4a53b1d37, 0xb4783ea69ebc261d, + 0x7f732c19e5fdd3ea, 0xb253d0ebd5522c84, 0x7925888c44ef010d, + 0xba213ea62e7ec7f0, 0x239e0466520393fd, 0x8cde31681d451842, + 0x20b8270d3c5c1bc5, 0x3e56c37a1d573ebe, 0xc4fdb0bb491cf04e, + 0x29c9a4f92d7b12da, 0x50c8a51f05b6f704, 0x3cf0f4071c2098fa, + 0xb0842470bd8c6fdd, 0x86dd40fdc9640190, 0xe4a6184230ee4f6c, + 0x0e2a69261819535e, 0xbdb62571c80aaa39, 0x24a0dc5eafd33f3a, + 0x830599f37869c6ac, 0xf7049ae1b8e5c0dd, 0x7c9dd8d4405d2050, + 0x0e91382b1dace623, 0xf2b62e26f4133673, 0xa9216257693afdab, + 0x2a26df863fb6e980, 0x85e600421c395c83, 0xd5a521016a175cb3, + 0x5ef31ae51f7f2f7b, 0xc6ff491d0d6f74d4, 0x16b0e60ac13156d3, + 0xd49e0025d5ec1e4b, 0x987c4eff196cd64e, 0xa163915e80892b07, + 0x69ab0084052d574a, 0x8017caa649d22bdb, 0xf5eb130f0df2c49a, + 0xe2ced8f88537e9ea, 0xdaaff5e845cff681, 0xbd22ac46dd219c7a, + 0x1b963af4641e7cf7, 0xe70e7d5b76f88573, 0x39703f5e2db84937, + 0x8a1514af42bf3c96, 0x7f51d78b7d3971a6, 0x437a651ef9f08c08, + 0x69fd3712ccdfd843, 0xd8204939e67dad48, 0x71035fc942194251, + 0x703d964c7525bb2a, 0xe2166e50e1892d94, 0xbe8034b11f6a5a9f, + 0x954e4d74c3a9e105, 0x19e077bf00e5186a, 0x7aee46c4b5d4cbf1, + 0xfd7dedd15a3e7d35, 0x4ba1c4b76cb93f57, 0xb2e94cffbb82f098, + 0x078b04fcebc1fafc, 0x923edcc8600018b2, 0xc018169aba42ff11, + 0x0e4f91e46db01bf8, 0x7b5d2b322371e9fa, 0x8e94284632dd300b, + 0x80a3d93ce61c2f13, 0x445d2fb83ecfef73, 0xe1279d639bcd26c9, + 0xbd1865ba653ce114, 0x0316cfe3227bfb2a, 0xddc80c63d53878db, + 0xc91a2f5fedf4a51a, 0xce408a5275b0271f, 0x59a0abc34619018e, + 0xa215c590ad1afb21, 0xe3b096d42fc03598, 0x7cada064ab4f4997, + 0x699be0e57d76e47f, 0x235151411eee9cbd, 0xbbc688f0eaf896cd, + 0x4e78715341f9299d, 0x9f85d76bf99ef2a4, 0x15110ceff4a6040b, + 0x9feed36ff4566060, 0x4833ea7d66a0c572, 0x94c7edbdf2169d59, + 0xb413d116c6e771f1, 0x9a4b6e78167f4c66, 0x42d3f993c8aaee27, + 0xd16783a8c4e57558, 0xb1d7a074dd67339e, 0x97a164444f97adc2, + 0xc15a08d61628e5f3, 0x8767e41e04eb96a2, 0xbb28953ed0eae183, + 0xc0bab4e80ed8cc6e, 0x1ac34b5a5c4010f8, 0x0bc3b7d9db1775b7, + 0x565dead595b98969, 0x0fc03a3cfb656014, 0xdb9098b924a92926, + 0xe2786bc431c1f39a, 0xf8a0bf4fffb78d10, 0xd76161fe1ae71851, + 0xced33ea693cedbb4, 0xef13034da5529a1b, 0xd71081cadbbff0ac, + 0x1873eb643e857392, 0xf6f7c30284ffecb0, 0x93ded259d35eb6fe, + 0xf872980774f6e5ef, 0xd457c8ed22d5bc3f, 0x75d907e2a6bcced2, + 0xcfd3dceb8d7a79ba, 0xaeed2ff2fc0872bb, 0xb5fc72005d2eb168, + 0x850e0e0757274665, 0xab7e5da576c706ec, 0xf1df1ba9a972a4ca, + 0xe81d430b4f54adf9, 0x788f3d8655ba79bb, 0xf5990db3557bbf8c, + 0x1cacafc47729252c, 0x7581b4d6f3b83d9b, 0x94185dcdb0b0c4cd, + 0x3596e687f4b9f4ed, 0xb9462442134b804d, 0xdab188808726fec6, + 0xfe10831e8824d4c5, 0x000c641ed4c93be7, 0x2525ee781608b1ea, + 0x2b32469d51104097, 0x73a09c6ea117aea9, 0x8506dcdec8ade0be, + 0xf9f9fa553cac7285, 0x34b24f100086b974, 0xd42fa88547ade8e7, + 0xfd0bb8ce9a5f8e14, 0x15df9966c6a3e433, 0xf6696aafaae89cd6, + 0x3d521a9d1a0087e1, 0xe18ca6b8e94701f0, 0x8a4660e26a77965e, + 0xc74fcdf41bf4aa20, 0x292a356d0b670157, 0x36ff3344a9eee4ea, + 0xd76b051d6251a14b, 0xa9e09f1bacd1e30f, 0xae47cb95f95a8831, + 0x58b85ac7c98537ec, 0x9e30f1be05719bd2, 0x94772e6b56fc1380, + 0xbe94026a4a89b783, 0x7a7ffb61daa5ac60, 0x2f7beafcc5e9ac8a, + 0xfa33f37edc57e94c, 0x230c3582fb412093, 0xdeec806ecc4fa3c4, + 0xc7ff8876a31edd76, 0x6d0500f4ccd1bb20, 0xf1d0bef759b81b6c, + 0x138b1d39533379b7, 0xece52f84d9f20455, 0x3ed05e391352b9dd, + 0x95600f558d4dea51, 0x1d6b997966e35392, 0x0eeae16905b94e37, + 0x7db2acc242a56ab0, 0xaf347e5598687f51, 0xbf25013db6bddc18, + 0x6d4f106c35f9ee28, 0xc8e90bbe4283ab8c, 0x188cf978f1477dee, + 0x66376bfa3a6d8131, 0xe0ebd6632eb89b24, 0xb9e49d81e9d37f69, + 0xa5cfa3812d530e04, 0x717353523542a27f, 0x0d6669c916ab4d34, + 0x79e741ad592a7bb1, 0x63a7f35584bd3ea5, 0xc0494db2930cbc32, + 0x442bd29d7edd0e49, 0x52ec0bce733f61a0, 0x8bd199bf55bc2b4b, + 0x727ede5583bb859c, 0x9d07eda6e8220df1, 0xebdd7467d7259f15, + 0x8f6035a5dc5f53b1, 0x063a0935630b5f6f, 0xc6e983ec1f08ebe6, + 0xeedc82de2b28e651, 0xe28760013e13ae23, 0x37c078d66ad376a3, + 0xd54a72e88e80926b, 0x5822405e1d688eec, 0xa001e0b0d4a7447f, + 0xfd41f41419d8fd4d, 0x1391d37127a75095, 0x4795d7fb7ad67f17, + 0xa47c05c9b8400a0c, 0x28519cd5e98bba0c, 0x84a72dce8a27d050, + 0xcbee7b3c83d68c5f, 0xab2227b8f5203d3d, 0x3335a393d47ef9ec, + 0xd00b21a2a5dde597, 0xb13d50489ca79216, 0xde1cc721425dda94, + 0x1ddc9863b5b0b8e8, 0xb125481a01dfe1b5, 0x5b331c746c4148db, + 0x8d6729fe30d56f1d, 0xdc413723540aca6f, 0xf08fe55711f8f09b, + 0x98bcde7c09126688, 0xa38c02a0c19d08b0, 0xde8df0683372e31e, + 0x08b4727054d766a0, 0xc13b77c325ae45ed, 0x6e7fe05de6b28d5a, + 0x1794a4f149586b9a, 0x23f5881c699f81b8, 0x355c9d899c0dcfe3, + 0x4319acb92ca33a29, 0x4f3211554c2ecf79, 0x64741347e08aaa2f, + 0x32f89bf1084e0723, 0xb0d5d830b9ae58a6, 0x235170babbd5686f, + 0xaa711d0aff2e9830, 0x4f73229995f82ca2, 0x46565f056bb352ea, + 0x55283776fd729f29, 0xb027c5b67be58718, 0xfa58d8c215d52ef8, + 0xfa1a78f7c7db4b2f, 0x7b2badd9a5a7e810, 0x6c362d97ece0f08a, + 0xff8ad11e7ce377b1, 0xdf5a423e843cbfa0, 0xfa9e70edc9c12d2b, + 0xad745d9146b0b3d9, 0xfc2a590f1ce32b8c, 0x599b34c583449c39, + 0xbcab9517d2bd4eae, 0xa5a7f54890e38bc7, 0xb9700fcb336a049a, + 0xfcfcc2d65956af5f, 0x3887b5f3e5d238d6, 0x0b9bc00a60dd37c6, + 0x09f8d5b6a128fe23, 0x4b33ac26a2a59b5c, 0xfc6e3f30b4b4e108, + 0x1e53d6aa6266bee7, 0x9adf6b4cb3369643, 0xda38dfd6df234f48, + 0x845e61ddc98d3d16, 0x4a0b90d7d115d701, 0x64e1c9619aa777c3, + 0x9dd4b1df006c81f9, 0x71b2b88aea6c679e, 0xb39da7819be759ff, + 0xfdad221790b269bb, 0x741f7955b56d786c, 0x5d724fcce9250a73, + 0x3812aa144730905b, 0xb74986be047e24c4, 0xeebb8aa5ebdcc8a0, + 0x26a0ea4272d5a371, 0x2ff3733c39e92f82, 0x17880beb7b808b30, + 0xe298cf8aa284e39c, 0xd481ff1948d0eef0, 0xed53786d517a1f10, + 0x853ccfe7f1cba481, 0x9ba1707467deb6dc, 0xf1aae1c3190806b3, + 0xb017539bb50b55c4, 0x8809bcc37ac46808, 0x0ae0a3e6e9a6bba5, + 0xf7a5276c2a6df772, 0xaf095d1ceb24d931, 0xaa0f62c5eb44d3a6, + 0x5e9915d18cd09844, 0xcfff6a2edf6cd35f, 0x893ebc1038af747e, + 0xe4360da910f3853a, 0x2097129be26812d5, 0x09d1e31bd3fef181, + 0x37a585c49cff87c5, 0xd94d2b3b1cd97311, 0xa3a2d50de285388a, + 0xf627d8b7298602a0, 0x567f848218395a28, 0x9b4b416995765491, + 0x24388b443fd8730a, 0x5b3a3cc87e225bdb, 0x53a9881d098d520b, + 0xadbc31258140299f, 0x37345aad0c678a3f, 0xc0e24ea3958ef6d8, + 0x18ceff669a144d20, 0x3ce920ab86ab70c7, 0x430c240b5307c1cb, + 0x7240a314d5f7fa9c, 0x4dfaf972d1856f15, 0x76ca74db2ad10515, + 0x607ec82965c620f7, 0xc75f531d7eae4145, 0xe91c86c49c8d84a2, + 0x8becf71fe1e371a7, 0x055bb0206808c289, 0x36dbcec66eabc566, + 0x476f4f1b52c4c856, 0x78bdf9114304e28f, 0x206e8342087ca6e2, + 0xda66f574514e8795, 0x903bcf41830a763f, 0x3a8c03f8bfe8c1ae, + 0xc386671f05740107, 0xda3abc3b566c70ab, 0xe1072ad4ebd4a028, + 0xfe9a6d4c0e8a80ce, 0xeb99eb25a084c442, 0xd34f23f8f279e9f3, + 0xccb189048479b94d, 0xfc6f6d863f74a049, 0xa437f340bfdfed0e, + 0xc84ef9a7139af764, 0xbeb88737819b7d55, 0x5f06fb8f06d6372b, + 0x7ec01ec2f978b4a2, 0x1ad4f2fb9963b46f, 0xae4cdeee5c419652, + 0x51ee340ba106d1dc, 0x93544a6e274cf180, 0x0de0b1abf6e9773a, + 0xb55514c7be768e6a, 0x70a3ee12298c0688, 0x58943a332454b1ee, + 0xe9de88a863b83b29, 0xb99dbf02fc35d6c9, 0x285a09f5583ac480, + 0xd0bf2b79a453c915, 0xb6e140e86dcb97d5, 0x8de0ab74f93a8de1, + 0x70f9bb989ce46c09, 0xd7ea17d64158d923, 0x308e3f8a527d0ff7, + 0xa0fffd413b3a872f, 0xcd35b4b30dfb6587, 0x7ef3ab8b9bd5fbcf, + 0x6149f604d9f355f7, 0x130d9020814780cd, 0x45cb969837f9a147, + 0x88dc31c106a2345e, 0x690da693a3472e6d, 0xe1dc49aaab6d8504, + 0x7749dc54f0a8f838, 0x358a1197921ed6e3, 0x50ae914d7b26c811, + 0x6e0f79b3af64d1ad, 0xec45b7e54c408577, 0x94809242f830a52f, + 0x88e8c0701fd8cd25, 0x21f562f903b85ca7, 0x3f8f1d2cfd57d394, + 0x1f0db9fb1767b393, 0x0504a2b6a6b967d3, 0xf18209ff9dee356b, + 0x4e74343f94f09cff, 0x53107e4bd79b52c1, 0x9c4ab4cdba0f0c2f, + 0xfd085f652a3c3f14, 0xcbd20129e019e573, 0x92d2e7681d64d41b, + 0xfa6c6c50db35a8fd, 0x7dc5177e0cc57261, 0xae3586379eed9e9d, + 0x4ba340964a014d54, 0x57147f7d60a4a5ee, 0x423255e50fec612e, + 0x1c1158e2a2afbace, 0x5e0dd39d591b341f, 0x4e0fff62124939a6, + 0x12e0413146fa5c8d, 0x3a6e0c37d48699a0, 0x9774260521aa490f, + 0xbd0f8ecc2b447c99, 0x556d41deab48dad8, 0x08bd36a5be98bc97, + 0x8bf0c22eb1cb99a0, 0x959954221670e572, 0x05143412beae5a0c, + 0x37246cbdf96ede32, 0xeb05ce52c11ab210, 0xd4e9c130ccd17048, + 0x42cc9b6177b7547b, 0x96d603334e7a85c7, 0x850365d5d2f5adcb, + 0xcfa11346e834516c, 0xfb9e30870be0c7bb, 0xc4d137ab85224e7a, + 0xc7f20e98475c4ab3, 0xaf464d45151fec79, 0xe4ad336a38569bcd, + 0xabd20fbf84b809bd, 0xb3643ed21050862a, 0xfb29924632f30a27, + 0x3f4fd0809492521f, 0xcc9635ff080ba76d, 0xeb679199764753a7, + 0x9df2de103f532b81, 0x83784f41703f0a31, 0x70ba6c249783efba, + 0x93cf542badd6d441, 0x8290f3e7b7fcc9a6, 0xb55485e8fadf4677, + 0xf29c554f7e99c1de, 0x277a3a2d674f10e9, 0xe9a5460c4d87bd2a, + 0x0d8489866023402a, 0x6bd7d212c07df415, 0x8d6194cb592bebc3, + 0xa9747f53b4cd4192, 0x56bd4c4c6373dcb9, 0x3385c9e222966cb2, + 0x234bda6863a4f7fd, 0xebc79b310f06f538, 0x3b7556403468fc38, + 0x9ac05c55de908490, 0x381dba9f8e05fd0e, 0x5e92d1853484e36a, + 0x030782801735585f, 0xd8c76845c71a4482, 0xea03ea2ec2406c9b, + 0xe2498a52f95cd21e, 0xd4ffe046d9393212, 0x93565efec984c6c9, + 0x154c50d8c6e11dc9, 0x3cd889f3188c18cc, 0xb5a46a6cba1287ca, + 0xbc203b6c8f21bb66, 0xfedf97cba4c35dea, 0x0c82b3d9520de017, + 0xdb2674b14ddb4d95, 0x44c8e1ca851db784, 0x5596d3e27d211d55, + 0x9dbe804695d2270d, 0xbd54af74b050b82a, 0xe4ea34515f120cea, + 0xaa2564472972ab58, 0xf97af0d678dfd0cb, 0xdebdbc18d6c71bd1, + 0x78423e11438fcb21, 0xf6f749d4f30510d4, 0x68de10085ea4c2ea, + 0x6b3ff4773ccb4ec1, 0x33206eb82742f50e, 0x3046468ab04a0778, + 0xd7168cc59b78654c, 0xcb5800e03e2f90d9, 0x4f8fdaa4a3b0b5ff, + 0xe0eeff2c2ff94e64, 0x7f2578708dafae2e, 0x6feab0ef729b4300, + 0xf1de49e2796cfdf5, 0x90711a9f7886a0d0, 0xf4b39401ae61d28a, + 0x3f26008ddcbc47e9, 0xfab0a15c25a8511d, 0x2664fc987e7fdd17, + 0x51125228da560a04, 0x93a545c6207a3d67, 0x7c8e4446a408cc25, + 0xf9b10a00083f429e, 0x48704b0fc020d66c, 0x1e1a8c7a3d66eae0, + 0x9bde8e4692e41915, 0x7144aad3cf672129, 0xbab5e713e8f5b335, + 0x2d2c0b70c55d7d11, 0xed928a6e1b388ab0, 0xf121a4a71653448f, + 0x0dd175d00c20e9ed, 0xe68066507fb5dcb1, 0x92384f914830a50e, + 0xb4d4c84f220aed3d, 0xa13e4d6ea70cc5f0, 0xfdbe2223195bfa82, + 0xe97bb465c3ca2099, 0x0078ec86e8daa6c0, 0x634c3a1311b805c4, + 0xac04a89119ae79a7, 0x690e7049d8e8762f, 0x0000000000000086, + 0x0000000000000000, +}; + +#define perftest_aesXXX_var_sz(a) \ + void __test_perf_fn perftest_aes##a##_var_sz (test_perf_t *tp) \ + { \ + u32 n = tp->n_ops; \ + aes_ctr_key_data_t *kd = test_mem_alloc (sizeof (*kd)); \ + u8 *dst = test_mem_alloc (n + 16); \ + u8 *src = test_mem_alloc_and_fill_inc_u8 (n + 16, 0, 0); \ + u8 *key = test_mem_alloc_and_fill_inc_u8 (32, 192, 0); \ + u8 *iv = test_mem_alloc_and_fill_inc_u8 (16, 128, 0); \ + \ + clib_aes_ctr_key_expand (kd, key, AES_KEY_##a); \ + \ + test_perf_event_enable (tp); \ + clib_aes##a##_ctr (kd, src, n, iv, dst); \ + test_perf_event_disable (tp); \ + } + +static clib_error_t * +test_clib_aes128_ctr (clib_error_t *err) +{ + aes_ctr_key_data_t kd; + aes_ctr_ctx_t ctx; + u8 pt[INC_TEST_BYTES]; + u8 ct[INC_TEST_BYTES]; + + FOREACH_ARRAY_ELT (tc, test_cases128) + { + clib_aes_ctr_key_expand (&kd, tc->key, AES_KEY_128); + clib_aes128_ctr (&kd, tc->pt, tc->data_len, tc->iv, ct); + + if (tc->data_len && memcmp (tc->ct, ct, tc->data_len) != 0) + return clib_error_return (err, "%s: invalid ciphertext", tc->name); + } + + for (int i = 0; i < sizeof (pt); i++) + pt[i] = i; + + clib_aes_ctr_key_expand (&kd, inc_key128, AES_KEY_128); + clib_aes128_ctr (&kd, pt, INC_TEST_BYTES, inc_iv, ct); + for (int i = 0; i < sizeof (pt); i++) + if (((u8 *) inc_ct128)[i] != ct[i]) + return clib_error_return (err, "incremental test failed (byte %u)", i); + + clib_aes_ctr_init (&ctx, &kd, inc_iv, AES_KEY_128); + for (u32 off = 0, chunk_size = 1; off < INC_TEST_BYTES; + off += chunk_size, chunk_size = clib_min (((chunk_size + 1) * 2 - 1), + INC_TEST_BYTES - off)) + clib_aes_ctr_transform (&ctx, pt + off, ct + off, chunk_size, AES_KEY_128); + + for (int i = 0; i < sizeof (pt); i++) + if (((u8 *) inc_ct128)[i] != ct[i]) + return clib_error_return ( + err, "incremental multiseg test failed (byte %u)", i); + + return err; +} + +perftest_aesXXX_var_sz (128); +REGISTER_TEST (clib_aes128_ctr) = { + .name = "clib_aes128_ctr", + .fn = test_clib_aes128_ctr, + .perf_tests = PERF_TESTS ({ .name = "variable size (per byte)", + .n_ops = 1424, + .fn = perftest_aes128_var_sz }, + { .name = "variable size (per byte)", + .n_ops = 1 << 20, + .fn = perftest_aes128_var_sz }), +}; + +static clib_error_t * +test_clib_aes192_ctr (clib_error_t *err) +{ + aes_ctr_key_data_t kd; + u8 ct[MAX_TEST_DATA_LEN]; + + FOREACH_ARRAY_ELT (tc, test_cases192) + { + clib_aes_ctr_key_expand (&kd, tc->key, AES_KEY_192); + clib_aes192_ctr (&kd, tc->pt, tc->data_len, tc->iv, ct); + + if (tc->data_len && memcmp (tc->ct, ct, tc->data_len) != 0) + return clib_error_return (err, "%s: invalid ciphertext", tc->name); + } + + return err; +} + +perftest_aesXXX_var_sz (192); +REGISTER_TEST (clib_aes192_ctr) = { + .name = "clib_aes192_ctr", + .fn = test_clib_aes192_ctr, + .perf_tests = PERF_TESTS ({ .name = "variable size (per byte)", + .n_ops = 1424, + .fn = perftest_aes192_var_sz }, + { .name = "variable size (per byte)", + .n_ops = 1 << 20, + .fn = perftest_aes192_var_sz }), +}; + +static clib_error_t * +test_clib_aes256_ctr (clib_error_t *err) +{ + aes_ctr_key_data_t kd; + u8 ct[MAX_TEST_DATA_LEN]; + + FOREACH_ARRAY_ELT (tc, test_cases256) + { + aes_ctr_ctx_t ctx; + u32 sz = tc->data_len / 3; + + clib_aes_ctr_key_expand (&kd, tc->key, AES_KEY_256); + clib_aes256_ctr (&kd, tc->pt, tc->data_len, tc->iv, ct); + + if (tc->data_len && memcmp (tc->ct, ct, tc->data_len) != 0) + return clib_error_return (err, "%s: invalid ciphertext", tc->name); + clib_memset (ct, 0, tc->data_len); + + clib_aes_ctr_init (&ctx, &kd, tc->iv, AES_KEY_256); + clib_aes_ctr_transform (&ctx, tc->pt, ct, sz, AES_KEY_256); + clib_aes_ctr_transform (&ctx, tc->pt + sz, ct + sz, sz, AES_KEY_256); + clib_aes_ctr_transform (&ctx, tc->pt + 2 * sz, ct + 2 * sz, + tc->data_len - 2 * sz, AES_KEY_256); + if (tc->data_len && memcmp (tc->ct, ct, tc->data_len) != 0) + return clib_error_return (err, "%s: invalid ciphertext (multiseg)", + tc->name); + } + + return err; +} + +perftest_aesXXX_var_sz (256); +REGISTER_TEST (clib_aes256_ctr) = { + .name = "clib_aes256_ctr", + .fn = test_clib_aes256_ctr, + .perf_tests = PERF_TESTS ({ .name = "variable size (per byte)", + .n_ops = 1424, + .fn = perftest_aes256_var_sz }, + { .name = "variable size (per byte)", + .n_ops = 1 << 20, + .fn = perftest_aes256_var_sz }), +}; + +#endif |