!9888 XTS新增HUKS对init finish阶段的长度和算法校验

Merge pull request !9888 from WXY123456/master

security/huks_napi_BasicTest/include/huks_agree_dh_test.h

@@ -65,7 +65,7 @@ static struct OH_Huks_Param g_agreeParams01Init001[] = {
         .uint32Param = OH_HUKS_KEY_PURPOSE_AGREE
     }, {
         .tag = OH_HUKS_TAG_KEY_SIZE,
-        .uint32Param = OH_HUKS_DH_KEY_SIZE_2048
+        .uint32Param = OH_HUKS_AES_KEY_SIZE_256
     }
 };
 static struct OH_Huks_Param g_agreeParams01Finish001[] = {
@@ -107,7 +107,7 @@ static struct OH_Huks_Param g_agreeParams02Init001[] = {
         .uint32Param = OH_HUKS_KEY_PURPOSE_AGREE
     }, {
         .tag = OH_HUKS_TAG_KEY_SIZE,
-        .uint32Param = OH_HUKS_DH_KEY_SIZE_2048
+        .uint32Param = OH_HUKS_AES_KEY_SIZE_256
     }
 };
 static struct OH_Huks_Param g_agreeParams02Finish001[] = {

security/huks_napi_BasicTest/src/huks_derive_hkdf_test.cpp

@@ -89,10 +89,10 @@ static struct OH_Huks_Param g_hkdfFinishParams001[] = {
         }
     }, {
         .tag =  OH_HUKS_TAG_ALGORITHM,
-        .uint32Param = OH_HUKS_ALG_HKDF
+        .uint32Param = OH_HUKS_ALG_AES
     }, {
         .tag =  OH_HUKS_TAG_KEY_SIZE,
-        .uint32Param = DERIVE_KEY_SIZE_32
+        .uint32Param = 256
     }, {
         .tag =  OH_HUKS_TAG_PURPOSE,
         .uint32Param = OH_HUKS_KEY_PURPOSE_DERIVE

security/huks_napi_BasicTest/src/huks_derive_pbkdf_test.cpp

@@ -118,7 +118,7 @@ static struct OH_Huks_Param g_pbkdf2FinishParams001[] = {
         .uint32Param = OH_HUKS_ALG_AES
     }, {
         .tag = OH_HUKS_TAG_KEY_SIZE,
-        .uint32Param = DERIVE_KEY_SIZE_32
+        .uint32Param = 256
     }, {
         .tag = OH_HUKS_TAG_PURPOSE,
         .uint32Param = OH_HUKS_KEY_PURPOSE_DERIVE

security/security_huks_basic/utils/param/agree/publicAgreeCallback.js

@@ -234,7 +234,10 @@ async function publicAgreeFunc(
       HuksOptions.properties.splice(5, 1);
     }
 
-    await publicAgreeInitFunc(srcKeyAliesFrist, HuksOptions);
+    let HuksOptionsInit = JSON.parse(JSON.stringify(HuksOptions));
+    HuksOptionsInit.properties.splice(2,1,HuksOptionsFinish.properties[3])
+
+    await publicAgreeInitFunc(srcKeyAliesFrist, HuksOptionsInit);
     await publicAgreeUpdateFunc(HuksOptions, 1);
     await publicAgreeFinishAbortFunc(HuksOptionsFinish, thirdInderfaceName);
 
@@ -245,7 +248,7 @@ async function publicAgreeFunc(
       value: stringToUint8Array(srcKeyAliesSecond + 'final'),
     });
 
-    await publicAgreeInitFunc(srcKeyAliesSecond, HuksOptions);
+    await publicAgreeInitFunc(srcKeyAliesSecond, HuksOptionsInit);
     await publicAgreeUpdateFunc(HuksOptions, 2);
     await publicAgreeFinishAbortFunc(HuksOptionsFinishSecond, thirdInderfaceName);
 

security/security_huks_basic/utils/param/agree/publicAgreePromise.js

@@ -148,7 +148,10 @@ async function publicAgreeFunc(
       HuksOptions.properties.splice(5, 1);
     }
 
-    await publicAgreeInitFunc(srcKeyAliesFrist, HuksOptions);
+    let HuksOptionsInit = JSON.parse(JSON.stringify(HuksOptions));
+    HuksOptionsInit.properties.splice(2,1,HuksOptionsFinish.properties[3])
+
+    await publicAgreeInitFunc(srcKeyAliesFrist, HuksOptionsInit);
     await publicAgreeUpdateFunc(HuksOptions, 1);
     await publicAgreeFinishAbortFunc(HuksOptionsFinish, thirdInderfaceName);
 
@@ -159,7 +162,7 @@ async function publicAgreeFunc(
       value: stringToUint8Array(srcKeyAliesSecond + 'final'),
     });
 
-    await publicAgreeInitFunc(srcKeyAliesSecond, HuksOptions);
+    await publicAgreeInitFunc(srcKeyAliesSecond, HuksOptionsInit);
     await publicAgreeUpdateFunc(HuksOptions, 2);
     await publicAgreeFinishAbortFunc(HuksOptionsFinishSecond, thirdInderfaceName);
 

