diff --git a/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h b/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h index c2354ff4d28d23cd39366393d49bfcf0563ad066..190a51191bc2e5a16f993afc62ee7600fbb91dec 100755 --- a/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h +++ b/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h @@ -37,22 +37,30 @@ extern "C" { enum FileOwneridType { FILE_OWNERID_UNINT = 0, - FILE_OWNERID_SYSTEM, - FILE_OWNERID_APP, - FILE_OWNERID_DEBUG, - FILE_OWNERID_SHARED, - FILE_OWNERID_COMPAT, + FILE_OWNERID_SYSTEM, // 1 + FILE_OWNERID_APP, // 2 + FILE_OWNERID_DEBUG, // 3 + FILE_OWNERID_SHARED, // 4 + FILE_OWNERID_COMPAT, // 5 + FILE_OWNERID_EXTEND, // 6 + FILE_OWNERID_DEBUG_PLATFORM, // 7 + FILE_OWNERID_PLATFORM, // 8 + FILE_OWNERID_NWEB, // 9 FILE_OWNERID_MAX }; /* process and file ownerid types need to correspond to each other */ enum ProcessOwneridType { PROCESS_OWNERID_UNINIT = FILE_OWNERID_UNINT, - PROCESS_OWNERID_SYSTEM = FILE_OWNERID_SYSTEM, - PROCESS_OWNERID_APP = FILE_OWNERID_APP, - PROCESS_OWNERID_DEBUG = FILE_OWNERID_DEBUG, - PROCESS_OWNERID_COMPAT = FILE_OWNERID_COMPAT, - PROCESS_OWNERID_EXTEND, + PROCESS_OWNERID_SYSTEM, // 1 + PROCESS_OWNERID_APP, // 2 + PROCESS_OWNERID_DEBUG, // 3 + PROCESS_OWNERID_SHARED, // 4 + PROCESS_OWNERID_COMPAT, // 5 + PROCESS_OWNERID_EXTEND, // 6 + PROCESS_OWNERID_DEBUG_PLATFORM, // 7 + PROCESS_OWNERID_PLATFORM, // 8 + PROCESS_OWNERID_NWEB, // 9 PROCESS_OWNERID_MAX }; diff --git a/services/key_enable/config/not_sign_hap_py_path/trusted_cert_path_test.json b/services/key_enable/config/not_sign_hap_py_path/trusted_cert_path_test.json index a5c3bb3d7072e28af4cf68257311c00167371f75..e40fd11fe430753af48c381e61fa02ccbc6f1e53 100644 --- a/services/key_enable/config/not_sign_hap_py_path/trusted_cert_path_test.json +++ b/services/key_enable/config/not_sign_hap_py_path/trusted_cert_path_test.json @@ -39,14 +39,14 @@ }, { "mode":"Release", - "type":"Authed", + "type":"Platform", "subject":"ALL", "issuer":"C=CN, O=Huawei, OU=Huawei CBG, CN=Huawei CBG Software Signing Service CA Test", "max-certs-path":3 }, { "mode":"Release", - "type":"Authed", + "type":"Platform", "subject":"C=CN, O=OpenHarmony, OU=OpenHarmony Team, CN=OpenHarmony Application Release", "issuer":"C=CN, O=OpenHarmony, OU=OpenHarmony Team, CN=OpenHarmony Application CA", "max-certs-path":3 diff --git a/services/key_enable/config/openharmony/dev/trusted_cert_path.json b/services/key_enable/config/openharmony/dev/trusted_cert_path.json index 6df369b4829ee43141da8b950ce4e51b35236630..939e972daf875a20192ff021050bd8b897cf0d98 100644 --- a/services/key_enable/config/openharmony/dev/trusted_cert_path.json +++ b/services/key_enable/config/openharmony/dev/trusted_cert_path.json @@ -46,7 +46,7 @@ }, { "mode":"Release", - "type":"Authed", + "type":"Platform", "subject":"ALL", "issuer":"C=CN, O=Huawei, OU=Huawei CBG, CN=Huawei CBG Software Signing Service CA", "max-certs-path":3 diff --git a/services/key_enable/config/openharmony/release/trusted_cert_path.json b/services/key_enable/config/openharmony/release/trusted_cert_path.json index fd49474bd17a06bc45956467129dc9d933590c78..27b5338f08ac282291d920b38f3583c94bf2994d 100644 --- a/services/key_enable/config/openharmony/release/trusted_cert_path.json +++ b/services/key_enable/config/openharmony/release/trusted_cert_path.json @@ -46,7 +46,7 @@ }, { "mode":"Release", - "type":"Authed", + "type":"Platform", "subject":"ALL", "issuer":"C=CN, O=Huawei, OU=Huawei CBG, CN=Huawei CBG Software Signing Service CA", "max-certs-path":3 diff --git a/services/key_enable/config/trusted_cert_path.json b/services/key_enable/config/trusted_cert_path.json index 2b843e23eef492d816d77cc6ab99d7c236b7dd5a..ad03e42e122cbdfcef8910cb7097080fc7192bce 100644 --- a/services/key_enable/config/trusted_cert_path.json +++ b/services/key_enable/config/trusted_cert_path.json @@ -39,7 +39,7 @@ }, { "mode":"Release", - "type":"Authed", + "type":"Platform", "subject":"ALL", "issuer":"C=CN, O=Huawei, OU=Huawei CBG, CN=Huawei CBG Software Signing Service CA", "max-certs-path":3 diff --git a/services/key_enable/config/trusted_cert_path_test.json b/services/key_enable/config/trusted_cert_path_test.json index 0802282ce32a8a9e8bf4354dc71a00dc492dcb97..5b6847d2146120c205898a5f6baaf8a587f6b03f 100644 --- a/services/key_enable/config/trusted_cert_path_test.json +++ b/services/key_enable/config/trusted_cert_path_test.json @@ -39,7 +39,7 @@ }, { "mode":"Release", - "type":"Authed", + "type":"Platform", "subject":"ALL", "issuer":"C=CN, O=Huawei, OU=Huawei CBG, CN=Huawei CBG Software Signing Service CA Test", "max-certs-path":3 diff --git a/test/unittest/resources/demo_cert/cert_path/invalid_structure_cert_path.json b/test/unittest/resources/demo_cert/cert_path/invalid_structure_cert_path.json index d4ab721b4c55b46d5a55bbc0cf163981d9949f82..7de560c0ce0324305570dfa136d5c61a707041c4 100644 --- a/test/unittest/resources/demo_cert/cert_path/invalid_structure_cert_path.json +++ b/test/unittest/resources/demo_cert/cert_path/invalid_structure_cert_path.json @@ -18,7 +18,7 @@ }, { "mode":"Release", - "type":"Authed", + "type":"Platform", "subject":"ALL", "wrong-issuer":"C=CN, O=Huawei, OU=Huawei CBG, CN=Huawei CBG Software Signing Service CA", "max-certs-path":3