From 3f1cbf5f144cf7a814b05eef3053468e6cfb87ec Mon Sep 17 00:00:00 2001 From: lanming Date: Wed, 14 Aug 2024 16:38:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E5=AF=86=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E5=BA=93=E6=A1=86=E6=9E=B6=E6=96=B0=E5=A2=9Esyscap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lanming --- include/codec_config/syscap_define.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index d1675f6..0d16e99 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -354,6 +354,16 @@ typedef enum SystemCapabilityNum { ABILITY_APPEXTENSION_PHOTOEDITOREXTENSION, HIVIEWDFX_HICOLLIE, BUNDLEMANAGER_APPDOMAINVERIFY, + SECURITY_CRYPTOFRAMEWORK_KEY, + SECURITY_CRYPTOFRAMEWORK_KEY_SYMKEY, + SECURITY_CRYPTOFRAMEWORK_KEY_ASYMKEY, + SECURITY_CRYPTOFRAMEWORK_SIGNATURE, + SECURITY_CRYPTOFRAMEWORK_CIPHER, + SECURITY_CRYPTOFRAMEWORK_KEYAGREEMENT, + SECURITY_CRYPTOFRAMEWORK_MESSAGEDIGEST, + SECURITY_CRYPTOFRAMEWORK_MAC, + SECURITY_CRYPTOFRAMEWORK_KDF, + SECURITY_CRYPTOFRAMEWORK_RAND, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; @@ -691,6 +701,16 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Customization.CustomConfig", CUSTOMIZATION_CUSTOMCONFIG}, {"SystemCapability.Ability.AppExtension.PhotoEditorExtension", ABILITY_APPEXTENSION_PHOTOEDITOREXTENSION}, {"SystemCapability.BundleManager.AppDomainVerify", BUNDLEMANAGER_APPDOMAINVERIFY}, + {"SystemCapability.Security.CryptoFramework.Key", SECURITY_CRYPTOFRAMEWORK_KEY}, + {"SystemCapability.Security.CryptoFramework.Key.SymKey", SECURITY_CRYPTOFRAMEWORK_KEY_SYMKEY}, + {"SystemCapability.Security.CryptoFramework.Key.AsymKey", SECURITY_CRYPTOFRAMEWORK_KEY_ASYMKEY}, + {"SystemCapability.Security.CryptoFramework.Signature", SECURITY_CRYPTOFRAMEWORK_SIGNATURE}, + {"SystemCapability.Security.CryptoFramework.Cipher", SECURITY_CRYPTOFRAMEWORK_CIPHER}, + {"SystemCapability.Security.CryptoFramework.KeyAgreement", SECURITY_CRYPTOFRAMEWORK_KEYAGREEMENT}, + {"SystemCapability.Security.CryptoFramework.MessageDigest", SECURITY_CRYPTOFRAMEWORK_MESSAGEDIGEST}, + {"SystemCapability.Security.CryptoFramework.Mac", SECURITY_CRYPTOFRAMEWORK_MAC}, + {"SystemCapability.Security.CryptoFramework.Kdf", SECURITY_CRYPTOFRAMEWORK_KDF}, + {"SystemCapability.Security.CryptoFramework.Rand", SECURITY_CRYPTOFRAMEWORK_RAND}, }; #ifdef __cplusplus -- Gitee From 34081b12f9cf566d1e8e04695e9fb7e5f6865501 Mon Sep 17 00:00:00 2001 From: xuedong Date: Mon, 26 Aug 2024 17:23:00 +0800 Subject: [PATCH 2/3] add vpe capability Signed-off-by: xuedong --- include/codec_config/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/codec_config/syscap_define.h b/include/codec_config/syscap_define.h index 0d16e99..cbb3166 100644 --- a/include/codec_config/syscap_define.h +++ b/include/codec_config/syscap_define.h @@ -364,6 +364,7 @@ typedef enum SystemCapabilityNum { SECURITY_CRYPTOFRAMEWORK_MAC, SECURITY_CRYPTOFRAMEWORK_KDF, SECURITY_CRYPTOFRAMEWORK_RAND, + MULTIMEDIA_VIDEOPROCESSINGENGINE, // Add before here SYSCAP_BASIC_END = 500, } SyscapNum; @@ -711,6 +712,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Security.CryptoFramework.Mac", SECURITY_CRYPTOFRAMEWORK_MAC}, {"SystemCapability.Security.CryptoFramework.Kdf", SECURITY_CRYPTOFRAMEWORK_KDF}, {"SystemCapability.Security.CryptoFramework.Rand", SECURITY_CRYPTOFRAMEWORK_RAND}, + {"SystemCapability.Multimedia.VideoProcessingEngine", MULTIMEDIA_VIDEOPROCESSINGENGINE}, }; #ifdef __cplusplus -- Gitee From f31918c27f9c9ef18b6c7881604250b34489f05a Mon Sep 17 00:00:00 2001 From: liutuantuan Date: Mon, 9 Sep 2024 19:19:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=99syscap=5Finterface=5Fshared?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=A2=9E=E5=8A=A0=E7=A1=AC=E4=BB=B6PAC?= =?UTF-8?q?=E5=90=8E=E5=90=91CFI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liutuantuan --- BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILD.gn b/BUILD.gn index 870dbae..df2cceb 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -107,6 +107,7 @@ if (defined(ohos_lite)) { } } else { ohos_shared_library("syscap_interface_shared") { + branch_protector_ret = "pac_ret" deps = [] if (syscap_codec_config_extern_path != "") { deps += [ ":gen_syscap_define_custom" ] -- Gitee