security/security_huks_reformed_test/huks_agree_promise_BasicTest/src/main/js/test/Agree/SecurityHuksAgreeDHBasicFinish65KBPromiseJsunit.test.js

@@ -51,10 +51,10 @@ function makehuksOptionsFinish(srcKeyAliesFirst){
 function makehuksOptionsDerive(srcKeyAliesFirst){
   let huksOptionsFinish = {
     properties: new Array(
-      HuksAgreeDH.HuksKeyALGORITHMAES,
-      HuksAgreeDH.HuksKeySIZE256,
+      HuksAgreeDH.HuksKeyALGORITHMAES, 
       HuksAgreeDH.HuksKeyPurposeDERIVE,
       HuksAgreeDH.HuksKeyDIGESTSHA256,
+      HuksAgreeDH.HuksKeySIZE256,
       HuksAgreeDH.HuksKeyPADDINGNONE,
       HuksAgreeDH.HuksKeyBLOCKMODEECB,
       {
@@ -73,9 +73,9 @@ function makehuksOptionsHmac(srcKeyAliesFirst){
   let huksOptionsFinish = {
     properties: new Array(
       HuksAgreeDH.HuksKeyALGORITHMHMAC,
-      HuksAgreeDH.HuksKeySIZE256,
       HuksAgreeDH.HuksKeyPurposeMAC,
       HuksAgreeDH.HuksKeyDIGESTSHA256,
+      HuksAgreeDH.HuksKeySIZE256,
       HuksAgreeDH.HuksKeyPADDINGNONE,
       HuksAgreeDH.HuksKeyBLOCKMODEECB,
       {

security/security_huks_reformed_test/utils/param/agree/publicAgreeCallback.js

@@ -272,6 +272,7 @@ async function publicAgreeFunc(
   thirdInderfaceName
 ) {
   try {
+    
     await publicAgreeGenFunc(srcKeyAliesFrist, HuksOptions);
     await publicAgreeGenFunc(srcKeyAliesSecond, HuksOptions);
     await publicAgreeExport1Func(srcKeyAliesFrist, HuksOptions, 1);
@@ -284,7 +285,10 @@ async function publicAgreeFunc(
       HuksOptions.properties.splice(5, 1);
     }
 
-    await publicAgreeInitFunc(srcKeyAliesFrist, HuksOptions);
+    let HuksOptionsInit = JSON.parse(JSON.stringify(HuksOptions));
+    HuksOptionsInit.properties.splice(2,1,HuksOptionsFinish.properties[3])
+
+    await publicAgreeInitFunc(srcKeyAliesFrist, HuksOptionsInit);
     await publicAgreeUpdateFunc(HuksOptions, 1);
     await publicAgreeFinishAbortFunc(HuksOptionsFinish, thirdInderfaceName);
 
@@ -295,7 +299,7 @@ async function publicAgreeFunc(
       value: stringToUint8Array(srcKeyAliesSecond + 'final'),
     });
 
-    await publicAgreeInitFunc(srcKeyAliesSecond, HuksOptions);
+    await publicAgreeInitFunc(srcKeyAliesSecond, HuksOptionsInit);
     await publicAgreeUpdateFunc(HuksOptions, 2);
     await publicAgreeFinishAbortFunc(HuksOptionsFinishSecond, thirdInderfaceName);
 

security/security_huks_reformed_test/utils/param/agree/publicAgreePromise.js

@@ -166,6 +166,7 @@ async function publicAgreeFunc(
   thirdInderfaceName
 ) {
   try {
+    
     await publicAgreeGenFunc(srcKeyAliesFrist, HuksOptions);
     await publicAgreeGenFunc(srcKeyAliesSecond, HuksOptions);
     await publicAgreeExport1Func(srcKeyAliesFrist, HuksOptions, 1);
@@ -178,7 +179,10 @@ async function publicAgreeFunc(
       HuksOptions.properties.splice(5, 1);
     }
 
-    await publicAgreeInitFunc(srcKeyAliesFrist, HuksOptions);
+    let HuksOptionsInit = JSON.parse(JSON.stringify(HuksOptions));
+    HuksOptionsInit.properties.splice(2,1,HuksOptionsFinish.properties[3])
+
+    await publicAgreeInitFunc(srcKeyAliesFrist, HuksOptionsInit);
     await publicAgreeUpdateFunc(HuksOptions, 1);
     await publicAgreeFinishAbortFunc(HuksOptionsFinish, thirdInderfaceName);
 
@@ -189,7 +193,7 @@ async function publicAgreeFunc(
       value: stringToUint8Array(srcKeyAliesSecond + 'final'),
     });
 
-    await publicAgreeInitFunc(srcKeyAliesSecond, HuksOptions);
+    await publicAgreeInitFunc(srcKeyAliesSecond, HuksOptionsInit);
     await publicAgreeUpdateFunc(HuksOptions, 2);
     await publicAgreeFinishAbortFunc(HuksOptionsFinishSecond, thirdInderfaceName);