KBKDF: Use FIPS/OpenSSL compatible params

Signed-off-by: Jakub Jelen <jjelen@redhat.com>

Author: Jakuje

cryptoki/tests/basic.rs

@@ -2578,9 +2578,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
@@ -2673,7 +2673,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 */
@@ -2789,7 +2789,7 @@ fn kbkdf_double_pipeline_mode() -> TestResult {
     let dkm_length_format = KbkdfDkmLengthFormat::new(
         KbkdfDkmLengthMethod::SumOfKeys,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     // Instantiate KBKDF in feedback-mode without additional keys
@@ -2896,9 +2896,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
@@ -3054,7 +3054,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![];
@@ -3238,7 +3238,7 @@ fn kbkdf_additional_keys_double_pipeline_mode() -> TestResult {
     let dkm_length_format = KbkdfDkmLengthFormat::new(
         KbkdfDkmLengthMethod::SumOfKeys,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     // Instantiate KBKDF in feedback-mode without additional keys
@@ -3370,9 +3370,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 */
@@ -3521,7 +3521,7 @@ fn kbkdf_invalid_data_params_feedback_mode() -> TestResult {
     let dkm_length_format = KbkdfDkmLengthFormat::new(
         KbkdfDkmLengthMethod::SumOfKeys,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     /* MISSING ITERATION VARIABLE */
@@ -3644,7 +3644,7 @@ fn kbkdf_invalid_data_params_double_pipeline_mode() -> TestResult {
     let dkm_length_format = KbkdfDkmLengthFormat::new(
         KbkdfDkmLengthMethod::SumOfKeys,
         Endianness::Big,
-        NonZeroUsize::new(16).unwrap(),
+        NonZeroUsize::new(32).unwrap(),
     );
 
     /* MISSING ITERATION VARIABLE */