openharmony/security_asset
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_asset synced 2024-11-27 10:00:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify use huks interface

Browse Source 
Signed-off-by: 尹耀德 <yinyaode1@huawei.com>
Change-Id: I913283459340ffc99b86f2dbbac156072893a132
This commit is contained in:
尹耀德 2024-04-03 14:20:04 +08:00
parent 12a36827e7
commit f4f26e917b
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
services/crypto_manager/src/huks_wrapper.c
View File

@ -52,7 +52,16 @@ static int32_t HuksErrorTransfer(int32_t ret)
}
}
static int32_t BuildParamSet(struct HksParamSet **paramSet, const struct HksParam *params, uint32_t paramCount)
static int32_t AddAppointUserIdParams(struct HksParamSet *paramSet, int32_t userId)
{
struct HksParam appointUserIdParams[] = {
{ .tag = HKS_TAG_SPECIFIC_USER_ID, .int32Param = userId },
};
return HksAddParams(paramSet, appointUserIdParams, ARRAY_SIZE(appointUserIdParams));
}
static int32_t BuildParamSet(struct HksParamSet **paramSet, const struct HksParam *params, uint32_t paramCount,
int32_t userId)
{
int32_t ret = HksInitParamSet(paramSet);
if (ret != HKS_SUCCESS) {
@ -67,6 +76,15 @@ static int32_t BuildParamSet(struct HksParamSet **paramSet, const struct HksPara
HksFreeParamSet(paramSet);
return ret;
}
if (userId >= ASSET_ROOT_USER_UPPERBOUND) {
ret = AddAppointUserIdParams(*paramSet, userId);
if (ret != HKS_SUCCESS) {
LOGE("[FATAL]HUKS add specific userId failed. error=%{public}d", ret);
HksFreeParamSet(paramSet);
return ret;
}
}
}
ret = HksBuildParamSet(paramSet);
@ -86,7 +104,6 @@ static int32_t AddCommonGenParams(struct HksParamSet *paramSet, const struct Key
{ .tag = HKS_TAG_PADDING, .uint32Param = HKS_PADDING_NONE },
{ .tag = HKS_TAG_BLOCK_MODE, .uint32Param = HKS_MODE_GCM },
{ .tag = HKS_TAG_AUTH_STORAGE_LEVEL, .uint32Param = AccessibilityToHksAuthStorageLevel(keyId->accessibility) },
{ .tag = HKS_TAG_SPECIFIC_USER_ID, .int32Param = keyId->userId },
};
return HksAddParams(paramSet, commonParams, ARRAY_SIZE(commonParams));
}
@ -121,6 +138,14 @@ int32_t GenerateKey(const struct KeyId *keyId, bool needAuth, bool requirePasswo
break;
}
if (keyId->userId >= ASSET_ROOT_USER_UPPERBOUND) {
ret = AddAppointUserIdParams(paramSet, keyId->userId);
if (ret != HKS_SUCCESS) {
LOGE("[FATAL]HUKS add specific userId failed. error=%{public}d", ret);
break;
}
}
if (needAuth) {
ret = AddAuthGenParams(paramSet);
if (ret != HKS_SUCCESS) {
@ -158,10 +183,9 @@ int32_t DeleteKey(const struct KeyId *keyId)
{
struct HksParam params[] = {
{ .tag = HKS_TAG_AUTH_STORAGE_LEVEL, .uint32Param = AccessibilityToHksAuthStorageLevel(keyId->accessibility) },
{ .tag = HKS_TAG_SPECIFIC_USER_ID, .int32Param = keyId->userId },
};
struct HksParamSet *paramSet = NULL;
int32_t ret = BuildParamSet(&paramSet, params, ARRAY_SIZE(params));
int32_t ret = BuildParamSet(&paramSet, params, ARRAY_SIZE(params), keyId->userId);
if (ret != HKS_SUCCESS) {
return HuksErrorTransfer(ret);
}
@ -175,10 +199,9 @@ int32_t IsKeyExist(const struct KeyId *keyId)
{
struct HksParam params[] = {
{ .tag = HKS_TAG_AUTH_STORAGE_LEVEL, .uint32Param = AccessibilityToHksAuthStorageLevel(keyId->accessibility) },
{ .tag = HKS_TAG_SPECIFIC_USER_ID, .int32Param = keyId->userId },
};
struct HksParamSet *paramSet = NULL;
int32_t ret = BuildParamSet(&paramSet, params, ARRAY_SIZE(params));
int32_t ret = BuildParamSet(&paramSet, params, ARRAY_SIZE(params), keyId->userId);
if (ret != HKS_SUCCESS) {
return HuksErrorTransfer(ret);
}
@ -199,10 +222,9 @@ int32_t EncryptData(const struct KeyId *keyId, const struct HksBlob *aad, const
{ .tag = HKS_TAG_BLOCK_MODE, .uint32Param = HKS_MODE_GCM },
{ .tag = HKS_TAG_ASSOCIATED_DATA, .blob = *aad },
{ .tag = HKS_TAG_AUTH_STORAGE_LEVEL, .uint32Param = AccessibilityToHksAuthStorageLevel(keyId->accessibility) },
{ .tag = HKS_TAG_SPECIFIC_USER_ID, .int32Param = keyId->userId },
};
struct HksParamSet *encryptParamSet = NULL;
int32_t ret = BuildParamSet(&encryptParamSet, encryptParams, ARRAY_SIZE(encryptParams));
int32_t ret = BuildParamSet(&encryptParamSet, encryptParams, ARRAY_SIZE(encryptParams), keyId->userId);
if (ret != HKS_SUCCESS) {
return HuksErrorTransfer(ret);
}
@ -242,10 +264,9 @@ int32_t DecryptData(const struct KeyId *keyId, const struct HksBlob *aad, const
{ .tag = HKS_TAG_NONCE, .blob = nonce },
{ .tag = HKS_TAG_AE_TAG, .blob = tag },
{ .tag = HKS_TAG_AUTH_STORAGE_LEVEL, .uint32Param = AccessibilityToHksAuthStorageLevel(keyId->accessibility) },
{ .tag = HKS_TAG_SPECIFIC_USER_ID, .int32Param = keyId->userId },
};
int32_t ret = BuildParamSet(&decryptParamSet, decryptParams, ARRAY_SIZE(decryptParams));
int32_t ret = BuildParamSet(&decryptParamSet, decryptParams, ARRAY_SIZE(decryptParams), keyId->userId);
if (ret != HKS_SUCCESS) {
return HuksErrorTransfer(ret);
}
@ -276,10 +297,9 @@ int32_t InitKey(const struct KeyId *keyId, uint32_t validTime, struct HksBlob *c
{ .tag = HKS_TAG_IS_BATCH_OPERATION, .boolParam = true },
{ .tag = HKS_TAG_BATCH_OPERATION_TIMEOUT, .uint32Param = validTime },
{ .tag = HKS_TAG_AUTH_STORAGE_LEVEL, .uint32Param = AccessibilityToHksAuthStorageLevel(keyId->accessibility) },
{ .tag = HKS_TAG_SPECIFIC_USER_ID, .int32Param = keyId->userId },
};
struct HksParamSet *paramSet = NULL;
int32_t ret = BuildParamSet(&paramSet, initParams, ARRAY_SIZE(initParams));
int32_t ret = BuildParamSet(&paramSet, initParams, ARRAY_SIZE(initParams), keyId->userId);
if (ret != HKS_SUCCESS) {
return HuksErrorTransfer(ret);
}
@ -311,7 +331,7 @@ int32_t ExecCrypt(const struct HksBlob *handle, const struct HksBlob *aad, const
};
struct HksParamSet *paramSet = NULL;
int32_t ret = BuildParamSet(&paramSet, updateParams, ARRAY_SIZE(updateParams));
int32_t ret = BuildParamSet(&paramSet, updateParams, ARRAY_SIZE(updateParams), 0);
if (ret != HKS_SUCCESS) {
return HuksErrorTransfer(ret);
}
@ -331,7 +351,7 @@ int32_t Drop(const struct HksBlob *handle)
struct HksBlob outData = { 0, NULL };
struct HksParamSet *paramSet = NULL;
int32_t ret = BuildParamSet(&paramSet, NULL, 0);
int32_t ret = BuildParamSet(&paramSet, NULL, 0, 0);
if (ret != HKS_SUCCESS) {
return HuksErrorTransfer(ret);
}

1
services/crypto_manager/src/huks_wrapper.h
View File

@ -28,6 +28,7 @@ static const uint32_t TAG_SIZE = 16;
static const uint32_t NONCE_SIZE = 12;
#define ARRAY_SIZE(arr) ((sizeof(arr)) / (sizeof((arr)[0])))
#define ASSET_ROOT_USER_UPPERBOUND 100
enum Accessibility {
DEVICE_POWERED_ON = 0,