提交 381a041d 编写于 作者: Q qiaozzzh

编译问题修改

Signed-off-by: Nqiaozzzh <qiaozhang@huawei.com>
上级 65ef5f64
...@@ -182,7 +182,7 @@ static int32_t BaseTestDerive(uint32_t index) ...@@ -182,7 +182,7 @@ static int32_t BaseTestDerive(uint32_t index)
ret = GenerateLocalRandomKey(&keyAlias, &g_testDeriveParams[index].localKeyParams); ret = GenerateLocalRandomKey(&keyAlias, &g_testDeriveParams[index].localKeyParams);
} else { } else {
if (g_testDeriveParams[index].keyAliasParams.blobExist) { if (g_testDeriveParams[index].keyAliasParams.blobExist) {
ret = GenerateKey(&keyAlias, &g_testDeriveParams[index].keyAliasParams, ret = HuksGenerateKey(&keyAlias, &g_testDeriveParams[index].keyAliasParams,
&g_testDeriveParams[index].genKeyParamSetParams, NULL); &g_testDeriveParams[index].genKeyParamSetParams, NULL);
} else { } else {
ret = TestConstuctBlob(&keyAlias, ret = TestConstuctBlob(&keyAlias,
......
...@@ -169,7 +169,7 @@ static int32_t BaseTestMac(uint32_t index) ...@@ -169,7 +169,7 @@ static int32_t BaseTestMac(uint32_t index)
g_testMacParams[index].keyParams.blobDataSize); g_testMacParams[index].keyParams.blobDataSize);
} else { } else {
if (g_testMacParams[index].keyAliasParams.blobExist) { if (g_testMacParams[index].keyAliasParams.blobExist) {
ret = GenerateKey(&key, &(g_testMacParams[index].keyAliasParams), ret = HuksGenerateKey(&key, &(g_testMacParams[index].keyAliasParams),
&g_testMacParams[index].genKeyParamSetParams, NULL); &g_testMacParams[index].genKeyParamSetParams, NULL);
} else { } else {
ret = TestConstuctBlob(&key, ret = TestConstuctBlob(&key,
......
...@@ -293,7 +293,7 @@ int32_t BaseTestCipherProcess(const struct HksBlob *keyAlias, uint32_t index) ...@@ -293,7 +293,7 @@ int32_t BaseTestCipherProcess(const struct HksBlob *keyAlias, uint32_t index)
} }
/* 3. decrypt */ /* 3. decrypt */
struct CipherDecryptStructure testDecryptStruct = { struct CipherDecryptStructure testDecryptStruct = {
keyAlias, &g_testCipherParams[index], cipherData, (struct HksBlob *)(keyAlias), &g_testCipherParams[index], cipherData,
&decryptedData, ivData, nonceData, aadData, 1 &decryptedData, ivData, nonceData, aadData, 1
}; };
ret = DecryptCipher(&testDecryptStruct); ret = DecryptCipher(&testDecryptStruct);
...@@ -332,7 +332,7 @@ int32_t __attribute__((weak)) HksStoreKeyBlob(const struct HksBlob *processName, ...@@ -332,7 +332,7 @@ int32_t __attribute__((weak)) HksStoreKeyBlob(const struct HksBlob *processName,
(void)keyAlias; (void)keyAlias;
(void)storageType; (void)storageType;
(void)keyBlob; (void)keyBlob;
} return HKS_SUCCESS;
static void ExecHksModifyKeyTest001(void const *argument) static void ExecHksModifyKeyTest001(void const *argument)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册