From 7e7c9d33cc02c09d59bbc642b754fbfb4eeda963 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Wed, 11 May 2022 10:59:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- interfaces/innerkits/appverify/BUILD.gn | 2 +- interfaces/innerkits/appverify/test/BUILD.gn | 2 +- .../innerkits/appverify_lite/products/ipcamera/BUILD.gn | 4 ++-- interfaces/innerkits/appverify_lite/unittest/BUILD.gn | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/innerkits/appverify/BUILD.gn b/interfaces/innerkits/appverify/BUILD.gn index b14e24c..91d7de3 100644 --- a/interfaces/innerkits/appverify/BUILD.gn +++ b/interfaces/innerkits/appverify/BUILD.gn @@ -68,7 +68,7 @@ if (os_level == "standard") { external_deps = [ "hiviewdfx_hilog_native:libhilog", - "startup_l2:syspara", + "init:libbegetutil", ] } else { external_deps = [ diff --git a/interfaces/innerkits/appverify/test/BUILD.gn b/interfaces/innerkits/appverify/test/BUILD.gn index 2ff7630..3d0e6d4 100644 --- a/interfaces/innerkits/appverify/test/BUILD.gn +++ b/interfaces/innerkits/appverify/test/BUILD.gn @@ -59,7 +59,7 @@ ohos_unittest("verify_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", - "startup_l2:syspara", + "init:libbegetutil", ] } else { external_deps = [ diff --git a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn index c127f14..e8dff9f 100644 --- a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn +++ b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn @@ -15,7 +15,7 @@ config("verify_base_config") { include_dirs = [ "//base/security/appverify/interfaces/innerkits/appverify_lite/include", "//base/security/appverify/interfaces/innerkits/appverify_lite/products/ipcamera", - "//base/startup/syspara_lite/interfaces/kits", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", ] cflags = [ "-Wall" ] } @@ -28,6 +28,6 @@ shared_library("verify_base") { configs += [ ":verify_base_config" ] public_deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/syspara_lite/frameworks/parameter:parameter", + "//base/startup/init_lite/interfaces/innerkits:libbegetutil", ] } diff --git a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn index 2d1cd49..3899623 100644 --- a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn +++ b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn @@ -37,7 +37,7 @@ unittest("app_verify_test") { include_dirs = [ "src", "//base/security/appverify/interfaces/innerkits/appverify_lite/include", - "//base/startup/syspara_lite/interfaces/kits", + "//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/security/permission/interfaces/innerkits/permission_lite", "//third_party/bounds_checking_function/include", "//third_party/cJSON", @@ -46,7 +46,7 @@ unittest("app_verify_test") { "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/security/appverify/interfaces/innerkits/appverify_lite:verify", "//base/security/permission/services/permission_lite/pms_client:pms_client", - "//base/startup/syspara_lite/frameworks/parameter:parameter", + "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//build/lite/config/component/cJSON:cjson_shared", "//third_party/bounds_checking_function:libsec_shared", "//third_party/mbedtls:mbedtls_shared", -- Gitee From a1eb2325c9056b90bc14c777d46e122caf9dcd38 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Thu, 23 Jun 2022 15:33:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- .../innerkits/appverify_lite/products/ipcamera/BUILD.gn | 4 ++-- interfaces/innerkits/appverify_lite/unittest/BUILD.gn | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn index e8dff9f..5eb2c41 100644 --- a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn +++ b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn @@ -10,12 +10,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import("//build/ohos.gni") config("verify_base_config") { include_dirs = [ "//base/security/appverify/interfaces/innerkits/appverify_lite/include", "//base/security/appverify/interfaces/innerkits/appverify_lite/products/ipcamera", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", ] cflags = [ "-Wall" ] } @@ -26,8 +26,8 @@ shared_library("verify_base") { "app_verify_base.c", ] configs += [ ":verify_base_config" ] + external_deps = [ "init:libbegetutil" ] public_deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", ] } diff --git a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn index 3899623..dae7f0a 100644 --- a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn +++ b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn @@ -13,6 +13,7 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") +import("//build/ohos.gni") config("app_verify_test_config") { cflags_cc = [ "-std=c++17" ] @@ -37,16 +38,16 @@ unittest("app_verify_test") { include_dirs = [ "src", "//base/security/appverify/interfaces/innerkits/appverify_lite/include", - "//base/startup/init_lite/interfaces/innerkits/include/syspara", "//base/security/permission/interfaces/innerkits/permission_lite", "//third_party/bounds_checking_function/include", "//third_party/cJSON", ] + + external_deps = [ "init:libbegetutil" ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/security/appverify/interfaces/innerkits/appverify_lite:verify", "//base/security/permission/services/permission_lite/pms_client:pms_client", - "//base/startup/init_lite/interfaces/innerkits:libbegetutil", "//build/lite/config/component/cJSON:cjson_shared", "//third_party/bounds_checking_function:libsec_shared", "//third_party/mbedtls:mbedtls_shared", -- Gitee From e2a2cdb5a962164205f2b1fe6ad38bf2bf7456fc Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Mon, 11 Jul 2022 19:28:59 -0700 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- .../innerkits/appverify_lite/products/ipcamera/BUILD.gn | 4 ++-- interfaces/innerkits/appverify_lite/unittest/BUILD.gn | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn index 5eb2c41..c051c75 100644 --- a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn +++ b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn @@ -10,7 +10,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") config("verify_base_config") { include_dirs = [ @@ -26,8 +25,9 @@ shared_library("verify_base") { "app_verify_base.c", ] configs += [ ":verify_base_config" ] - external_deps = [ "init:libbegetutil" ] + public_deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//base/startup/syspara_lite/frameworks/parameter:parameter", ] } diff --git a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn index dae7f0a..bd8bef4 100644 --- a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn +++ b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn @@ -13,7 +13,6 @@ import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") -import("//build/ohos.gni") config("app_verify_test_config") { cflags_cc = [ "-std=c++17" ] @@ -38,16 +37,17 @@ unittest("app_verify_test") { include_dirs = [ "src", "//base/security/appverify/interfaces/innerkits/appverify_lite/include", + "//base/startup/syspara_lite/interfaces/kits", "//base/security/permission/interfaces/innerkits/permission_lite", "//third_party/bounds_checking_function/include", "//third_party/cJSON", ] - external_deps = [ "init:libbegetutil" ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/security/appverify/interfaces/innerkits/appverify_lite:verify", "//base/security/permission/services/permission_lite/pms_client:pms_client", + "//base/startup/syspara_lite/frameworks/parameter:parameter", "//build/lite/config/component/cJSON:cjson_shared", "//third_party/bounds_checking_function:libsec_shared", "//third_party/mbedtls:mbedtls_shared", -- Gitee From ac3fecd60a6b79b2360b46b385d0d5f266846d76 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Tue, 12 Jul 2022 01:30:33 -0700 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUILD.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn index 9139f6c..9fe7824 100644 --- a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn +++ b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn @@ -15,6 +15,7 @@ config("verify_base_config") { include_dirs = [ "//base/security/appverify/interfaces/innerkits/appverify_lite/include", "//base/security/appverify/interfaces/innerkits/appverify_lite/products/ipcamera", + "//base/startup/syspara_lite/interfaces/kits", ] } -- Gitee From 25872085ce186c4896143cf90ece8a5f017030ad Mon Sep 17 00:00:00 2001 From: linxiangzhi Date: Fri, 15 Jul 2022 16:19:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: linxiangzhi Change-Id: I114b5e11b4c57eb2831df95be35dc1a69f05d7cf --- .../include/common/hap_byte_buffer_data_source.h | 3 ++- .../appverify/include/common/hap_file_data_source.h | 1 + .../appverify/include/common/random_access_file.h | 2 +- .../appverify/include/init/device_type_manager.h | 4 ++-- .../appverify/include/init/hap_crl_manager.h | 7 +++---- .../appverify/include/util/digest_parameter.h | 11 +++++++---- .../appverify/include/util/hap_profile_verify_utils.h | 3 +-- .../appverify/include/util/hap_signing_block_utils.h | 7 ++++--- .../appverify/include/util/hap_verify_openssl_utils.h | 7 +++++-- .../appverify/src/common/hap_byte_buffer.cpp | 3 +-- .../src/common/hap_byte_buffer_data_source.cpp | 1 + .../appverify/src/common/random_access_file.cpp | 5 +++-- .../innerkits/appverify/src/init/hap_crl_manager.cpp | 5 +++++ .../appverify/src/interfaces/hap_verify_result.cpp | 1 - .../innerkits/appverify/src/util/digest_parameter.cpp | 2 ++ .../appverify/src/util/hap_profile_verify_utils.cpp | 4 ++++ .../appverify/src/util/hap_signing_block_utils.cpp | 8 +++++--- .../appverify/src/util/hap_verify_openssl_utils.cpp | 11 ++++++++--- 18 files changed, 55 insertions(+), 30 deletions(-) diff --git a/interfaces/innerkits/appverify/include/common/hap_byte_buffer_data_source.h b/interfaces/innerkits/appverify/include/common/hap_byte_buffer_data_source.h index 1d971f0..7036e9d 100644 --- a/interfaces/innerkits/appverify/include/common/hap_byte_buffer_data_source.h +++ b/interfaces/innerkits/appverify/include/common/hap_byte_buffer_data_source.h @@ -17,7 +17,8 @@ #include "common/data_source.h" #include "common/export_define.h" -#include "common/random_access_file.h" +#include "common/hap_byte_buffer.h" +#include "util/digest_parameter.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/include/common/hap_file_data_source.h b/interfaces/innerkits/appverify/include/common/hap_file_data_source.h index e5907ee..2594d31 100644 --- a/interfaces/innerkits/appverify/include/common/hap_file_data_source.h +++ b/interfaces/innerkits/appverify/include/common/hap_file_data_source.h @@ -17,6 +17,7 @@ #include "common/data_source.h" #include "common/random_access_file.h" +#include "util/digest_parameter.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/include/common/random_access_file.h b/interfaces/innerkits/appverify/include/common/random_access_file.h index 78062b6..62abfb8 100644 --- a/interfaces/innerkits/appverify/include/common/random_access_file.h +++ b/interfaces/innerkits/appverify/include/common/random_access_file.h @@ -17,7 +17,7 @@ #include "common/export_define.h" #include "common/hap_byte_buffer.h" -#include "util/hap_verify_openssl_utils.h" +#include "util/digest_parameter.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/include/init/device_type_manager.h b/interfaces/innerkits/appverify/include/init/device_type_manager.h index 6a3e88f..87e431e 100644 --- a/interfaces/innerkits/appverify/include/init/device_type_manager.h +++ b/interfaces/innerkits/appverify/include/init/device_type_manager.h @@ -16,10 +16,10 @@ #ifndef OHOS_DEVICE_TYPE_MANAGER_H #define OHOS_DEVICE_TYPE_MANAGER_H -#include "common/export_define.h" - #include +#include "common/export_define.h" + namespace OHOS { namespace Security { namespace Verify { diff --git a/interfaces/innerkits/appverify/include/init/hap_crl_manager.h b/interfaces/innerkits/appverify/include/init/hap_crl_manager.h index 27dd42c..20638de 100644 --- a/interfaces/innerkits/appverify/include/init/hap_crl_manager.h +++ b/interfaces/innerkits/appverify/include/init/hap_crl_manager.h @@ -15,15 +15,14 @@ #ifndef HAP_CRL_MANAGER_H #define HAP_CRL_MANAGER_H -#include -#include #include +#include #include - -#include "openssl/x509.h" +#include #include "common/export_define.h" #include "common/hap_byte_buffer.h" +#include "openssl/ossl_typ.h" #include "util/pkcs7_context.h" namespace OHOS { diff --git a/interfaces/innerkits/appverify/include/util/digest_parameter.h b/interfaces/innerkits/appverify/include/util/digest_parameter.h index 8277cdc..65510b6 100644 --- a/interfaces/innerkits/appverify/include/util/digest_parameter.h +++ b/interfaces/innerkits/appverify/include/util/digest_parameter.h @@ -16,11 +16,12 @@ #ifndef HOSP_DIGESTPARAMETER_H #define HOSP_DIGESTPARAMETER_H -#include "openssl/evp.h" - #include "common/export_define.h" +#include "openssl/ossl_typ.h" -namespace OHOS::Security::Verify { +namespace OHOS { +namespace Security { +namespace Verify { class DigestParameter { public: DLL_EXPORT DigestParameter(); @@ -34,5 +35,7 @@ public: const EVP_MD* md; EVP_MD_CTX* ptrCtx; }; -} // namespace OHOS::Security::Verify +} // namespace Verify +} // namespace Security +} // namespace OHOS #endif // HOSP_DIGESTPARAMETER_H diff --git a/interfaces/innerkits/appverify/include/util/hap_profile_verify_utils.h b/interfaces/innerkits/appverify/include/util/hap_profile_verify_utils.h index ffcc4ec..75ee728 100644 --- a/interfaces/innerkits/appverify/include/util/hap_profile_verify_utils.h +++ b/interfaces/innerkits/appverify/include/util/hap_profile_verify_utils.h @@ -16,11 +16,10 @@ #define HAP_PROFILE_VERIFY_UTILS_H #include -#include #include "common/export_define.h" #include "common/hap_byte_buffer.h" -#include "util/hap_verify_openssl_utils.h" +#include "util/pkcs7_context.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h b/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h index ec6f2e9..1c76136 100644 --- a/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h +++ b/interfaces/innerkits/appverify/include/util/hap_signing_block_utils.h @@ -15,15 +15,16 @@ #ifndef HAP_SIGNING_BLOCK_UTILS_H #define HAP_SIGNING_BLOCK_UTILS_H -#include #include -#include "openssl/evp.h" #include "common/data_source.h" #include "common/export_define.h" #include "common/hap_byte_buffer.h" #include "common/random_access_file.h" -#include "util/hap_verify_openssl_utils.h" +#include "interfaces/hap_verify_result.h" +#include "util/digest_parameter.h" +#include "util/pkcs7_context.h" +#include "util/signature_info.h" #include "util/signature_info.h" namespace OHOS { diff --git a/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h b/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h index 59868c1..66ffd95 100644 --- a/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h +++ b/interfaces/innerkits/appverify/include/util/hap_verify_openssl_utils.h @@ -18,13 +18,16 @@ #include #include -#include "openssl/evp.h" - #include "common/export_define.h" #include "common/hap_byte_buffer.h" #include "interfaces/hap_verify_result.h" +#include "openssl/evp.h" +#include "openssl/ossl_typ.h" +#include "openssl/pkcs7.h" +#include "openssl/safestack.h" #include "util/digest_parameter.h" #include "util/hap_cert_verify_openssl_utils.h" +#include "util/pkcs7_context.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp b/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp index 27899cc..25198ad 100644 --- a/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp +++ b/interfaces/innerkits/appverify/src/common/hap_byte_buffer.cpp @@ -15,9 +15,8 @@ #include "common/hap_byte_buffer.h" -#include "securec.h" - #include "common/hap_verify_log.h" +#include "securec.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/src/common/hap_byte_buffer_data_source.cpp b/interfaces/innerkits/appverify/src/common/hap_byte_buffer_data_source.cpp index 2dd4c32..b94d337 100644 --- a/interfaces/innerkits/appverify/src/common/hap_byte_buffer_data_source.cpp +++ b/interfaces/innerkits/appverify/src/common/hap_byte_buffer_data_source.cpp @@ -14,6 +14,7 @@ */ #include "common/hap_byte_buffer_data_source.h" +#include "util/hap_verify_openssl_utils.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/src/common/random_access_file.cpp b/interfaces/innerkits/appverify/src/common/random_access_file.cpp index 062c568..70e4779 100644 --- a/interfaces/innerkits/appverify/src/common/random_access_file.cpp +++ b/interfaces/innerkits/appverify/src/common/random_access_file.cpp @@ -17,12 +17,13 @@ #include #include +#include #include #include -#include "securec.h" - #include "common/hap_verify_log.h" +#include "securec.h" +#include "util/hap_verify_openssl_utils.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp b/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp index 3f129d0..6fc8baa 100644 --- a/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp +++ b/interfaces/innerkits/appverify/src/init/hap_crl_manager.cpp @@ -16,10 +16,15 @@ #include "init/hap_crl_manager.h" #include +#include #include "common/hap_verify_log.h" #include "common/random_access_file.h" +#include "openssl/asn1.h" +#include "openssl/x509.h" +#include "unordered_map" #include "util/hap_cert_verify_openssl_utils.h" +#include "utility" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp b/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp index 7e07baa..37608c1 100644 --- a/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp +++ b/interfaces/innerkits/appverify/src/interfaces/hap_verify_result.cpp @@ -16,7 +16,6 @@ #include "interfaces/hap_verify_result.h" #include "util/hap_signing_block_utils.h" -#include "util/hap_verify_openssl_utils.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/src/util/digest_parameter.cpp b/interfaces/innerkits/appverify/src/util/digest_parameter.cpp index ead2deb..50a1587 100644 --- a/interfaces/innerkits/appverify/src/util/digest_parameter.cpp +++ b/interfaces/innerkits/appverify/src/util/digest_parameter.cpp @@ -15,6 +15,8 @@ #include "util/digest_parameter.h" +#include "openssl/evp.h" + namespace OHOS::Security::Verify { DigestParameter::DigestParameter() : digestOutputSizeBytes(0), md(nullptr), ptrCtx(nullptr) { diff --git a/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp index 973e457..cb1c419 100644 --- a/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp +++ b/interfaces/innerkits/appverify/src/util/hap_profile_verify_utils.cpp @@ -16,7 +16,11 @@ #include "util/hap_profile_verify_utils.h" #include "common/hap_verify_log.h" +#include "init/matching_result.h" #include "init/trusted_source_manager.h" +#include "util/hap_cert_verify_openssl_utils.h" +#include "util/hap_signing_block_utils.h" +#include "util/hap_verify_openssl_utils.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp index 5746006..9f06811 100644 --- a/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp +++ b/interfaces/innerkits/appverify/src/util/hap_signing_block_utils.cpp @@ -16,13 +16,15 @@ #include "util/hap_signing_block_utils.h" #include -#include - -#include "securec.h" +#include +#include "algorithm" #include "common/hap_byte_buffer_data_source.h" #include "common/hap_file_data_source.h" #include "common/hap_verify_log.h" +#include "openssl/evp.h" +#include "securec.h" +#include "util/hap_verify_openssl_utils.h" namespace OHOS { namespace Security { diff --git a/interfaces/innerkits/appverify/src/util/hap_verify_openssl_utils.cpp b/interfaces/innerkits/appverify/src/util/hap_verify_openssl_utils.cpp index 2f5ab58..5c877fd 100644 --- a/interfaces/innerkits/appverify/src/util/hap_verify_openssl_utils.cpp +++ b/interfaces/innerkits/appverify/src/util/hap_verify_openssl_utils.cpp @@ -15,10 +15,15 @@ #include "util/hap_verify_openssl_utils.h" -#include "openssl/err.h" -#include "openssl/pem.h" - #include "common/hap_verify_log.h" +#include "openssl/asn1.h" +#include "openssl/bio.h" +#include "openssl/crypto.h" +#include "openssl/err.h" +#include "openssl/obj_mac.h" +#include "openssl/objects.h" +#include "openssl/rsa.h" +#include "openssl/x509.h" namespace OHOS { namespace Security { -- Gitee From 179d62621cb0fb2afabc9e0db2502ef7379d1f0d Mon Sep 17 00:00:00 2001 From: wanghang Date: Wed, 20 Jul 2022 15:16:48 +0800 Subject: [PATCH 6/6] IssueNo:#I5HYM0 Description:openssl change to dynamic library Sig:SIG_ApplicaitonFramework Feature or Bugfix:Feature Binary Source:No Signed-off-by: wanghang Change-Id: Ia7ab9db07473d684f6b0fdddd908bd51d73b19df --- bundle.json | 8 ++++---- interfaces/innerkits/appverify/BUILD.gn | 14 +++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/bundle.json b/bundle.json index d448c0d..857ee85 100644 --- a/bundle.json +++ b/bundle.json @@ -24,12 +24,12 @@ "deps": { "components": [ "hiviewdfx_hilog_native", - "startup_l2" + "init", + "utils_base" ], "third_party": [ - "bounds_checking_function", - "mbedtls", - "cjson" + "json", + "openssl" ] }, "build": { diff --git a/interfaces/innerkits/appverify/BUILD.gn b/interfaces/innerkits/appverify/BUILD.gn index 91d7de3..9bb76f1 100644 --- a/interfaces/innerkits/appverify/BUILD.gn +++ b/interfaces/innerkits/appverify/BUILD.gn @@ -17,11 +17,10 @@ if (os_level == "standard") { config("libhapverify_config") { visibility = [ ":*" ] include_dirs = [ - "//base/security/appverify/interfaces/innerkits/appverify/include", + "include", "//third_party/openssl/include", "//third_party/json/include", "//third_party/json/single_include", - "//utils/native/base/include", ] } @@ -56,22 +55,19 @@ if (os_level == "standard") { "-fvisibility=hidden", ] - ldflags = [ "-Wl,--exclude-libs=libcrypto_static.a" ] + deps = [ "//third_party/openssl:libcrypto_shared" ] - deps = [ - "//third_party/openssl:libcrypto_static", - "//utils/native/base:utils", - ] + external_deps = [ "utils_base:utils" ] if (is_standard_system) { defines = [ "STANDARD_SYSTEM" ] - external_deps = [ + external_deps += [ "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", ] } else { - external_deps = [ + external_deps += [ "ipc:ipc_core", "os_account:libaccountkits", "shared_library:libhilog", -- Gitee