Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/118024 _apply patch failure_ Submitter: Gowrishankar Muthukrishnan Date: Wednesday, October 12 2022 06:12:38 Applied on: CommitID:a74b1b25136a592c275afbfa6b70771469750aee Apply patch set 118024-118026 failed: Checking patch config/meson.build... Checking patch doc/guides/rel_notes/release_22_11.rst... error: while searching for: Added support for lookaside sessions in event mode. See the :doc:`../sample_app_ug/ipsec_secgw` for more details. Removed Items ------------- error: patch failed: doc/guides/rel_notes/release_22_11.rst:241 Checking patch doc/guides/sample_app_ug/fips_validation.rst... Hunk #1 succeeded at 66 (offset -2 lines). Checking patch examples/fips_validation/fips_validation.c... Hunk #1 succeeded at 473 (offset -4 lines). Checking patch examples/fips_validation/fips_validation.h... Hunk #1 succeeded at 42 (offset -2 lines). Hunk #2 succeeded at 56 (offset -2 lines). Hunk #3 succeeded at 82 (offset -2 lines). Hunk #4 succeeded at 153 (offset -3 lines). Hunk #5 succeeded at 185 (offset -3 lines). Hunk #6 succeeded at 204 (offset -3 lines). Hunk #7 succeeded at 257 (offset -3 lines). Hunk #8 succeeded at 333 (offset -3 lines). Hunk #9 succeeded at 397 (offset -3 lines). Checking patch examples/fips_validation/fips_validation_gcm.c... Checking patch examples/fips_validation/fips_validation_rsa.c... .git/rebase-apply/patch:754: new blank line at EOF. + Checking patch examples/fips_validation/main.c... Hunk #9 succeeded at 783 (offset -15 lines). Hunk #10 succeeded at 839 (offset -15 lines). Hunk #11 succeeded at 1275 (offset -18 lines). Hunk #12 succeeded at 1402 (offset -18 lines). Hunk #13 succeeded at 1436 (offset -18 lines). Hunk #14 succeeded at 1543 (offset -18 lines). error: while searching for: 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; if (info.interim_info.aes_data.test_type == AESAVS_TYPE_MCT) test_ops.test = fips_mct_aes_test; else test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_HMAC: test_ops.prepare_op = prepare_auth_op; test_ops.prepare_xform = prepare_hmac_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_TDES: test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_tdes_xform; if (info.interim_info.tdes_data.test_type == TDES_MCT) test_ops.test = fips_mct_tdes_test; else test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_GMAC: test_ops.prepare_op = prepare_auth_op; test_ops.prepare_xform = prepare_gmac_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_GCM: test_ops.prepare_op = prepare_aead_op; test_ops.prepare_xform = prepare_gcm_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_CMAC: test_ops.prepare_op = prepare_auth_op; test_ops.prepare_xform = prepare_cmac_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_CCM: test_ops.prepare_op = prepare_aead_op; test_ops.prepare_xform = prepare_ccm_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_SHA: test_ops.prepare_op = prepare_auth_op; test_ops.prepare_xform = prepare_sha_xform; if (info.interim_info.sha_data.test_type == SHA_MCT) test_ops.test = fips_mct_sha_test; else test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_XTS: test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_xts_xform; test_ops.test = fips_generic_test; break; default: if (strstr(info.file_name, "TECB") || strstr(info.file_name, "TCBC")) { info.algo = FIPS_TEST_ALGO_TDES; test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_tdes_xform; if (info.interim_info.tdes_data.test_type == TDES_MCT) test_ops.test = fips_mct_tdes_test; else error: patch failed: examples/fips_validation/main.c:1823 Hunk #16 succeeded at 2315 (offset -31 lines). Checking patch examples/fips_validation/meson.build... Applied patch config/meson.build cleanly. Applying patch doc/guides/rel_notes/release_22_11.rst with 1 reject... Rejected hunk #1. Applied patch doc/guides/sample_app_ug/fips_validation.rst cleanly. Applied patch examples/fips_validation/fips_validation.c cleanly. Applied patch examples/fips_validation/fips_validation.h cleanly. Applied patch examples/fips_validation/fips_validation_gcm.c cleanly. Applied patch examples/fips_validation/fips_validation_rsa.c cleanly. Applying patch examples/fips_validation/main.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Hunk #5 applied cleanly. Hunk #6 applied cleanly. Hunk #7 applied cleanly. Hunk #8 applied cleanly. Hunk #9 applied cleanly. Hunk #10 applied cleanly. Hunk #11 applied cleanly. Hunk #12 applied cleanly. Hunk #13 applied cleanly. Hunk #14 applied cleanly. Rejected hunk #15. Hunk #16 applied cleanly. Applied patch examples/fips_validation/meson.build cleanly. diff a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst (rejected hunks) @@ -241,6 +241,11 @@ New Features Added support for lookaside sessions in event mode. See the :doc:`../sample_app_ug/ipsec_secgw` for more details. +* **Updated fips_validation sample application.** + + Added support for asymmetric crypto algorithms. + See the :doc:`../sample_app_ug/fips_validation` for more details. + Removed Items ------------- diff a/examples/fips_validation/main.c b/examples/fips_validation/main.c (rejected hunks) @@ -1823,65 +2115,70 @@ init_test_ops(void) 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; + test_ops.prepare_sym_op = prepare_cipher_op; + test_ops.prepare_sym_xform = prepare_aes_xform; if (info.interim_info.aes_data.test_type == AESAVS_TYPE_MCT) test_ops.test = fips_mct_aes_test; else test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_HMAC: - test_ops.prepare_op = prepare_auth_op; - test_ops.prepare_xform = prepare_hmac_xform; + test_ops.prepare_sym_op = prepare_auth_op; + test_ops.prepare_sym_xform = prepare_hmac_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_TDES: - test_ops.prepare_op = prepare_cipher_op; - test_ops.prepare_xform = prepare_tdes_xform; + test_ops.prepare_sym_op = prepare_cipher_op; + test_ops.prepare_sym_xform = prepare_tdes_xform; if (info.interim_info.tdes_data.test_type == TDES_MCT) test_ops.test = fips_mct_tdes_test; else test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_GMAC: - test_ops.prepare_op = prepare_auth_op; - test_ops.prepare_xform = prepare_gmac_xform; + test_ops.prepare_sym_op = prepare_auth_op; + test_ops.prepare_sym_xform = prepare_gmac_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_GCM: - test_ops.prepare_op = prepare_aead_op; - test_ops.prepare_xform = prepare_gcm_xform; + test_ops.prepare_sym_op = prepare_aead_op; + test_ops.prepare_sym_xform = prepare_gcm_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_CMAC: - test_ops.prepare_op = prepare_auth_op; - test_ops.prepare_xform = prepare_cmac_xform; + test_ops.prepare_sym_op = prepare_auth_op; + test_ops.prepare_sym_xform = prepare_cmac_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_CCM: - test_ops.prepare_op = prepare_aead_op; - test_ops.prepare_xform = prepare_ccm_xform; + test_ops.prepare_sym_op = prepare_aead_op; + test_ops.prepare_sym_xform = prepare_ccm_xform; test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_SHA: - test_ops.prepare_op = prepare_auth_op; - test_ops.prepare_xform = prepare_sha_xform; + test_ops.prepare_sym_op = prepare_auth_op; + test_ops.prepare_sym_xform = prepare_sha_xform; if (info.interim_info.sha_data.test_type == SHA_MCT) test_ops.test = fips_mct_sha_test; else test_ops.test = fips_generic_test; break; case FIPS_TEST_ALGO_AES_XTS: - test_ops.prepare_op = prepare_cipher_op; - test_ops.prepare_xform = prepare_xts_xform; + test_ops.prepare_sym_op = prepare_cipher_op; + test_ops.prepare_sym_xform = prepare_xts_xform; + test_ops.test = fips_generic_test; + break; + case FIPS_TEST_ALGO_RSA: + test_ops.prepare_asym_op = prepare_rsa_op; + test_ops.prepare_asym_xform = prepare_rsa_xform; test_ops.test = fips_generic_test; break; default: if (strstr(info.file_name, "TECB") || strstr(info.file_name, "TCBC")) { info.algo = FIPS_TEST_ALGO_TDES; - test_ops.prepare_op = prepare_cipher_op; - test_ops.prepare_xform = prepare_tdes_xform; + test_ops.prepare_sym_op = prepare_cipher_op; + test_ops.prepare_sym_xform = prepare_tdes_xform; if (info.interim_info.tdes_data.test_type == TDES_MCT) test_ops.test = fips_mct_tdes_test; else Checking patch examples/fips_validation/main.c... error: examples/fips_validation/main.c: does not match index Checking patch examples/fips_validation/fips_validation.h... error: examples/fips_validation/fips_validation.h: does not match index Checking patch examples/fips_validation/fips_validation_rsa.c... error: examples/fips_validation/fips_validation_rsa.c: does not exist in index https://lab.dpdk.org/results/dashboard/patchsets/23937/ UNH-IOL DPDK Community Lab