KBKDF: Use FIPS/OpenSSL compatible params

Signed-off-by: Jakub Jelen <[email protected]>

Author: Jakuje

cryptoki/tests/basic.rs

@@ -2293,9 +2293,9 @@ fn kbkdf_counter_mode() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, NonZeroUsize::new(16).unwrap());
     let dkm_length_format = KbkdfDkmLengthFormat::new(
-        KbkdfDkmLengthMethod::SumOfKeys,
+        KbkdfDkmLengthMethod::SumOfSegments,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     // Instantiate KBKDF in counter-mode without additional keys
@@ -2388,7 +2388,7 @@ fn kbkdf_feedback_mode() -> TestResult {
     let dkm_length_format = KbkdfDkmLengthFormat::new(
         KbkdfDkmLengthMethod::SumOfKeys,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     /* FEEDBACK-MODE - no IV */
@@ -2502,9 +2502,9 @@ fn kbkdf_double_pipeline_mode() -> TestResult {
 
     // Some variables we will use throughout
     let dkm_length_format = KbkdfDkmLengthFormat::new(
-        KbkdfDkmLengthMethod::SumOfKeys,
+        KbkdfDkmLengthMethod::SumOfSegments,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     // Instantiate KBKDF in feedback-mode without additional keys
@@ -2611,9 +2611,9 @@ fn kbkdf_additional_keys_counter_mode() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, NonZeroUsize::new(16).unwrap());
     let dkm_length_format = KbkdfDkmLengthFormat::new(
-        KbkdfDkmLengthMethod::SumOfKeys,
+        KbkdfDkmLengthMethod::SumOfSegments,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     // Instantiate KBKDF in counter-mode without additional keys
@@ -2769,7 +2769,7 @@ fn kbkdf_additional_keys_feedback_mode() -> TestResult {
     let dkm_length_format = KbkdfDkmLengthFormat::new(
         KbkdfDkmLengthMethod::SumOfKeys,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     let mut derived_keys = vec![];
@@ -2951,9 +2951,9 @@ fn kbkdf_additional_keys_double_pipeline_mode() -> TestResult {
 
     // Some variables we will use throughout
     let dkm_length_format = KbkdfDkmLengthFormat::new(
-        KbkdfDkmLengthMethod::SumOfKeys,
+        KbkdfDkmLengthMethod::SumOfSegments,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     // Instantiate KBKDF in feedback-mode without additional keys
@@ -3085,9 +3085,9 @@ fn kbkdf_invalid_data_params_counter_mode() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, NonZeroUsize::new(16).unwrap());
     let dkm_length_format = KbkdfDkmLengthFormat::new(
-        KbkdfDkmLengthMethod::SumOfKeys,
+        KbkdfDkmLengthMethod::SumOfSegments,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     /* MISSING ITERATION VARIABLE */
@@ -3234,9 +3234,9 @@ fn kbkdf_invalid_data_params_feedback_mode() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, NonZeroUsize::new(16).unwrap());
     let dkm_length_format = KbkdfDkmLengthFormat::new(
-        KbkdfDkmLengthMethod::SumOfKeys,
+        KbkdfDkmLengthMethod::SumOfSegments,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     /* MISSING ITERATION VARIABLE */
@@ -3357,9 +3357,9 @@ fn kbkdf_invalid_data_params_double_pipeline_mode() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, NonZeroUsize::new(16).unwrap());
     let dkm_length_format = KbkdfDkmLengthFormat::new(
-        KbkdfDkmLengthMethod::SumOfKeys,
+        KbkdfDkmLengthMethod::SumOfSegments,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     /* MISSING ITERATION VARIABLE */