Move shared params from mldsa specific module

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

Author: Jakuje

cryptoki/src/mechanism/mldsa.rs renamed to cryptoki/src/mechanism/dsa.rs

@@ -1,11 +1,11 @@
-//! ML-DSA mechanism types
+//! ML-DSA and SLH-DSA mechanism parameters
 
 use crate::mechanism::{Mechanism, MechanismType};
 
 use cryptoki_sys::*;
 use std::{convert::TryInto, marker::PhantomData, ptr::null_mut};
 
-/// The hedge type for ML-DSA signature
+/// The hedge type for ML-DSA and SLH-DSA signature
 #[derive(Debug, Clone, Copy, PartialEq, Default)]
 pub enum HedgeType {
     /// Token may create either a hedged signature or a deterministic signature
@@ -33,7 +33,7 @@ impl From<HedgeType> for CK_ULONG {
     }
 }
 
-/// The ML-DSA additional context for signatures
+/// The ML-DSA and SLH-DSA additional context for signatures
 ///
 /// This structure wraps `CK_SIGN_ADDITIONAL_CONTEXT` structure.
 #[derive(Debug, Clone, Copy)]
@@ -44,7 +44,7 @@ pub struct SignAdditionalContext<'a> {
 }
 
 impl SignAdditionalContext<'_> {
-    /// Construct ML-DSA signature parameters.
+    /// Construct ML-DSA and SLH-DSA signature parameters.
     ///
     /// # Arguments
     ///
@@ -94,7 +94,7 @@ impl SignAdditionalContext<'_> {
     }
 }
 
-/// The ML-DSA additional context for signatures with hashing information
+/// The ML-DSA and SLH-DSA additional context for signatures with hashing information
 ///
 /// This structure wraps `CK_HASH_SIGN_ADDITIONAL_CONTEXT` structure.
 #[derive(Debug, Clone, Copy)]
@@ -105,7 +105,7 @@ pub struct HashSignAdditionalContext<'a> {
 }
 
 impl HashSignAdditionalContext<'_> {
-    /// Construct HashML-DSA Signature parameters.
+    /// Construct HashML-DSA or HashSLH-DSA Signature parameters.
     ///
     /// # Arguments
     ///

cryptoki/src/mechanism/mod.rs

@@ -9,7 +9,7 @@ pub mod elliptic_curve;
 pub mod hkdf;
 pub mod kbkdf;
 mod mechanism_info;
-pub mod mldsa;
+pub mod dsa;
 pub mod rsa;
 pub mod vendor_defined;
 
@@ -1152,29 +1152,29 @@ pub enum Mechanism<'a> {
     /// ML-DSA key pair generation mechanism
     MlDsaKeyPairGen,
     /// ML-DSA signature mechanism
-    MlDsa(mldsa::SignAdditionalContext<'a>),
+    MlDsa(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism
-    HashMlDsa(mldsa::HashSignAdditionalContext<'a>),
+    HashMlDsa(dsa::HashSignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHA224
-    HashMlDsaSha224(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaSha224(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHA256
-    HashMlDsaSha256(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaSha256(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHA384
-    HashMlDsaSha384(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaSha384(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHA512
-    HashMlDsaSha512(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaSha512(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHA3-224
-    HashMlDsaSha3_224(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaSha3_224(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHA3-256
-    HashMlDsaSha3_256(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaSha3_256(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHA3-384
-    HashMlDsaSha3_384(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaSha3_384(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHA3-512
-    HashMlDsaSha3_512(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaSha3_512(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHAKE128
-    HashMlDsaShake128(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaShake128(dsa::SignAdditionalContext<'a>),
     /// HashML-DSA signature mechanism with SHAKE256
-    HashMlDsaShake256(mldsa::SignAdditionalContext<'a>),
+    HashMlDsaShake256(dsa::SignAdditionalContext<'a>),
 
     /// Vendor defined mechanism
     VendorDefined(VendorDefinedMechanism<'a>),

cryptoki/tests/ml_dsa.rs

@@ -5,7 +5,7 @@ mod common;
 use crate::common::{init_pins, USER_PIN};
 use cryptoki::context::Function;
 use cryptoki::error::{Error, RvError};
-use cryptoki::mechanism::mldsa::{HashSignAdditionalContext, HedgeType, SignAdditionalContext};
+use cryptoki::mechanism::dsa::{HashSignAdditionalContext, HedgeType, SignAdditionalContext};
 use cryptoki::mechanism::{Mechanism, MechanismType};
 use cryptoki::object::{Attribute, AttributeType, MlDsaParameterSetType};
 use cryptoki::session::UserType;