!5889 【OpenHarmony 3.2.7.5】【安全子系统】【OpenHarmony-3.2-Beta3】huks代码维护

Merge pull request !5889 from qiaozzzh/1013_2

security_lite/huks/common/hks_test_file_operator.c

@@ -104,7 +104,6 @@ static uint32_t FileRead(const char *fileName, uint32_t offset, uint8_t *buf, ui
     }
 
     char filePath[PATH_MAX + 1] = {0};
-    (void)realpath(fileName, filePath);
     if (strstr(filePath, "../") != NULL) {
         HKS_TEST_LOG_E("invalid filePath, path %s", filePath);
         return 0;
@@ -148,7 +147,6 @@ 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);
     if (strstr(filePath, "../") != NULL) {
         HKS_TEST_LOG_E("invalid filePath, path %s", filePath);
         return HKS_ERROR_INVALID_KEY_FILE;
@@ -182,22 +180,6 @@ static int32_t FileWrite(const char *fileName, uint32_t offset, const uint8_t *b
     return HKS_SUCCESS;
 }
 
-int32_t HksIsFileExist(const char *path, const char *fileName)
-{
-    if (fileName == NULL) {
-        return HKS_ERROR_NULL_POINTER;
-    }
-
-    char *fullFileName = NULL;
-    int32_t ret = GetFullFileName(path, fileName, &fullFileName);
-    if (ret != HKS_SUCCESS) {
-        return ret;
-    }
-
-    ret = IsFileExist(fullFileName);
-    HksTestFree(fullFileName);
-    return ret;
-}
 #else
 static uint32_t FileRead(const char *fileName, uint32_t offset, uint8_t *buf, uint32_t len)
 {

security_lite/huks/liteos_m_adapter/hks_aes_test.c

@@ -14,7 +14,7 @@
  */
 
 #include "hctest.h"
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "securec.h"
@@ -48,7 +48,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksAesTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -72,7 +71,6 @@ static BOOL HksAesTestSetUp()
 static BOOL HksAesTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_agreement_test.c

@@ -14,7 +14,7 @@
  */
 
 #include "hctest.h"
-#include "iot_watchdog.h"
+
 #include "hks_agreement_test.h"
 #include "hks_api.h"
 #include "hks_param.h"
@@ -57,7 +57,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksAgreementTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -81,8 +80,6 @@ static BOOL HksAgreementTestSetUp()
 static BOOL HksAgreementTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_bn_exp_mod_test.c

@@ -14,7 +14,7 @@
  */
 
 #include "hctest.h"
-#include "iot_watchdog.h"
+
 #include "hks_bn_exp_mod_test.h"
 #include "hks_api.h"
 #include "hks_param.h"
@@ -52,7 +52,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksBnExpModTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -76,7 +75,6 @@ static BOOL HksBnExpModTestSetUp()
 static BOOL HksBnExpModTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_cipher_test.c

@@ -16,7 +16,7 @@
 #include "hks_cipher_test.h"
 
 #include "hctest.h"
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_cipher.h"
@@ -57,7 +57,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksCipherTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -81,7 +80,6 @@ static BOOL HksCipherTestSetUp()
 static BOOL HksCipherTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_curve25519_test.c

@@ -19,7 +19,7 @@
 
 #include "cmsis_os2.h"
 #include "hctest.h"
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_curve25519.h"
@@ -56,7 +56,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksCurve25519TestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -80,7 +79,6 @@ static BOOL HksCurve25519TestSetUp()
 static BOOL HksCurve25519TestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_delete_test.c

@@ -16,7 +16,7 @@
 #ifndef _CUT_AUTHENTICATE_
 
 #include "hctest.h"
-#include "iot_watchdog.h"
+
 #include "hks_delete_test.h"
 #include "hks_api.h"
 #include "hks_param.h"
@@ -82,7 +82,6 @@ static void ExecHksDeleteTest001(void const *argument)
 static BOOL HksDeleteTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -106,7 +105,6 @@ static BOOL HksDeleteTestSetUp()
 static BOOL HksDeleteTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_derive_test.c

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "iot_watchdog.h"
+
 #include <hctest.h>
 
 #include "hks_derive_test.h"
@@ -56,7 +56,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksDeriveTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -80,7 +79,6 @@ static BOOL HksDeriveTestSetUp()
 static BOOL HksDeriveTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_exist_test.c

@@ -16,7 +16,7 @@
 #ifndef _CUT_AUTHENTICATE_
 
 #include "hctest.h"
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_exist_test.h"
 #include "hks_param.h"
@@ -91,7 +91,6 @@ static void ExecHksExistTest001(void const *argument)
 static BOOL HksExistTestSetUp(void)
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -118,7 +117,6 @@ static BOOL HksExistTestSetUp(void)
 static BOOL HksExistTestTearDown(void)
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_generate_key_test.c

@@ -18,7 +18,7 @@
 #include "hks_generate_key_test.h"
 
 #include <hctest.h>
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -56,7 +56,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksGenerateKeyTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -80,7 +79,6 @@ static BOOL HksGenerateKeyTestSetUp()
 static BOOL HksGenerateKeyTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_generate_random_test.c

@@ -15,7 +15,7 @@
 
 #include "hks_generate_random_test.h"
 #include "hctest.h"
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -54,7 +54,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksGenerateRandomTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -78,7 +77,6 @@ static BOOL HksGenerateRandomTestSetUp()
 static BOOL HksGenerateRandomTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_hash_test.c

@@ -16,7 +16,7 @@
 #ifndef _CUT_AUTHENTICATE_
 
 #include <hctest.h>
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -58,7 +58,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksHashTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -82,7 +81,6 @@ static BOOL HksHashTestSetUp()
 static BOOL HksHashTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_mac_test.c

@@ -16,7 +16,7 @@
 #include "hks_mac_test.h"
 
 #include <hctest.h>
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -79,7 +79,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksMacTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -103,7 +102,6 @@ static BOOL HksMacTestSetUp()
 static BOOL HksMacTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_modify_key_test.c

@@ -18,7 +18,7 @@
 #include "hks_modify_key_test.h"
 
 #include <hctest.h>
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -107,7 +107,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksModifyKeyTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -136,7 +135,6 @@ static BOOL HksModifyKeyTestTearDown()
 {
     LiteTestPrint("tearDown\n");
     HksTestRemoveFile();
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_others_test.c

@@ -18,7 +18,7 @@
 #include "hks_others_test.h"
 
 #include <hctest.h>
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_type.h"
@@ -53,7 +53,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksOthersTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -77,7 +76,6 @@ static BOOL HksOthersTestSetUp()
 static BOOL HksOthersTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_safe_cipher_key_test.c

@@ -19,7 +19,7 @@
 #include "hks_safe_cipher_key_test.h"
 
 #include <hctest.h>
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_curve25519.h"
@@ -58,7 +58,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksSafeCipherKeyTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -83,7 +82,6 @@ static BOOL HksSafeCipherKeyTestSetUp()
 static BOOL HksSafeCipherKeyTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_safe_compare_key_test.c

@@ -18,7 +18,7 @@
 #include "hks_safe_compare_key_test.h"
 
 #include <hctest.h>
-#include "iot_watchdog.h"
+
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -62,7 +62,6 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksSafeCompareKeyTestSetUp()
 {
     LiteTestPrint("setup\n");
-    IoTWatchDogDisable();    
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -86,7 +85,6 @@ static BOOL HksSafeCompareKeyTestSetUp()
 static BOOL HksSafeCompareKeyTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    IoTWatchDogEnable();
     return TRUE;
 }