!6191 【OpenHarmony 3.2.8.1】【安全子系统】【OpenHarmony-3.2-Beta3】huks编译问题修改

Merge pull request !6191 from qiaozzzh/1027_2

security_lite/huks/liteos_m_adapter/hks_derive_test.c

@@ -182,7 +182,7 @@ static int32_t BaseTestDerive(uint32_t index)
         ret = GenerateLocalRandomKey(&keyAlias, &g_testDeriveParams[index].localKeyParams);
     } else {
         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);
         } else {
             ret = TestConstuctBlob(&keyAlias,

security_lite/huks/liteos_m_adapter/hks_mac_test.c

@@ -169,7 +169,7 @@ static int32_t BaseTestMac(uint32_t index)
             g_testMacParams[index].keyParams.blobDataSize);
     } else {
         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);
         } else {
             ret = TestConstuctBlob(&key,

security_lite/huks/liteos_m_adapter/hks_modify_key_test.c

@@ -293,7 +293,7 @@ int32_t BaseTestCipherProcess(const struct HksBlob *keyAlias, uint32_t index)
         }
         /* 3. decrypt */
         struct CipherDecryptStructure testDecryptStruct = {
-            keyAlias, &g_testCipherParams[index], cipherData,
+            (struct HksBlob *)(keyAlias), &g_testCipherParams[index], cipherData,
             &decryptedData, ivData, nonceData, aadData, 1
         };
         ret = DecryptCipher(&testDecryptStruct);
@@ -332,6 +332,7 @@ int32_t __attribute__((weak)) HksStoreKeyBlob(const struct HksBlob *processName,
     (void)keyAlias;
     (void)storageType;
     (void)keyBlob;
+    return HKS_SUCCESS;
 }
 
 static void ExecHksModifyKeyTest001(void const *argument)