diff --git a/.dictionary b/.dictionary index 8138390c01b7a3bbd8ea2921ff5dd2e4e301b470..594596ba5fdd0c0284ec221ec3b5117e95e1f994 100644 --- a/.dictionary +++ b/.dictionary @@ -23,6 +23,7 @@ CONFIG_AUTOFS4_FS CONFIG_AUTOFS_FS configfile corstone +corstone1000 cpio crypto dialout diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccb73af7b0390248da73d0f75d6bd99bf96347f5..7b9d5af1c630f1f65bebbbb2e4d90b34920ee4fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,7 @@ trigger-meta-cassini: PARENT_PIPELINE_ID: $CI_PIPELINE_ID REPOS_BSP_URL: $CI_PROJECT_URL REPOS_BSP_REFSPEC: $CI_COMMIT_SHA + REPOS_BSP_BRANCH: $CI_COMMIT_BRANCH CODE_QUALITY_DISABLED: "true" SAST_DISABLED: "true" SECRET_DETECTION_DISABLED: "true" diff --git a/meta-arm/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0019-se-proxy-protobuf-change.patch b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0019-se-proxy-protobuf-change.patch index e4d0b9759fa012c0e450cdac92dbfd6d8ffaef32..cfe0e69366733dde94792df9fc0ee95ecf8e7960 100644 --- a/meta-arm/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0019-se-proxy-protobuf-change.patch +++ b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/corstone1000/0019-se-proxy-protobuf-change.patch @@ -30,7 +30,7 @@ index a0eb03b6f..e2774c135 100644 if (rpc_status != RPC_SUCCESS) { EMSG("Failed to initialize RPC endpoint: %d", rpc_status); goto fatal_error; -@@ -82,6 +83,28 @@ void __noreturn sp_main(union ffa_boot_info *boot_info) +@@ -129,6 +130,28 @@ void __noreturn sp_main(union ffa_boot_info *boot_info) goto fatal_error; } @@ -56,9 +56,9 @@ index a0eb03b6f..e2774c135 100644 + goto fatal_error; + } + - rpc_iface = attest_proxy_create(); - if (!rpc_iface) { - EMSG("Failed to create Attestation proxy"); + while (1) { + ts_rpc_endpoint_sp_receive(&rpc_endpoint, &req_msg, &resp_msg); + -- 2.25.1