!1325 [testcasesfix]fix the bug of huks testcase

Merge pull request !1325 from aaronwangjun/dev3

security_lite/huks/liteos_m_adapter/BUILD.gn

@@ -38,6 +38,7 @@ hctest_suite("ActsHuksHalFunctionTest") {
   ]
   include_dirs = [
     "//base/security/huks/interfaces/innerkits/huks_standard/main/include",
+    "//base/iot_hardware/peripheral/interfaces/kits",
     "../common/include",
   ]
 

security_lite/huks/liteos_m_adapter/hks_aes_test.c

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

security_lite/huks/liteos_m_adapter/hks_agreement_test.c

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

security_lite/huks/liteos_m_adapter/hks_bn_exp_mod_test.c

@@ -14,7 +14,7 @@
  */
 
 #include "hctest.h"
-#include "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_bn_exp_mod_test.h"
 #include "hks_api.h"
 #include "hks_param.h"
@@ -52,7 +52,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksBnExpModTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -76,7 +76,7 @@ static BOOL HksBnExpModTestSetUp()
 static BOOL HksBnExpModTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    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 "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_cipher.h"
@@ -57,7 +57,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksCipherTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -81,7 +81,7 @@ static BOOL HksCipherTestSetUp()
 static BOOL HksCipherTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    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 "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_curve25519.h"
@@ -56,7 +56,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksCurve25519TestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -80,7 +80,7 @@ static BOOL HksCurve25519TestSetUp()
 static BOOL HksCurve25519TestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_delete_test.c

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

security_lite/huks/liteos_m_adapter/hks_derive_test.c

@@ -12,7 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "hi_watchdog.h"
+
+#include "iot_watchdog.h"
 #include <hctest.h>
 
 #include "hks_derive_test.h"
@@ -55,7 +56,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksDeriveTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -79,7 +80,7 @@ static BOOL HksDeriveTestSetUp()
 static BOOL HksDeriveTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_exist_test.c

@@ -16,7 +16,7 @@
 #ifndef _CUT_AUTHENTICATE_
 
 #include "hctest.h"
-#include "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_exist_test.h"
 #include "hks_param.h"
@@ -89,7 +89,7 @@ static void ExecHksExistTest001(void const *argument)
 static BOOL HksExistTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -113,7 +113,7 @@ static BOOL HksExistTestSetUp()
 static BOOL HksExistTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    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 "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -56,7 +56,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksGenerateKeyTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -80,7 +80,7 @@ static BOOL HksGenerateKeyTestSetUp()
 static BOOL HksGenerateKeyTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    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 "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -54,7 +54,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksGenerateRandomTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -78,7 +78,7 @@ static BOOL HksGenerateRandomTestSetUp()
 static BOOL HksGenerateRandomTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    IoTWatchDogEnable();
     return TRUE;
 }
 

security_lite/huks/liteos_m_adapter/hks_hash_test.c

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

security_lite/huks/liteos_m_adapter/hks_modify_key_test.c

@@ -15,11 +15,10 @@
 
 #ifndef _CUT_AUTHENTICATE_
 
-
 #include "hks_modify_key_test.h"
 
 #include <hctest.h>
-#include "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -108,7 +107,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksModifyKeyTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -137,7 +136,7 @@ static BOOL HksModifyKeyTestTearDown()
 {
     LiteTestPrint("tearDown\n");
     HksTestRemoveFile();
-    hi_watchdog_enable();
+    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 "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_type.h"
@@ -53,7 +53,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksOthersTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -77,7 +77,7 @@ static BOOL HksOthersTestSetUp()
 static BOOL HksOthersTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    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 "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_curve25519.h"
@@ -58,7 +58,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksSafeCipherKeyTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();
+    IoTWatchDogDisable();
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -83,7 +83,7 @@ static BOOL HksSafeCipherKeyTestSetUp()
 static BOOL HksSafeCipherKeyTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    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 "hi_watchdog.h"
+#include "iot_watchdog.h"
 #include "hks_api.h"
 #include "hks_param.h"
 #include "hks_test_api_performance.h"
@@ -62,7 +62,7 @@ static void ExecHksInitialize(void const *argument)
 static BOOL HksSafeCompareKeyTestSetUp()
 {
     LiteTestPrint("setup\n");
-    hi_watchdog_disable();    
+    IoTWatchDogDisable();    
     osThreadId_t id;
     osThreadAttr_t attr;
     g_setPriority = osPriorityAboveNormal6;
@@ -86,7 +86,7 @@ static BOOL HksSafeCompareKeyTestSetUp()
 static BOOL HksSafeCompareKeyTestTearDown()
 {
     LiteTestPrint("tearDown\n");
-    hi_watchdog_enable();
+    IoTWatchDogEnable();
     return TRUE;
 }