!2914 内源问题整改上库

Merge pull request !2914 from 胡吉翔/security_20220328_1

security/huks_standard/hks_xts_common.test.js

@@ -15,8 +15,8 @@
 
 import hks from '@ohos.security.huks'
 
-export var alias = 'alias';
-export var aliasA = 'aliasA';
+export const alias = 'alias';
+export const aliasA = 'aliasA';
 export var aliasB = 'aliasB';
 export var targetAlias = 'targetAlias';
 

security_lite/huks/liteos_a_adapter/hks_agreement_test.cpp

@@ -154,7 +154,6 @@ HWTEST_F(HksAgreementTest, HksAgreementTest002, TestSize.Level1)
     struct HksBlob *peerPubKeyAlias = NULL;
     struct HksBlob *peerPublicKey = NULL;
     struct HksBlob *privateKey2 = NULL;
-    struct HksBlob *peerPubKeyAlias2 = NULL;
     struct HksBlob *peerPublicKey2 = NULL;
     int32_t ret;
 

security_lite/huks/liteos_m_adapter/hks_safe_cipher_key_test.c

@@ -100,7 +100,7 @@ static int32_t GetKeyOffsetByKeyAlias(const struct HksBlob *keyAlias, uint32_t *
 
     /* 2. traverse imageBuffer to search for keyAlias */
     uint32_t offset = sizeof(*keyInfoHead);
-    for (uint16_t i = 0; i < keyCount; ++i) {
+    for (uint32_t i = 0; i < keyCount; ++i) {
         uint8_t *tmpBuf = storageBuf.data + offset;
         struct HksStoreKeyInfo *keyInfo = (struct HksStoreKeyInfo *)tmpBuf;
         if (keyInfo->aliasSize == keyAlias->size) {

security_lite/huks/liteos_m_adapter/hks_safe_compare_key_test.c

@@ -164,7 +164,7 @@ static int32_t GetKeyOffsetByKeyAlias(const struct HksBlob *keyAlias, uint32_t *
 
     /* 2. traverse imageBuffer to search for keyAlias */
     uint32_t offset = sizeof(*keyInfoHead);
-    for (uint16_t i = 0; i < keyCount; ++i) {
+    for (uint32_t i = 0; i < keyCount; ++i) {
         uint8_t *tmpBuf = storageBuf.data + offset;
         struct HksStoreKeyInfo *keyInfo = (struct HksStoreKeyInfo *)tmpBuf;
         if (keyInfo->aliasSize == keyAlias->size) {