Renamed DkmLengthMethod to KbkdfDkmLengthMethod for consistency

Signed-off-by: Jacob Prud'homme <[email protected]>

Author: jacobprudhomme

cryptoki/src/mechanism/kbkdf.rs

@@ -56,7 +56,7 @@ impl KbkdfCounterFormat {
 ///
 /// Corresponds to CK_SP800_108_DKM_LENGTH_METHOD.
 #[derive(Debug, Clone, Copy)]
-pub enum DkmLengthMethod {
+pub enum KbkdfDkmLengthMethod {
     /// Sum of length of all keys derived by given invocation of KDF.
     SumOfKeys,
     /// Sum of length of all segments of output produced by PRF in given invocation of KDF.
@@ -81,14 +81,14 @@ impl KbkdfDkmLengthFormat {
     ///
     /// * `width_in_bits` - The number of bits used to represent the DKM length value.
     pub fn new(
-        dkm_length_method: DkmLengthMethod,
+        dkm_length_method: KbkdfDkmLengthMethod,
         endianness: Endianness,
         width_in_bits: usize,
     ) -> Self {
         Self(CK_SP800_108_DKM_LENGTH_FORMAT {
             dkmLengthMethod: match dkm_length_method {
-                DkmLengthMethod::SumOfKeys => CK_SP800_108_DKM_LENGTH_SUM_OF_KEYS,
-                DkmLengthMethod::SumOfSegments => CK_SP800_108_DKM_LENGTH_SUM_OF_SEGMENTS,
+                KbkdfDkmLengthMethod::SumOfKeys => CK_SP800_108_DKM_LENGTH_SUM_OF_KEYS,
+                KbkdfDkmLengthMethod::SumOfSegments => CK_SP800_108_DKM_LENGTH_SUM_OF_SEGMENTS,
             },
             bLittleEndian: (endianness == Endianness::Little).into(),
             ulWidthInBits: width_in_bits

cryptoki/tests/basic.rs

@@ -9,7 +9,7 @@ use cryptoki::error::{Error, RvError};
 use cryptoki::mechanism::aead::{GcmMessageParams, GcmParams, GeneratorFunction};
 use cryptoki::mechanism::eddsa::{EddsaParams, EddsaSignatureScheme};
 use cryptoki::mechanism::kbkdf::{
-    DerivedKey, DkmLengthMethod, Endianness, KbkdfCounterFormat, KbkdfDkmLengthFormat,
+    DerivedKey, KbkdfDkmLengthMethod, Endianness, KbkdfCounterFormat, KbkdfDkmLengthFormat,
     KbkdfFeedbackParams, KbkdfParams, PrfDataParam, PrfDataParamType,
 };
 use cryptoki::mechanism::rsa::{PkcsMgfType, PkcsOaepParams, PkcsOaepSource};
@@ -2212,7 +2212,7 @@ fn kbkdf_all_modes() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, 16);
     let dkm_length_format =
-        KbkdfDkmLengthFormat::new(DkmLengthMethod::SumOfKeys, Endianness::Big, 16);
+        KbkdfDkmLengthFormat::new(KbkdfDkmLengthMethod::SumOfKeys, Endianness::Big, 16);
 
     /* COUNTER-MODE */
 
@@ -2393,7 +2393,7 @@ fn kbkdf_additional_keys_all_modes() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, 16);
     let dkm_length_format =
-        KbkdfDkmLengthFormat::new(DkmLengthMethod::SumOfKeys, Endianness::Big, 16);
+        KbkdfDkmLengthFormat::new(KbkdfDkmLengthMethod::SumOfKeys, Endianness::Big, 16);
     let mut additional_derived_keys = derived_key_templates[1..]
         .iter()
         .map(|template| DerivedKey::new(template))
@@ -2616,7 +2616,7 @@ fn kbkdf_invalid_data_params_counter_mode() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, 16);
     let dkm_length_format =
-        KbkdfDkmLengthFormat::new(DkmLengthMethod::SumOfKeys, Endianness::Big, 16);
+        KbkdfDkmLengthFormat::new(KbkdfDkmLengthMethod::SumOfKeys, Endianness::Big, 16);
 
     /* MISSING ITERATION VARIABLE */
 
@@ -2762,7 +2762,7 @@ fn kbkdf_invalid_data_params_feedback_mode() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, 16);
     let dkm_length_format =
-        KbkdfDkmLengthFormat::new(DkmLengthMethod::SumOfKeys, Endianness::Big, 16);
+        KbkdfDkmLengthFormat::new(KbkdfDkmLengthMethod::SumOfKeys, Endianness::Big, 16);
 
     /* MISSING ITERATION VARIABLE */
 
@@ -2882,7 +2882,7 @@ fn kbkdf_invalid_data_params_double_pipeline_mode() -> TestResult {
     // Some variables we will use throughout
     let counter_format = KbkdfCounterFormat::new(Endianness::Big, 16);
     let dkm_length_format =
-        KbkdfDkmLengthFormat::new(DkmLengthMethod::SumOfKeys, Endianness::Big, 16);
+        KbkdfDkmLengthFormat::new(KbkdfDkmLengthMethod::SumOfKeys, Endianness::Big, 16);
 
     /* MISSING ITERATION VARIABLE */