!6800 【openharmony-3.2master】【安全子系统】huks派生接口新增参数

Merge pull request !6800 from yuanyuhang/master1206_1

security/security_huks_basic/huks_derive_callback_BasicTest/src/main/js/test/Derive/SecurityHuksHKDFBasicAbort63KBCallbackJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksHKDFBasicAbort63KBCallbackJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'abort');
+    let deriveArray = new Array(HuksDeriveHKDF.HuksKeyAlgHKDF,HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'abort');
     done();
   });
 });

security/security_huks_basic/huks_derive_callback_BasicTest/src/main/js/test/Derive/SecurityHuksHKDFBasicFinish63KBCallbackJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksHKDFBasicFinish63KBCallbackJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'finish');
+    let deriveArray = new Array(HuksDeriveHKDF.HuksKeyAlgHKDF,HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'finish');
     done();
   });
 });

security/security_huks_basic/huks_derive_callback_BasicTest/src/main/js/test/Derive/SecurityHuksPBKDF2BasicAbort63KBCallbackJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksPBKDF2BasicAbort63KBCallbackJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'abort');
+    let deriveArray = new Array(HuksDerivePBKDF2.HuksKeyAlgPBKDF2,HuksDerivePBKDF2.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'abort');
     done();
   });
 });

security/security_huks_basic/huks_derive_callback_BasicTest/src/main/js/test/Derive/SecurityHuksPBKDF2BasicFinish63KBCallbackJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksPBKDF2BasicFinish63KBCallbackJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'finish');
+    let deriveArray = new Array(HuksDerivePBKDF2.HuksKeyAlgPBKDF2,HuksDerivePBKDF2.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'finish');
     done();
   });
 });

security/security_huks_basic/huks_derive_promise_BasicTest/src/main/js/test/Derive/SecurityHuksDeriveHKDFBasicAbort63KBPromiseJsunit.test.js

@@ -54,7 +54,8 @@ describe('SecurityHuksDeriveHKDFBasicAbort63KBPromiseJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'abort');
+    let deriveArray = new Array(HuksDeriveHKDF.HuksKeyAlgHKDF,HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'abort');
     done();
   });
 });

security/security_huks_basic/huks_derive_promise_BasicTest/src/main/js/test/Derive/SecurityHuksDeriveHKDFBasicFinish63KBPromiseJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksDeriveHKDFBasicFinish63KBPromiseJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'finish');
+    let deriveArray = new Array(HuksDeriveHKDF.HuksKeyAlgHKDF,HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'finish');
     done();
   });
 });

security/security_huks_basic/huks_derive_promise_BasicTest/src/main/js/test/Derive/SecurityHuksDerivePBKDF2BasicAbort63KBPromiseJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksDerivePBKDF2BasicAbort63KBPromiseJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'abort');
+    let deriveArray = new Array(HuksDerivePBKDF2.HuksKeyAlgPBKDF2,HuksDerivePBKDF2.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'abort');
     done();
   });
 });

security/security_huks_basic/huks_derive_promise_BasicTest/src/main/js/test/Derive/SecurityHuksDerivePBKDF2BasicFinish63KBPromiseJsunit.test.js

@@ -54,7 +54,8 @@ describe('SecurityHuksDerivePBKDF2BasicFinish63KBPromiseJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'finish');
+    let deriveArray = new Array(HuksDerivePBKDF2.HuksKeyAlgPBKDF2,HuksDerivePBKDF2.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'finish');
     done();
   });
 });

security/security_huks_basic/utils/param/derive/publicDeriveCallback.js

@@ -175,18 +175,20 @@ function deleteKey(srcKeyAlies, HuksOptions) {
   });
 }
 
