|WARNING| pw111326 [PATCH] examples/fips_validation: add parsing for aes_cbc

|WARNING| pw111326 [PATCH] examples/fips_validation: add parsing for aes_cbc

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 3686 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/111326

_apply patch failure_

Submitter: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>
Date: Wednesday, May 18 2022 15:41:03 
Applied on: CommitID:18ca4a4ec73a2e28df45a10543b7cdd45f2801dd
Apply patch set 111326 failed:

Checking patch examples/fips_validation/fips_validation.c...
error: while searching for:
	const char *algo_str = json_string_value(algo_obj);

	/* Vector sets contain the algorithm type, and nothing else we need. */
	if (strstr(algo_str, "AES-GCM"))
		info.algo = FIPS_TEST_ALGO_AES_GCM;
	if (strstr(algo_str, "HMAC"))
		info.algo = FIPS_TEST_ALGO_HMAC;
	if (strstr(algo_str, "CMAC"))
		info.algo = FIPS_TEST_ALGO_AES_CMAC;
	else
		return -EINVAL;

	return 0;
}

error: patch failed: examples/fips_validation/fips_validation.c:456
Checking patch examples/fips_validation/fips_validation.h...
Hunk #1 succeeded at 95 (offset -8 lines).
Checking patch examples/fips_validation/fips_validation_aes.c...
Checking patch examples/fips_validation/main.c...
Hunk #1 succeeded at 1512 (offset -34 lines).
Hunk #2 succeeded at 1522 (offset -34 lines).
Hunk #3 succeeded at 1540 (offset -34 lines).
Hunk #4 succeeded at 1548 (offset -34 lines).
Hunk #5 succeeded at 1590 (offset -34 lines).
error: while searching for:
		}

		if (info.op == FIPS_TEST_DEC_AUTH_VERIF)
			memcpy(vec.iv.val, val.val, AES_BLOCK_SIZE);
	}

	free(val.val);

	return 1;
}

error: patch failed: examples/fips_validation/main.c:1641
error: while searching for:
	case FIPS_TEST_ALGO_AES_CMAC:
		ret = parse_test_cmac_json_init();
		break;
	default:
		return -EINVAL;
	}

error: patch failed: examples/fips_validation/main.c:1945
Applying patch examples/fips_validation/fips_validation.c with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch examples/fips_validation/fips_validation.h cleanly.
Applied patch examples/fips_validation/fips_validation_aes.c cleanly.
Applying patch examples/fips_validation/main.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
Rejected hunk #7.
diff a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c	(rejected hunks)
@@ -456,14 +456,18 @@ fips_test_parse_one_json_vector_set(void)
 	const char *algo_str = json_string_value(algo_obj);
 
 	/* Vector sets contain the algorithm type, and nothing else we need. */
-	if (strstr(algo_str, "AES-GCM"))
+	if (strstr(algo_str, "AES-GCM")) {
 		info.algo = FIPS_TEST_ALGO_AES_GCM;
-	if (strstr(algo_str, "HMAC"))
+	} else if (strstr(algo_str, "HMAC")) {
 		info.algo = FIPS_TEST_ALGO_HMAC;
-	if (strstr(algo_str, "CMAC"))
+	} else if (strstr(algo_str, "CMAC")) {
 		info.algo = FIPS_TEST_ALGO_AES_CMAC;
-	else
+	} else if (strstr(algo_str, "AES-CBC")) {
+		info.algo = FIPS_TEST_ALGO_AES;
+		info.interim_info.aes_data.cipher_algo = RTE_CRYPTO_CIPHER_AES_CBC;
+	} else {
 		return -EINVAL;
+	}
 
 	return 0;
 }
diff a/examples/fips_validation/main.c b/examples/fips_validation/main.c	(rejected hunks)
@@ -1641,10 +1662,10 @@ fips_mct_aes_test(void)
 		}
 
 		if (info.op == FIPS_TEST_DEC_AUTH_VERIF)
-			memcpy(vec.iv.val, val.val, AES_BLOCK_SIZE);
+			memcpy(vec.iv.val, val[0].val, AES_BLOCK_SIZE);
 	}
 
-	free(val.val);
+	free(val[0].val);
 
 	return 1;
 }
@@ -1945,6 +1966,9 @@ fips_test_one_test_group(void)
 	case FIPS_TEST_ALGO_AES_CMAC:
 		ret = parse_test_cmac_json_init();
 		break;
+	case FIPS_TEST_ALGO_AES:
+		ret = parse_test_aes_init();
+		break;
 	default:
 		return -EINVAL;
 	}

https://lab.dpdk.org/results/dashboard/patchsets/22172/

UNH-IOL DPDK Community Lab