Added functionality to parse algorithm for AES CTR test
Signed-off-by: Brian Dooley <brian.doo...@intel.com>
---
v2: fix clang warning for int-in-bool-context
---
examples/fips_validation/fips_validation.c | 2 ++
examples/fips_validation/fips_validation.h | 2 ++
examples/fips_validation/fips_validation_aes.c | 5 +++++
examples/fips_validation/main.c | 9 +++++++--
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/examples/fips_validation/fips_validation.c
b/examples/fips_validation/fips_validation.c
index 12b9b03f56..541eead078 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -466,6 +466,8 @@ fips_test_parse_one_json_vector_set(void)
info.algo = FIPS_TEST_ALGO_AES_CBC;
else if (strstr(algo_str, "AES-XTS"))
info.algo = FIPS_TEST_ALGO_AES_XTS;
+ else if (strstr(algo_str, "AES-CTR"))
+ info.algo = FIPS_TEST_ALGO_AES_CTR;
else if (strstr(algo_str, "SHA"))
info.algo = FIPS_TEST_ALGO_SHA;
else
diff --git a/examples/fips_validation/fips_validation.h
b/examples/fips_validation/fips_validation.h
index 5c1abcbd91..96fdbec41a 100644
--- a/examples/fips_validation/fips_validation.h
+++ b/examples/fips_validation/fips_validation.h
@@ -35,6 +35,7 @@
enum fips_test_algorithms {
FIPS_TEST_ALGO_AES = 0,
FIPS_TEST_ALGO_AES_CBC,
+ FIPS_TEST_ALGO_AES_CTR,
FIPS_TEST_ALGO_AES_GCM,
FIPS_TEST_ALGO_AES_CMAC,
FIPS_TEST_ALGO_AES_CCM,
@@ -105,6 +106,7 @@ enum fips_aesavs_test_types {
AESAVS_TYPE_MMT,
AESAVS_TYPE_MCT,
AESAVS_TYPE_AFT,
+ AESAVS_TYPE_CTR,
};
enum fips_tdes_test_types {
diff --git a/examples/fips_validation/fips_validation_aes.c
b/examples/fips_validation/fips_validation_aes.c
index 4f61505bb3..0ef97aa03d 100644
--- a/examples/fips_validation/fips_validation_aes.c
+++ b/examples/fips_validation/fips_validation_aes.c
@@ -30,8 +30,10 @@
#define TESTTYPE_JSON_STR "testType"
#define DIR_JSON_STR "direction"
#define KEYLEN_JSON_STR "keyLen"
+#define OVERFLOW_JSON_STR "overflow"
#define KEY_JSON_STR "key"
+#define PAYLOADLEN_JSON_STR "payloadLen"
#define IV_JSON_STR "iv"
#define PT_JSON_STR "pt"
#define CT_JSON_STR "ct"
@@ -52,6 +54,7 @@ struct {
{AESAVS_TYPE_MMT, "MMT"},
{AESAVS_TYPE_MCT, "MCT"},
{AESAVS_TYPE_AFT, "AFT"},
+ {AESAVS_TYPE_CTR, "CTR"},
};
struct aes_test_algo {
@@ -60,6 +63,7 @@ struct aes_test_algo {
} const algo_con[] = {
{"CBC", RTE_CRYPTO_CIPHER_AES_CBC},
{"ECB", RTE_CRYPTO_CIPHER_AES_ECB},
+ {"CTR", RTE_CRYPTO_CIPHER_AES_CTR},
};
static int
@@ -291,6 +295,7 @@ parse_test_aes_json_init(void)
case AESAVS_TYPE_MCT:
info.parse_writeback = parse_test_aes_mct_json_writeback;
break;
+ case AESAVS_TYPE_CTR:
case AESAVS_TYPE_AFT:
info.parse_writeback = parse_test_aes_json_writeback;
break;
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 8bd5a66889..0ee618cc66 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -770,9 +770,11 @@ prepare_aes_xform(struct rte_crypto_sym_xform *xform)
struct rte_crypto_cipher_xform *cipher_xform = &xform->cipher;
xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-
if (info.interim_info.aes_data.cipher_algo == RTE_CRYPTO_CIPHER_AES_CBC)
cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_CBC;
+ else if (info.interim_info.aes_data.cipher_algo ==
+ RTE_CRYPTO_CIPHER_AES_CTR)
+ cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_CTR;
else
cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_ECB;
@@ -781,7 +783,8 @@ prepare_aes_xform(struct rte_crypto_sym_xform *xform)
RTE_CRYPTO_CIPHER_OP_DECRYPT;
cipher_xform->key.data = vec.cipher_auth.key.val;
cipher_xform->key.length = vec.cipher_auth.key.len;
- if (cipher_xform->algo == RTE_CRYPTO_CIPHER_AES_CBC) {
+ if (cipher_xform->algo == RTE_CRYPTO_CIPHER_AES_CBC ||
+ cipher_xform->algo == RTE_CRYPTO_CIPHER_AES_CTR) {
cipher_xform->iv.length = vec.iv.len;
cipher_xform->iv.offset = IV_OFF;
} else {
@@ -1796,6 +1799,7 @@ init_test_ops(void)
{
switch (info.algo) {
case FIPS_TEST_ALGO_AES_CBC:
+ case FIPS_TEST_ALGO_AES_CTR:
case FIPS_TEST_ALGO_AES:
test_ops.prepare_op = prepare_cipher_op;
test_ops.prepare_xform = prepare_aes_xform;
@@ -2007,6 +2011,7 @@ fips_test_one_test_group(void)
ret = parse_test_xts_json_init();
break;
case FIPS_TEST_ALGO_AES_CBC:
+ case FIPS_TEST_ALGO_AES_CTR:
case FIPS_TEST_ALGO_AES:
ret = parse_test_aes_json_init();
break;
--
2.25.1