-async function publicDeriveFunc(srcKeyAlies, HuksOptions, huksOptionsFinish, thirdInderfaceName) {
+async function publicDeriveFunc(srcKeyAlies, HuksOptions, huksOptionsFinish, deriveArray, thirdInderfaceName) {
   try {
     await publicDeriveGenFunc(srcKeyAlies, HuksOptions);
-    HuksOptions.properties.splice(0, 1, paramPublic.HuksDeriveHKDF.HuksKeyAlgHKDF);
-    HuksOptions.properties.splice(3, 1, paramPublic.HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    let deriveArrAlg = HuksOptions.properties[0];
+    let deriveArrLen = HuksOptions.properties[3];
+    HuksOptions.properties.splice(0, 1, deriveArray[0]);
+    HuksOptions.properties.splice(3, 1, deriveArray[1]);
 
     await publicDeriveInitFunc(srcKeyAlies, HuksOptions);
     await publicDeriveUpdateFunc(HuksOptions);
     await publicDeriveFinishAbortFunc(huksOptionsFinish, thirdInderfaceName);
 
-    HuksOptions.properties.splice(0, 1, paramPublic.HuksDeriveHKDF.HuksKeyAlgAES);
-    HuksOptions.properties.splice(3, 1, paramPublic.HuksDeriveHKDF.HuksKeyHKDFSize128);
+    HuksOptions.properties.splice(0, 1, deriveArrAlg);
+    HuksOptions.properties.splice(3, 1, deriveArrLen);
     await publicDeriveDeleteFunc(srcKeyAlies, HuksOptions);
   } catch (e) {
     expect(null).assertFail();

security/security_huks_basic/utils/param/derive/publicDerivePromise.js

@@ -100,22 +100,24 @@ async function publicDeriveDeleteFunc(srcKeyAlies, HuksOptions) {
     });
 }
 
-async function publicDeriveFunc(srcKeyAlies, HuksOptions, huksOptionsFinish, thirdInderfaceName) {
+async function publicDeriveFunc(srcKeyAlies, HuksOptions, huksOptionsFinish, deriveArray, thirdInderfaceName) {
   try {
     await publicDeriveGenFunc(srcKeyAlies, HuksOptions);
-    HuksOptions.properties.splice(0, 1, paramPublic.HuksDeriveHKDF.HuksKeyAlgHKDF);
-    HuksOptions.properties.splice(3, 1, paramPublic.HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    let deriveArrAlg = HuksOptions.properties[0];
+    let deriveArrLen = HuksOptions.properties[3];
+    HuksOptions.properties.splice(0, 1, deriveArray[0]);
+    HuksOptions.properties.splice(3, 1, deriveArray[1]);
 
     await publicDeriveInitFunc(srcKeyAlies, HuksOptions);
     await publicDeriveUpdateFunc(HuksOptions);
     await publicDeriveFinishAbortFunc(huksOptionsFinish, thirdInderfaceName);
 
-    HuksOptions.properties.splice(0, 1, paramPublic.HuksDeriveHKDF.HuksKeyAlgAES);
-    HuksOptions.properties.splice(3, 1, paramPublic.HuksDeriveHKDF.HuksKeyHKDFSize128);
+    HuksOptions.properties.splice(0, 1, deriveArrAlg);
+    HuksOptions.properties.splice(3, 1, deriveArrLen);
     await publicDeriveDeleteFunc(srcKeyAlies, HuksOptions);
   } catch (e) {
     expect(null).assertFail();
   }
 }
 
-export { publicDeriveFunc };
+export { publicDeriveFunc };
\ No newline at end of file

security/security_huks_reformed_test/huks_derive_callback_BasicTest/src/main/js/test/Derive/SecurityHuksHKDFBasicAbort63KBCallbackJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksHKDFBasicAbort63KBCallbackJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'abort');
+    let deriveArray = new Array(HuksDeriveHKDF.HuksKeyAlgHKDF,HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'abort');
     done();
   });
 });

security/security_huks_reformed_test/huks_derive_callback_BasicTest/src/main/js/test/Derive/SecurityHuksHKDFBasicFinish63KBCallbackJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksHKDFBasicFinish63KBCallbackJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'finish');
+    let deriveArray = new Array(HuksDeriveHKDF.HuksKeyAlgHKDF,HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'finish');
     done();
   });
 });

security/security_huks_reformed_test/huks_derive_callback_BasicTest/src/main/js/test/Derive/SecurityHuksPBKDF2BasicAbort63KBCallbackJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksPBKDF2BasicAbort63KBCallbackJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'abort');
+    let deriveArray = new Array(HuksDerivePBKDF2.HuksKeyAlgPBKDF2,HuksDerivePBKDF2.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'abort');
     done();
   });
 });

security/security_huks_reformed_test/huks_derive_callback_BasicTest/src/main/js/test/Derive/SecurityHuksPBKDF2BasicFinish63KBCallbackJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksPBKDF2BasicFinish63KBCallbackJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'finish');
+    let deriveArray = new Array(HuksDerivePBKDF2.HuksKeyAlgPBKDF2,HuksDerivePBKDF2.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'finish');
     done();
   });
 });

security/security_huks_reformed_test/huks_derive_promise_BasicTest/src/main/js/test/Derive/SecurityHuksDeriveHKDFBasicAbort63KBPromiseJsunit.test.js

@@ -54,7 +54,8 @@ describe('SecurityHuksDeriveHKDFBasicAbort63KBPromiseJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'abort');
+    let deriveArray = new Array(HuksDeriveHKDF.HuksKeyAlgHKDF,HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'abort');
     done();
   });
 });

security/security_huks_reformed_test/huks_derive_promise_BasicTest/src/main/js/test/Derive/SecurityHuksDeriveHKDFBasicFinish63KBPromiseJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksDeriveHKDFBasicFinish63KBPromiseJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'finish');
+    let deriveArray = new Array(HuksDeriveHKDF.HuksKeyAlgHKDF,HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'finish');
     done();
   });
 });

security/security_huks_reformed_test/huks_derive_promise_BasicTest/src/main/js/test/Derive/SecurityHuksDerivePBKDF2BasicAbort63KBPromiseJsunit.test.js

