diff --git a/dsoftbus/build/0002-support-hichian-for-openeuler.patch b/dsoftbus/build/0002-support-hichian-for-openeuler.patch new file mode 100644 index 0000000000000000000000000000000000000000..8601badaaf88b3b4ffb2869612453f23d0800dc2 --- /dev/null +++ b/dsoftbus/build/0002-support-hichian-for-openeuler.patch @@ -0,0 +1,24 @@ +From 7107b08f6af32170e225922f36e315c03959c720 Mon Sep 17 00:00:00 2001 +From: "beiling.xie" +Date: Fri, 2 Sep 2022 22:36:29 +0800 +Subject: [PATCH] support hichian for openeuler + +Signed-off-by: beiling.xie +--- + config/BUILDCONFIG.gn | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn +index 9e016df..4cc5b41 100755 +--- a/config/BUILDCONFIG.gn ++++ b/config/BUILDCONFIG.gn +@@ -517,3 +517,6 @@ foreach(_target_type, target_type_list) { + } + } + } ++ ++support_jsapi = false ++os_level = "standard" +-- +2.25.1 + diff --git a/dsoftbus/depend/BUILD.gn b/dsoftbus/depend/BUILD.gn index c0879e9d8e57cb26e4390461337f4e7d1143b397..174ff9c993f986f01c508a230a444d1e0c600259 100644 --- a/dsoftbus/depend/BUILD.gn +++ b/dsoftbus/depend/BUILD.gn @@ -1,14 +1,5 @@ import("//build/ohos.gni") -config("device_auth_config") { - include_dirs = [ "device_auth/include" ] -} - -ohos_shared_library("deviceauth_sdk") { - sources = [ "device_auth/device_auth.c" ] - public_configs = [ ":device_auth_config" ] -} - config("hilog_config") { include_dirs = [ "hilog/include", @@ -72,3 +63,6 @@ group("want") { group("appexecfwk_core") { } + +group("libaccesstoken_sdk") { +} diff --git a/dsoftbus/depend/device_auth/device_auth.c b/dsoftbus/depend/device_auth/device_auth.c deleted file mode 100644 index db5c6a3877f3c172828ce4825ffb3a079cfef858..0000000000000000000000000000000000000000 --- a/dsoftbus/depend/device_auth/device_auth.c +++ /dev/null @@ -1,59 +0,0 @@ -#include -#include "device_auth.h" - -#define AUTH_START "auth_start" -#define AUTH_END "auth_end" - -#define KEY_LEN 33 -const uint8_t sessionkey_default[KEY_LEN]="01234567890123456789012345678901"; - -static int32_t ProcessData(int64_t authReqId, const uint8_t *data, uint32_t datalen, - const DeviceAuthCallback *callback) -{ - if (!strncmp((const char *)data, AUTH_START, strlen(AUTH_START))) { - callback->onTransmit(authReqId, (const uint8_t *)AUTH_END, strlen(AUTH_END)); - } - callback->onSessionKeyReturned(authReqId, sessionkey_default, KEY_LEN - 1); - return 0; -} - - -static int32_t AuthDevice(int32_t OsAccountId, int64_t authReqId, const char *authParams, - const DeviceAuthCallback *callback) -{ - callback->onTransmit(authReqId, (const uint8_t *)AUTH_START, strlen(AUTH_START)); - return 0; -} - -static int32_t RegDataChangeListener(const char* appId, const DataChangeListener *listener) -{ - return 0; -} - -static GroupAuthManager g_groupAuthManager = { - .processData = ProcessData, - .authDevice = AuthDevice, -}; - -static DeviceGroupManager g_deviceGroupManager = { - .regDataChangeListener = RegDataChangeListener, -}; - -const GroupAuthManager *GetGaInstance(void) -{ - return (const GroupAuthManager *)&g_groupAuthManager; -} - -const DeviceGroupManager *GetGmInstance(void) -{ - return (const DeviceGroupManager *)&g_deviceGroupManager; -} - -int InitDeviceAuthService(void) -{ - return 0; -} - -void DestroyDeviceAuthService(void) -{ -} diff --git a/dsoftbus/depend/device_auth/include/device_auth.h b/dsoftbus/depend/device_auth/include/device_auth.h deleted file mode 100644 index 2c7a076927e799aec4efc4d91b170411fc45b206..0000000000000000000000000000000000000000 --- a/dsoftbus/depend/device_auth/include/device_auth.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef _DEVICE_AUTH_H -#define _DEVICE_AUTH_H - -#include -#include - -typedef enum { - DEFAULT_OS_ACCOUNT = 0, - INVALID_OS_ACCOUNT = -1, - ANY_OS_ACCOUNT = -2, -} OsAccountEnum; - -typedef enum { - GROUP_TYPE_INVALID = -1, - ALL_GROUP = 0, - IDENTICAL_ACCOUNT_GROUP = 1, - PEER_TO_PEER_GROUP = 256, - COMPATIBLE_GROUP = 512, - ACROSS_ACCOUNT_AUTHORIZE_GROUP = 1282 -} GroupType; - -#define FIELD_GROUP_ID "groupId" -#define FIELD_GROUP_TYPE "groupType" -#define FIELD_PEER_CONN_DEVICE_ID "peerConnDeviceId" -#define FIELD_SERVICE_PKG_NAME "servicePkgName" -#define FIELD_IS_CLIENT "isClient" -#define FIELD_KEY_LENGTH "keyLength" -#define FIELD_CONFIRMATION "confirmation" - -#define REQUEST_ACCEPTED 0x80000006 - -typedef struct { - bool (*onTransmit)(int64_t requestId, const uint8_t *data, uint32_t dataLen); - void (*onSessionKeyReturned)(int64_t requestId, const uint8_t *sessionKey, uint32_t sessionKeyLen); - void (*onFinish)(int64_t requestId, int operationCode, const char *returnData); - void (*onError)(int64_t requestId, int operationCode, int errorCode, const char *errorReturn); - char *(*onRequest)(int64_t requestId, int operationCode, const char *reqParams); -} DeviceAuthCallback; - -typedef struct { - int32_t (*processData)(int64_t authReqId, const uint8_t *data, uint32_t dataLen, const DeviceAuthCallback *gaCallback); - int32_t (*authDevice)(int32_t osAccountId, int64_t authReqId, const char *authParams, const DeviceAuthCallback *gaCallback); -} GroupAuthManager; - -typedef struct { - void (*onDeviceNotTrusted)(const char *peerUdid); - void (*onGroupCreated)(const char *groupInfo); - void (*onGroupDeleted)(const char *groupInfo); -} DataChangeListener; - -typedef struct { - int32_t (*regDataChangeListener)(const char *appId, const DataChangeListener *listener); -} DeviceGroupManager; - -int InitDeviceAuthService(void); -void DestroyDeviceAuthService(void); -const GroupAuthManager *GetGaInstance(void); -const DeviceGroupManager *GetGmInstance(void); - -#endif diff --git a/dsoftbus/depend/hilog/include/hilog/log.h b/dsoftbus/depend/hilog/include/hilog/log.h index 715880c19eb414d981ee8866e85876fc8fb08221..ac26e3647ab80b0ad00a00fc41c5ba2737ad4d1e 100644 --- a/dsoftbus/depend/hilog/include/hilog/log.h +++ b/dsoftbus/depend/hilog/include/hilog/log.h @@ -15,6 +15,7 @@ void printfAdapter(const char *fmt, ...); #define HILOG_INFO(type, fmt, ...) printfAdapter(fmt"\n", ##__VA_ARGS__) #define HILOG_WARN(type, fmt, ...) printfAdapter(fmt"\n", ##__VA_ARGS__) #define HILOG_ERROR(type, fmt, ...) printfAdapter(fmt"\n", ##__VA_ARGS__) +#define HiLogPrint(type, level, domain, tag, fmt, ...) printf(fmt"\n", ##__VA_ARGS__) #ifdef __cplusplus #if __cplusplus diff --git a/dsoftbus/depend/ohos.build b/dsoftbus/depend/ohos.build index 33673a313e5ada20432572a0835d7fbfa5b63953..5a221cfc320a83c23e265f2a7bf6040f9930a998 100644 --- a/dsoftbus/depend/ohos.build +++ b/dsoftbus/depend/ohos.build @@ -68,35 +68,35 @@ } ] }, - "deviceauth_standard": { + "permission_standard": { "module_list": [ ], "inner_kits": [ { - "name": "//depend:deviceauth_sdk", + "name": "//depend:libpermissionsdk_standard", "header": { "header_files": [ ], - "header_base": "//depend" + "header_base":"//depend" } } ] }, - "permission_standard": { + "safwk": { "module_list": [ ], "inner_kits": [ { - "name": "//depend:libpermissionsdk_standard", + "name": "//depend:system_ability_fwk", "header": { "header_files": [ ], - "header_base":"//depend" + "header_base": "//depend" } } ] }, - "safwk": { + "samgr_L2": { "module_list": [ ], "inner_kits": [ { - "name": "//depend:system_ability_fwk", + "name": "//depend:samgr_proxy", "header": { "header_files": [ ], "header_base": "//depend" @@ -104,7 +104,7 @@ } ] }, - "samgr_L2": { + "samgr_standard": { "module_list": [ ], "inner_kits": [ { @@ -115,6 +115,18 @@ } } ] + }, + "access_token": { + "module_list": [ ], + "inner_kits": [ + { + "name": "//depend:libaccesstoken_sdk", + "header": { + "header_files": [ ], + "header_base": "//depend" + } + } + ] } } } diff --git a/dsoftbus/hichain/deviceauth/0001-support-deviceauth-for-openeuler.patch b/dsoftbus/hichain/deviceauth/0001-support-deviceauth-for-openeuler.patch new file mode 100644 index 0000000000000000000000000000000000000000..208ed4f22b329ecb5392ca7cb1d6a6a3131651f0 --- /dev/null +++ b/dsoftbus/hichain/deviceauth/0001-support-deviceauth-for-openeuler.patch @@ -0,0 +1,133 @@ +From 6a65c13ee13522f5d3c3a9f298ef35fe0162f9aa Mon Sep 17 00:00:00 2001 +From: "beiling.xie" +Date: Tue, 19 Jul 2022 12:01:01 +0800 +Subject: [PATCH] support deviceauth for openeuler + +Signed-off-by: beiling.xie +--- + deps_adapter/BUILD.gn | 3 ++- + deps_adapter/os_adapter/impl/src/linux/hc_dev_info.c | 7 +++++-- + deps_adapter/os_adapter/interfaces/linux/hc_log.h | 8 ++++---- + services/BUILD.gn | 2 +- + .../src/permission_adapter/permission_adapter.cpp | 11 +++++++---- + 5 files changed, 19 insertions(+), 12 deletions(-) + +diff --git a/deps_adapter/BUILD.gn b/deps_adapter/BUILD.gn +index 28df2d9..9324baf 100644 +--- a/deps_adapter/BUILD.gn ++++ b/deps_adapter/BUILD.gn +@@ -118,10 +118,11 @@ if (defined(ohos_lite)) { + cflags = [ "-DHILOG_ENABLE" ] + deps = [ + "//base/security/huks/interfaces/innerkits/huks_standard/main:libhukssdk", +- "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", ++# "//base/startup/syspara_lite/interfaces/innerkits/native/syspara:syspara", + "//third_party/cJSON:cjson_static", + "//third_party/openssl:libcrypto_static", + "//utils/native/base:utils", ++ "//third_party/bounds_checking_function:libsec_shared" + ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + } +diff --git a/deps_adapter/os_adapter/impl/src/linux/hc_dev_info.c b/deps_adapter/os_adapter/impl/src/linux/hc_dev_info.c +index 800b7cf..c16f2f5 100644 +--- a/deps_adapter/os_adapter/impl/src/linux/hc_dev_info.c ++++ b/deps_adapter/os_adapter/impl/src/linux/hc_dev_info.c +@@ -16,19 +16,22 @@ + #include "hc_dev_info.h" + #include "hal_error.h" + #include "hc_log.h" +-#include "parameter.h" ++//#include "parameter.h" + #include "securec.h" + + #ifdef __cplusplus + extern "C" { + #endif + ++#define DEFAULT_UDID_NAME "ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00ABCDEF00" ++ + int32_t HcGetUdid(uint8_t *udid, int32_t udidLen) + { + if (udid == NULL || udidLen < INPUT_UDID_LEN || udidLen > MAX_INPUT_UDID_LEN) { + return HAL_ERR_INVALID_PARAM; + } +- int32_t res = GetDevUdid((char *)udid, udidLen); ++// int32_t res = GetDevUdid((char *)udid, udidLen); ++ int32_t res = strncpy_s((char *)udid, udidLen, DEFAULT_UDID_NAME, strlen(DEFAULT_UDID_NAME)); + if (res != 0) { + LOGE("[OS]: GetDevUdid fail! res: %d", res); + return HAL_FAILED; +diff --git a/deps_adapter/os_adapter/interfaces/linux/hc_log.h b/deps_adapter/os_adapter/interfaces/linux/hc_log.h +index 7cfd649..f881d1e 100644 +--- a/deps_adapter/os_adapter/interfaces/linux/hc_log.h ++++ b/deps_adapter/os_adapter/interfaces/linux/hc_log.h +@@ -44,10 +44,10 @@ void DevAuthLogPrint(DevAuthLogLevel level, const char *funName, const char *fmt + #define LOGW(fmt, ...) (DevAuthLogPrint(DEV_AUTH_LOG_LEVEL_WARN, __FUNCTION__, fmt, ##__VA_ARGS__)) + #define LOGE(fmt, ...) (DevAuthLogPrint(DEV_AUTH_LOG_LEVEL_ERROR, __FUNCTION__, fmt, ##__VA_ARGS__)) + +-#define DEV_AUTH_LOG_DEBUG(buf) HiLogPrint(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, "[DEVAUTH]", "%{public}s", buf) +-#define DEV_AUTH_LOG_INFO(buf) HiLogPrint(LOG_CORE, LOG_INFO, LOG_DOMAIN, "[DEVAUTH]", "%{public}s", buf) +-#define DEV_AUTH_LOG_WARN(buf) HiLogPrint(LOG_CORE, LOG_WARN, LOG_DOMAIN, "[DEVAUTH]", "%{public}s", buf) +-#define DEV_AUTH_LOG_ERROR(buf) HiLogPrint(LOG_CORE, LOG_ERROR, LOG_DOMAIN, "[DEVAUTH]", "%{public}s", buf) ++#define DEV_AUTH_LOG_DEBUG(buf) HiLogPrint(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, "[DEVAUTH]", "%s", buf) ++#define DEV_AUTH_LOG_INFO(buf) HiLogPrint(LOG_CORE, LOG_INFO, LOG_DOMAIN, "[DEVAUTH]", "%s", buf) ++#define DEV_AUTH_LOG_WARN(buf) HiLogPrint(LOG_CORE, LOG_WARN, LOG_DOMAIN, "[DEVAUTH]", "%s", buf) ++#define DEV_AUTH_LOG_ERROR(buf) HiLogPrint(LOG_CORE, LOG_ERROR, LOG_DOMAIN, "[DEVAUTH]", "%s", buf) + + #else + +diff --git a/services/BUILD.gn b/services/BUILD.gn +index bb15b89..b2cdb17 100644 +--- a/services/BUILD.gn ++++ b/services/BUILD.gn +@@ -159,10 +159,10 @@ if (defined(ohos_lite)) { + "${deps_adapter_path}:${hal_module_name}", + "//third_party/cJSON:cjson_static", + "//utils/native/base:utils", ++ "//foundation/communication/dsoftbus/sdk:softbus_client" + ] + + external_deps = [ +- "dsoftbus_standard:softbus_client", + "hiviewdfx_hilog_native:libhilog", + ] + if (support_jsapi) { +diff --git a/services/frameworks/src/permission_adapter/permission_adapter.cpp b/services/frameworks/src/permission_adapter/permission_adapter.cpp +index dcdb912..6f4f8a3 100644 +--- a/services/frameworks/src/permission_adapter/permission_adapter.cpp ++++ b/services/frameworks/src/permission_adapter/permission_adapter.cpp +@@ -15,17 +15,18 @@ + + #include "permission_adapter.h" + +-#include "accesstoken_kit.h" ++//#include "accesstoken_kit.h" + #include "ipc_skeleton.h" + + #include "device_auth_defines.h" + #include "hc_log.h" + +-using namespace OHOS; +-using namespace OHOS::Security::AccessToken; ++//using namespace OHOS; ++//using namespace OHOS::Security::AccessToken; + + int32_t CheckPermission(void) + { ++#if 0 + AccessTokenID tokenId = IPCSkeleton::GetCallingTokenID(); + ATokenTypeEnum tokenType = AccessTokenKit::GetTokenType(tokenId); + if (tokenType == TOKEN_NATIVE) { +@@ -45,4 +46,6 @@ int32_t CheckPermission(void) + LOGE("Invalid token type: %d", tokenType); + return HC_ERROR; + } +-} +\ No newline at end of file ++#endif ++ return HC_SUCCESS; ++} +-- +2.25.1 + diff --git a/dsoftbus/hichain/deviceauth/security_device_auth-OpenHarmony-v3.1.2-Release.zip b/dsoftbus/hichain/deviceauth/security_device_auth-OpenHarmony-v3.1.2-Release.zip new file mode 100644 index 0000000000000000000000000000000000000000..f0cbe1565a5dfda760c6b73661510795314286fe Binary files /dev/null and b/dsoftbus/hichain/deviceauth/security_device_auth-OpenHarmony-v3.1.2-Release.zip differ diff --git a/dsoftbus/hichain/huks/0001-support-huks-for-openeuler.patch b/dsoftbus/hichain/huks/0001-support-huks-for-openeuler.patch new file mode 100644 index 0000000000000000000000000000000000000000..af8eebe35cbcb2afacf803427b19bee8da5aac9e --- /dev/null +++ b/dsoftbus/hichain/huks/0001-support-huks-for-openeuler.patch @@ -0,0 +1,236 @@ +From c7fe7e1422af2a0b4fdbd7e514f8b8c6054170e8 Mon Sep 17 00:00:00 2001 +From: "beiling.xie" +Date: Tue, 19 Jul 2022 21:01:41 +0800 +Subject: [PATCH] support huks for openeuler + +Signed-off-by: beiling.xie +--- + frameworks/huks_standard/main/BUILD.gn | 1 + + .../huks_standard/main/core/src/hks_verifier.c | 10 ++++++---- + .../crypto_engine/openssl/src/hks_openssl_kdf.c | 4 +++- + .../huks_standard/main/os_dependency/BUILD.gn | 15 ++++++++++----- + .../main/os_dependency/log/hks_log.c | 14 +++++++------- + interfaces/innerkits/huks_standard/main/BUILD.gn | 1 + + .../huks_service/main/os_dependency/BUILD.gn | 2 +- + .../huks_service/main/os_dependency/idl/BUILD.gn | 6 +++--- + utils/file_operator/hks_file_operator.c | 6 +++--- + 9 files changed, 35 insertions(+), 24 deletions(-) + +diff --git a/frameworks/huks_standard/main/BUILD.gn b/frameworks/huks_standard/main/BUILD.gn +index 83d7750..cd899cd 100755 +--- a/frameworks/huks_standard/main/BUILD.gn ++++ b/frameworks/huks_standard/main/BUILD.gn +@@ -20,6 +20,7 @@ group("huks_standard_frameworks") { + "//base/security/huks/frameworks/huks_standard/main/core:libhuks_core_standard_static", + "//base/security/huks/frameworks/huks_standard/main/crypto_engine:libhuks_crypto_engine_standard_static", + "//base/security/huks/frameworks/huks_standard/main/os_dependency:libhuks_os_dependency_standard_static", ++ "//base/security/huks/services/huks_standard/huks_service/main/os_dependency:libhuks_service_os_dependency_standard_static", + ] + } + } +diff --git a/frameworks/huks_standard/main/core/src/hks_verifier.c b/frameworks/huks_standard/main/core/src/hks_verifier.c +index 149137d..a65f27e 100755 +--- a/frameworks/huks_standard/main/core/src/hks_verifier.c ++++ b/frameworks/huks_standard/main/core/src/hks_verifier.c +@@ -250,8 +250,9 @@ static int32_t ExtractTlvLength(const uint8_t *in, uint32_t inLen, uint32_t *hea + uint8_t *buf = (uint8_t *)in; + uint32_t length = 0; /* length of the payload */ + +- uint32_t tmp; +- HKS_ASN1_DECODE_BYTE(buf, tmp); /* get type */ ++// uint32_t tmp; ++// HKS_ASN1_DECODE_BYTE(buf, tmp); /* get type */ ++ buf++; + if (buf[0] < ASN_1_MIN_VAL_1_EXTRA_LEN_BYTE) { + /* Current byte tells the length */ + HKS_ASN1_DECODE_BYTE(buf, length); +@@ -301,8 +302,9 @@ static int32_t ExtractTlvData(const uint8_t *in, uint32_t inLen, uint8_t *out, u + uint8_t *buf = (uint8_t *)in; + uint32_t length = 0; /* length of the payload */ + +- uint32_t tmp; +- HKS_ASN1_DECODE_BYTE(buf, tmp); /* get type */ ++// uint32_t tmp; ++// HKS_ASN1_DECODE_BYTE(buf, tmp); /* get type */ ++ buf++; + if (buf[0] < ASN_1_MIN_VAL_1_EXTRA_LEN_BYTE) { + /* Current byte tells the length */ + HKS_ASN1_DECODE_BYTE(buf, length); +diff --git a/frameworks/huks_standard/main/crypto_engine/openssl/src/hks_openssl_kdf.c b/frameworks/huks_standard/main/crypto_engine/openssl/src/hks_openssl_kdf.c +index 258b206..5db3e4d 100755 +--- a/frameworks/huks_standard/main/crypto_engine/openssl/src/hks_openssl_kdf.c ++++ b/frameworks/huks_standard/main/crypto_engine/openssl/src/hks_openssl_kdf.c +@@ -57,6 +57,7 @@ int32_t HksOpensslHkdf(const struct HksBlob *mainKey, const struct HksKeySpec *d + EVP_PKEY_CTX *pctx; + pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL); + int32_t ret = HKS_FAILURE; ++ + do { + if (EVP_PKEY_derive_init(pctx) <= 0) { + HksLogOpensslError(); +@@ -78,7 +79,8 @@ int32_t HksOpensslHkdf(const struct HksBlob *mainKey, const struct HksKeySpec *d + HksLogOpensslError(); + break; + } +- if (EVP_PKEY_derive(pctx, derivedKey->data, (size_t *)&derivedKey->size) <= 0) { ++ size_t new = derivedKey->size; ++ if (EVP_PKEY_derive(pctx, derivedKey->data, &new)) { + HksLogOpensslError(); + break; + } +diff --git a/frameworks/huks_standard/main/os_dependency/BUILD.gn b/frameworks/huks_standard/main/os_dependency/BUILD.gn +index 7d03e55..6da94a5 100755 +--- a/frameworks/huks_standard/main/os_dependency/BUILD.gn ++++ b/frameworks/huks_standard/main/os_dependency/BUILD.gn +@@ -26,6 +26,8 @@ ohos_static_library("libhuks_os_dependency_standard_static") { + public_configs = [ ":huks_config" ] + include_dirs = [ + "log", ++ "sysinfo/include", ++ "../../../../services/huks_standard/huks_service/main/core/include/", + "//utils/native/base/include", + "//utils/system/safwk/native/include", + ] +@@ -35,17 +37,20 @@ ohos_static_library("libhuks_os_dependency_standard_static") { + "_HUKS_LOG_ENABLE_", + ] + sources = [ +- "./ipc/src/hks_client_service_ipc.c", +- "./ipc/src/hks_ipc_check.c", +- "./ipc/src/hks_ipc_serialization.c", +- "./ipc/src/hks_ipc_slice.c", +- "./ipc/src/hks_request.cpp", ++# "./ipc/src/hks_client_service_ipc.c", ++# "./ipc/src/hks_ipc_check.c", ++# "./ipc/src/hks_ipc_serialization.c", ++# "./ipc/src/hks_ipc_slice.c", ++# "./ipc/src/hks_request.cpp", ++ "./ipc/src/hks_client_service_passthrough.c", ++ "./sysinfo/src/hks_get_process_info_passthrough.c", + "./log/hks_log.c", + "./posix/hks_mem.c", + ] + deps = [ + "//base/security/huks/frameworks/huks_standard/main/common:libhuks_common_standard_static", + "//utils/native/base:utils", ++ "//third_party/bounds_checking_function:libsec_shared", + ] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", +diff --git a/frameworks/huks_standard/main/os_dependency/log/hks_log.c b/frameworks/huks_standard/main/os_dependency/log/hks_log.c +index ef7d264..5beadab 100755 +--- a/frameworks/huks_standard/main/os_dependency/log/hks_log.c ++++ b/frameworks/huks_standard/main/os_dependency/log/hks_log.c +@@ -22,8 +22,8 @@ + + #undef LOG_DOMAIN + #undef LOG_TAG +-static const unsigned int LOG_DOMAIN = 0xD002F01; +-static const char* LOG_TAG = "HUKS"; ++//static const unsigned int LOG_DOMAIN = 0xD002F01; ++//static const char* LOG_TAG = "HUKS"; + + #define MAX_LOG_BUFF_LEN 512 + +@@ -48,16 +48,16 @@ void HksLog(uint32_t logLevel, const char *funcName, uint32_t lineNo, const char + + switch (logLevel) { + case HKS_LOG_LEVEL_I: +- HILOG_INFO(LOG_CORE, "%{public}s[%{public}u]: %{public}s\n", funcName, lineNo, buf); ++ HILOG_INFO(LOG_CORE, "%s[%u]: %s\n", funcName, lineNo, buf); + break; + case HKS_LOG_LEVEL_E: +- HILOG_ERROR(LOG_CORE, "%{public}s[%{public}u]: %{public}s\n", funcName, lineNo, buf); ++ HILOG_ERROR(LOG_CORE, "%s[%u]: %s\n", funcName, lineNo, buf); + break; + case HKS_LOG_LEVEL_W: +- HILOG_WARN(LOG_CORE, "%{public}s[%{public}u]: %{public}s\n", funcName, lineNo, buf); ++ HILOG_WARN(LOG_CORE, "%s[%u]: %s\n", funcName, lineNo, buf); + break; + case HKS_LOG_LEVEL_D: +- HILOG_DEBUG(LOG_CORE, "%{public}s[%{public}u]: %{private}s\n", funcName, lineNo, buf); ++ HILOG_DEBUG(LOG_CORE, "%s[%u]: %s\n", funcName, lineNo, buf); + break; + default: + HKS_FREE_PTR(buf); +@@ -65,4 +65,4 @@ void HksLog(uint32_t logLevel, const char *funcName, uint32_t lineNo, const char + } + + HKS_FREE_PTR(buf); +-} +\ No newline at end of file ++} +diff --git a/interfaces/innerkits/huks_standard/main/BUILD.gn b/interfaces/innerkits/huks_standard/main/BUILD.gn +index 1ca1e02..88e620d 100755 +--- a/interfaces/innerkits/huks_standard/main/BUILD.gn ++++ b/interfaces/innerkits/huks_standard/main/BUILD.gn +@@ -41,6 +41,7 @@ if (os_level == "standard") { + deps = [ + "//base/security/huks/frameworks/huks_standard/main:huks_standard_frameworks", + "//base/security/huks/utils/crypto_adapter:libhuks_utils_client_service_adapter_static", ++ "//base/security/huks/services/huks_standard/huks_engine/main/core:huks_engine_core_standard", + ] + } + } +diff --git a/services/huks_standard/huks_service/main/os_dependency/BUILD.gn b/services/huks_standard/huks_service/main/os_dependency/BUILD.gn +index 931d20c..01078b7 100755 +--- a/services/huks_standard/huks_service/main/os_dependency/BUILD.gn ++++ b/services/huks_standard/huks_service/main/os_dependency/BUILD.gn +@@ -34,7 +34,7 @@ ohos_static_library("libhuks_service_os_dependency_standard_static") { + ] + sources = [ + "posix/hks_rwlock.c", +- "sa/hks_sa.cpp", ++# "sa/hks_sa.cpp", + ] + deps = [ + "//base/security/huks/frameworks/huks_standard/main/common:libhuks_common_standard_static", +diff --git a/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn b/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn +index e86a491..3ffcfa1 100755 +--- a/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn ++++ b/services/huks_standard/huks_service/main/os_dependency/idl/BUILD.gn +@@ -32,9 +32,9 @@ ohos_static_library("libhuks_service_idl_standard_static") { + "_HUKS_LOG_ENABLE_", + ] + sources = [ +- "ipc/hks_ipc_serialization.c", +- "ipc/hks_ipc_service.c", +- "ipc/hks_response.cpp", ++# "ipc/hks_ipc_serialization.c", ++# "ipc/hks_ipc_service.c", ++# "ipc/hks_response.cpp", + "passthrough/huks_access.c", + "passthrough/huks_core_dynamic_hal.c", + ] +diff --git a/utils/file_operator/hks_file_operator.c b/utils/file_operator/hks_file_operator.c +index 5543c38..5c2e704 100755 +--- a/utils/file_operator/hks_file_operator.c ++++ b/utils/file_operator/hks_file_operator.c +@@ -93,7 +93,7 @@ static uint32_t FileRead(const char *fileName, uint32_t offset, uint8_t *buf, ui + } + + char filePath[PATH_MAX + 1] = {0}; +- (void)realpath(fileName, filePath); ++ char *path __attribute__((unused)) = realpath(fileName, filePath); + if (strstr(filePath, "../") != NULL) { + HKS_LOG_E("invalid filePath, path %s", filePath); + return 0; +@@ -137,7 +137,7 @@ static int32_t FileWrite(const char *fileName, uint32_t offset, const uint8_t *b + if (memcpy_s(filePath, sizeof(filePath) - 1, fileName, strlen(fileName)) != EOK) { + return HKS_ERROR_BAD_STATE; + } +- (void)realpath(fileName, filePath); ++ char *path __attribute__((unused)) = realpath(fileName, filePath); + if (strstr(filePath, "../") != NULL) { + HKS_LOG_E("invalid filePath, path %s", filePath); + return HKS_ERROR_INVALID_KEY_FILE; +@@ -519,4 +519,4 @@ uint32_t HksFileSize(const char *path, const char *fileName) + int32_t HksGetFileName(const char *path, const char *fileName, char *fullFileName, uint32_t fullFileNameLen) + { + return GetFileName(path, fileName, fullFileName, fullFileNameLen); +-} +\ No newline at end of file ++} +-- +2.25.1 + diff --git a/dsoftbus/hichain/huks/security_huks-OpenHarmony-v3.1.2-Release.zip b/dsoftbus/hichain/huks/security_huks-OpenHarmony-v3.1.2-Release.zip new file mode 100644 index 0000000000000000000000000000000000000000..28c08b993cceea355b928796df9ca58ae4af20ba Binary files /dev/null and b/dsoftbus/hichain/huks/security_huks-OpenHarmony-v3.1.2-Release.zip differ diff --git a/dsoftbus/productdefine/common/products/openEuler.json b/dsoftbus/productdefine/common/products/openEuler.json index 81a6adcaac86547c1774a6baac7611840698dbb2..1f5f2892cfdb9b38077a0e93dd43d2549f87cb07 100755 --- a/dsoftbus/productdefine/common/products/openEuler.json +++ b/dsoftbus/productdefine/common/products/openEuler.json @@ -7,14 +7,17 @@ "product_build_path": "device/hisilicon/build", "parts": { "communication:dsoftbus_standard": {}, + "security:huks_standard": {}, + "security:deviceauth_standard": {}, "depend:hiviewdfx_hilog_native": {}, "depend:ipc": {}, "depend:ces_standard": {}, "depend:aafwk_standard": {}, "depend:appexecfwk_standard": {}, - "depend:deviceauth_standard": {}, "depend:permission_standard": {}, "depend:safwk": {}, - "depend:samgr_L2": {} + "depend:samgr_L2": {}, + "depend:samgr_standard": {}, + "depend:access_token": {} } } diff --git a/dsoftbus/third_party/openssl/0001-support-openssl-for-dsoftbus.patch b/dsoftbus/third_party/openssl/0001-support-openssl-for-dsoftbus.patch new file mode 100644 index 0000000000000000000000000000000000000000..511fc0e914b81a226735a3a062388a31cff2e3e3 --- /dev/null +++ b/dsoftbus/third_party/openssl/0001-support-openssl-for-dsoftbus.patch @@ -0,0 +1,25 @@ +From 16abd091ca7f91859ae7615f679321fc5a1c863b Mon Sep 17 00:00:00 2001 +From: "beiling.xie" +Date: Fri, 2 Sep 2022 22:33:05 +0800 +Subject: [PATCH] support openssl for dsoftbus + +Signed-off-by: beiling.xie +--- + BUILD.gn | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/BUILD.gn b/BUILD.gn +index 68c53958c..8d9812046 100644 +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -31,7 +31,6 @@ config("crypto_config") { + "-pthread", + "-fPIC", + "-Wa,--noexecstack", +- "-Qunused-arguments", + "-O3", + "-DOPENSSL_USE_NODELETE", + "-DOPENSSL_PIC", +-- +2.25.1 + diff --git a/dsoftbus/third_party/openssl/third_party_openssl-OpenHarmony-v3.1.2-Release.zip b/dsoftbus/third_party/openssl/third_party_openssl-OpenHarmony-v3.1.2-Release.zip new file mode 100644 index 0000000000000000000000000000000000000000..334962af4d9203afcd6af8a66a65f6f05f83af2b Binary files /dev/null and b/dsoftbus/third_party/openssl/third_party_openssl-OpenHarmony-v3.1.2-Release.zip differ