Skip to contentSkip to conversation

examples/fips_validation: add parsing for AES CTR

PATCH Superseded Brian Dooley 4 participants 10 messages Aug 22, 2022 – Oct 10, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 examples/fips_validation: add parsing for AES CTR

Added functionality to parse algorithm for AES CTR test

---
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(-)
examples/fips_validation/fips_validation.c +2 -0
index 12b9b03f56..541eead078 100644
@@ -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
examples/fips_validation/fips_validation.h +2 -0
index 5c1abcbd91..96fdbec41a 100644
@@ -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 {
examples/fips_validation/fips_validation_aes.c +5 -0
index 4f61505bb3..0ef97aa03d 100644
@@ -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;
examples/fips_validation/main.c +7 -2
index 8bd5a66889..0ee618cc66 100644
@@ -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;
Signature · 1 line
2.25.1
Acked-by on v2 1/1
#1 lore raw

Please fix the checkpath issue reported.

Quoted 15 lines

-----Original Message-----
From: Dooley, Brian <[email protected]>
Sent: Monday, August 22, 2022 1:23 PM
To: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Ji, Kai <[email protected]>
Subject: [PATCH v2] examples/fips_validation: add parsing for AES CTR

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---

#2 lore raw

Tested with FIPS test vectors from NIST.

Thanks,
Gowrishankar

Quoted 32 lines

-----Original Message-----
From: Ji, Kai <[email protected]>
Sent: Thursday, September 15, 2022 6:52 PM
To: Dooley, Brian <[email protected]>; Zhang, Roy Fan <[email protected]>
Cc: [email protected]; Gowrishankar Muthukrishnan <[email protected]>; Akhil Goyal <[email protected]>
Subject: [EXT] RE: [PATCH v2] examples/fips_validation: add parsing for AES CTR

External Email

----------------------------------------------------------------------
Please fix the checkpath issue reported.

Quoted 15 lines

-----Original Message-----
From: Dooley, Brian <[email protected]>
Sent: Monday, August 22, 2022 1:23 PM
To: Zhang, Roy Fan <[email protected]>; Dooley, Brian <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Ji, Kai <[email protected]>
Subject: [PATCH v2] examples/fips_validation: add parsing for AES CTR

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---

#3 lore raw

PATCH v3 1/1 examples/fips_validation: add parsing for AES CTR

In reply to Brian Dooley

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---
v3: in reply to fix and patchwork CI

---
 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(-)
examples/fips_validation/fips_validation.c +2 -0
index 12b9b03f56..541eead078 100644
@@ -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
examples/fips_validation/fips_validation.h +2 -0
index 5c1abcbd91..96fdbec41a 100644
@@ -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 {
examples/fips_validation/fips_validation_aes.c +5 -0
index 4f61505bb3..0ef97aa03d 100644
@@ -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;
examples/fips_validation/main.c +7 -2
index 8bd5a66889..0ee618cc66 100644
@@ -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;
Signature · 1 line
2.25.1
#4 lore raw

PATCH v4 1/1 examples/fips_validation: add parsing for AES CTR

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---
v3: in reply to fix and patchwork CI
---
v4: missing acks

---
 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(-)
examples/fips_validation/fips_validation.c +2 -0
index cd905b2c5b..016888fe7f 100644
@@ -468,6 +468,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
examples/fips_validation/fips_validation.h +2 -0
index 5c1abcbd91..96fdbec41a 100644
@@ -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 {
examples/fips_validation/fips_validation_aes.c +5 -0
index 4f61505bb3..0ef97aa03d 100644
@@ -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;
examples/fips_validation/main.c +7 -2
index e6c0b6a3a1..6713fe0582 100644
@@ -771,9 +771,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;
 
@@ -782,7 +784,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 {
@@ -1797,6 +1800,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;
@@ -2008,6 +2012,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;
Signature · 1 line
2.25.1
#5 lore raw

Hi Brian,

Quoted 11 lines

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---
v3: in reply to fix and patchwork CI
---
v4: missing acks

Quoted 6 lines
---
 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(-)

Can you also update doc/guides/sample_app_ug/fips_validation.rst for CTR and GMAC that you have added.

#6 lore raw

Hi Akhil,

Quoted 28 lines

-----Original Message-----
From: Akhil Goyal <[email protected]>
Sent: Friday, October 7, 2022 11:49 AM
To: Dooley, Brian <[email protected]>
Cc: [email protected]; Gowrishankar Muthukrishnan <[email protected]>; [email protected]; Ji, Kai <[email protected]>
Subject: RE: [EXT] [PATCH v4] examples/fips_validation: add parsing for AES CTR

Hi Brian,

Quoted 11 lines

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---
v3: in reply to fix and patchwork CI
---
v4: missing acks

Quoted 6 lines
---
 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(-)
Quoted 2 lines

Can you also update doc/guides/sample_app_ug/fips_validation.rst for CTR and GMAC that you have added.

Docs now updated in latest version

#7 lore raw
Quoted 20 lines

Hi Akhil,

Quoted 18 lines

Hi Brian,

Quoted 17 lines

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---
v3: in reply to fix and patchwork CI
---
v4: missing acks

---
 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(-)
Quoted 4 lines
Quoted 2 lines

Can you also update doc/guides/sample_app_ug/fips_validation.rst for CTR and GMAC that you have added.

Docs now updated in latest version

Yes, but you added doc updates for both CTR and GMAC in same patch. I will split it while merging.

#8 lore raw

PATCH v5 1/1 examples/fips_validation: add parsing for AES CTR

In reply to Brian Dooley

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---
v3: in reply to fix and patchwork CI
---
v4: missing acks
---
v5: add documentation

---
 doc/guides/sample_app_ug/fips_validation.rst   | 2 ++
 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 +++++++--
 5 files changed, 18 insertions(+), 2 deletions(-)
doc/guides/sample_app_ug/fips_validation.rst +2 -0
index 6f4bd34726..6e5885e23b 100644
@@ -61,6 +61,8 @@ ACVP
     * AES-CBC (128,192,256) - AFT, MCT
     * AES-GCM (128,192,256) - AFT
     * AES-CMAC (128,192,256) - AFT
+    * AES-CTR (128,192,256) - AFT, CTR
+    * AES-GMAC (128,192,256) - AFT
     * AES-XTS (128,256) - AFT
     * HMAC (SHA1, SHA224, SHA256, SHA384, SHA512)
     * SHA (1, 256, 384, 512) - AFT, MCT
examples/fips_validation/fips_validation.c +2 -0
index cd905b2c5b..016888fe7f 100644
@@ -468,6 +468,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
examples/fips_validation/fips_validation.h +2 -0
index 5c1abcbd91..96fdbec41a 100644
@@ -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 {
examples/fips_validation/fips_validation_aes.c +5 -0
index 4f61505bb3..0ef97aa03d 100644
@@ -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;
examples/fips_validation/main.c +7 -2
index f8063b6599..4916d2b12e 100644
@@ -761,9 +761,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;
 
@@ -772,7 +774,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 {
@@ -1784,6 +1787,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;
@@ -1995,6 +1999,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;
Signature · 1 line
2.25.1
Applied
#9 lore raw
Quoted 27 lines

Added functionality to parse algorithm for AES CTR test

---
v2: fix clang warning for int-in-bool-context
---
v3: in reply to fix and patchwork CI
---
v4: missing acks
---
v5: add documentation

---
 doc/guides/sample_app_ug/fips_validation.rst   | 2 ++
 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 +++++++--
 5 files changed, 18 insertions(+), 2 deletions(-)
doc/guides/sample_app_ug/fips_validation.rst +0 -0
index 6f4bd34726..6e5885e23b 100644

doc/guides/sample_app_ug/fips_validation.rst ACVP · line 65

Quoted 5 lines
doc/guides/sample_app_ug/fips_validation.rst +2 -0
@@ -61,6 +61,8 @@ ACVP
     * AES-CBC (128,192,256) - AFT, MCT
     * AES-GCM (128,192,256) - AFT
     * AES-CMAC (128,192,256) - AFT
+    * AES-CTR (128,192,256) - AFT, CTR
+    * AES-GMAC (128,192,256) - AFT

Removed GMAC from this patch and added in GMAC FIPS support

Applied to dpdk-next-crypto

Thanks