@@ -53,7 +53,8 @@ describe('SecurityHuksDerivePBKDF2BasicAbort63KBPromiseJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'abort');
+    let deriveArray = new Array(HuksDerivePBKDF2.HuksKeyAlgPBKDF2,HuksDerivePBKDF2.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'abort');
     done();
   });
 });

security/security_huks_reformed_test/huks_derive_promise_BasicTest/src/main/js/test/Derive/SecurityHuksDerivePBKDF2BasicFinish63KBPromiseJsunit.test.js

@@ -54,7 +54,8 @@ describe('SecurityHuksDerivePBKDF2BasicFinish63KBPromiseJsunit', function () {
       ),
       inData: srcData63Kb,
     };
-    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, 'finish');
+    let deriveArray = new Array(HuksDerivePBKDF2.HuksKeyAlgPBKDF2,HuksDerivePBKDF2.HuksKeyDERIVEKEYSIZE);
+    await publicDeriveFunc(srcKeyAliesFirst, HuksOptions63kb, huksOptionsFinish, deriveArray, 'finish');
     done();
   });
 });

security/security_huks_reformed_test/utils/param/derive/publicDeriveCallback.js

@@ -221,18 +221,20 @@ function deleteKeyItem(srcKeyAlies, HuksOptions) {
   });
 }
 
-async function publicDeriveFunc(srcKeyAlies, HuksOptions, huksOptionsFinish, thirdInderfaceName) {
+async function publicDeriveFunc(srcKeyAlies, HuksOptions, huksOptionsFinish, deriveArray, thirdInderfaceName) {
   try {
     await publicDeriveGenFunc(srcKeyAlies, HuksOptions);
-    HuksOptions.properties.splice(0, 1, paramPublic.HuksDeriveHKDF.HuksKeyAlgHKDF);
-    HuksOptions.properties.splice(3, 1, paramPublic.HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    let deriveArrAlg = HuksOptions.properties[0];
+    let deriveArrLen = HuksOptions.properties[3];
+    HuksOptions.properties.splice(0, 1, deriveArray[0]);
+    HuksOptions.properties.splice(3, 1, deriveArray[1]);
 
     await publicDeriveInitFunc(srcKeyAlies, HuksOptions);
     await publicDeriveUpdateFunc(HuksOptions);
     await publicDeriveFinishAbortFunc(huksOptionsFinish, thirdInderfaceName);
 
-    HuksOptions.properties.splice(0, 1, paramPublic.HuksDeriveHKDF.HuksKeyAlgAES);
-    HuksOptions.properties.splice(3, 1, paramPublic.HuksDeriveHKDF.HuksKeyHKDFSize128);
+    HuksOptions.properties.splice(0, 1, deriveArrAlg);
+    HuksOptions.properties.splice(3, 1, deriveArrLen);
     await publicDeriveDeleteFunc(srcKeyAlies, HuksOptions);
   } catch (e) {
     expect(null).assertFail();

security/security_huks_reformed_test/utils/param/derive/publicDerivePromise.js

@@ -124,18 +124,20 @@ async function publicDeriveDeleteFunc(srcKeyAlies, HuksOptions) {
   }
 }
 
-async function publicDeriveFunc(srcKeyAlies, HuksOptions, huksOptionsFinish, thirdInderfaceName) {
+async function publicDeriveFunc(srcKeyAlies, HuksOptions, huksOptionsFinish, deriveArray, thirdInderfaceName) {
   try {
     await publicDeriveGenFunc(srcKeyAlies, HuksOptions);
-    HuksOptions.properties.splice(0, 1, paramPublic.HuksDeriveHKDF.HuksKeyAlgHKDF);
-    HuksOptions.properties.splice(3, 1, paramPublic.HuksDeriveHKDF.HuksKeyDERIVEKEYSIZE);
+    let deriveArrAlg = HuksOptions.properties[0];
+    let deriveArrLen = HuksOptions.properties[3];
+    HuksOptions.properties.splice(0, 1, deriveArray[0]);
+    HuksOptions.properties.splice(3, 1, deriveArray[1]);
 
     await publicDeriveInitFunc(srcKeyAlies, HuksOptions);
     await publicDeriveUpdateFunc(HuksOptions);
     await publicDeriveFinishAbortFunc(huksOptionsFinish, thirdInderfaceName);
 
-    HuksOptions.properties.splice(0, 1, paramPublic.HuksDeriveHKDF.HuksKeyAlgAES);
-    HuksOptions.properties.splice(3, 1, paramPublic.HuksDeriveHKDF.HuksKeyHKDFSize128);
+    HuksOptions.properties.splice(0, 1, deriveArrAlg);
+    HuksOptions.properties.splice(3, 1, deriveArrLen);
     await publicDeriveDeleteFunc(srcKeyAlies, HuksOptions);
   } catch (e) {
     expect(null).assertFail();