Derive common traits to struct

Co-authored-by: mematthias <[email protected]>
Signed-off-by: Hugues de Valon <[email protected]>

Author: hug-dev

cryptoki/src/mechanism/mechanism_info.rs

@@ -7,6 +7,7 @@ use cryptoki_sys::*;
 use std::fmt::{Debug, Formatter};
 
 bitflags! {
+    #[derive(Debug, Clone, Copy)]
     struct MechanismInfoFlags: CK_FLAGS {
         const HW = CKF_HW;
         const ENCRYPT = CKF_ENCRYPT;
@@ -305,12 +306,13 @@ mod test {
 
     #[test]
     fn debug_flags_all() {
-        let expected = "\
-HW | ENCRYPT | DECRYPT | DIGEST | SIGN | SIGN_RECOVER | VERIFY | \
-VERIFY_RECOVER | GENERATE | GENERATE_KEY_PAIR | WRAP | UNWRAP | DERIVE | \
-EXTENSION | EC_F_P | EC_F_2M | EC_ECPARAMETERS | EC_NAMEDCURVE | \
-EC_OID | EC_UNCOMPRESS | EC_COMPRESS | MESSAGE_ENCRYPT | MESSAGE_DECRYPT | \
-MULTI_MESSAGE | ENCAPSULATE | DECAPSULATE";
+        let expected = "MechanismInfoFlags(
+    HW | ENCRYPT | DECRYPT | DIGEST | SIGN | SIGN_RECOVER | VERIFY | \
+    VERIFY_RECOVER | GENERATE | GENERATE_KEY_PAIR | WRAP | UNWRAP | DERIVE | \
+    EXTENSION | EC_F_P | EC_F_2M | EC_ECPARAMETERS | EC_OID | EC_UNCOMPRESS | \
+    EC_COMPRESS | MESSAGE_ENCRYPT | MESSAGE_DECRYPT | MULTI_MESSAGE | ENCAPSULATE | \
+    DECAPSULATE,
+)";
         let all = MechanismInfoFlags::all();
         let observed = format!("{all:#?}");
         println!("{observed}");
@@ -327,7 +329,9 @@ MULTI_MESSAGE | ENCAPSULATE | DECAPSULATE";
         let expected = r#"MechanismInfo {
     min_key_size: 16,
     max_key_size: 4096,
-    flags: (empty),
+    flags: MechanismInfoFlags(
+        0x0,
+    ),
 }"#;
         let observed = format!("{info:#?}");
         assert_eq!(observed, expected);

cryptoki/src/session/session_info.rs

@@ -11,6 +11,7 @@ use std::fmt::Debug;
 
 bitflags! {
     /// Collection of flags defined for [`CK_SESSION_INFO`]
+    #[derive(Debug, Clone, Copy)]
     struct SessionInfoFlags: CK_FLAGS {
         const RW_SESSION = CKF_RW_SESSION;
         const SERIAL_SESSION = CKF_SERIAL_SESSION;
@@ -109,7 +110,9 @@ mod test {
 
     #[test]
     fn debug_flags_all() {
-        let expected = "RW_SESSION | SERIAL_SESSION";
+        let expected = "SessionInfoFlags(
+    RW_SESSION | SERIAL_SESSION,
+)";
         let all = SessionInfoFlags::all();
         let observed = format!("{all:#?}");
         assert_eq!(observed, expected);
@@ -128,7 +131,9 @@ mod test {
         slot_id: 100,
     },
     state: RoPublic,
-    flags: (empty),
+    flags: SessionInfoFlags(
+        0x0,
+    ),
     device_error: 0,
 }"#;
         let observed = format!("{info:#?}");

cryptoki/src/slot/slot_info.rs

@@ -9,6 +9,7 @@ use std::fmt::Debug;
 
 bitflags! {
     /// Collection of flags defined for [`CK_SLOT_INFO`]
+    #[derive(Debug, Clone, Copy)]
     struct SlotInfoFlags: CK_FLAGS {
         const TOKEN_PRESENT = CKF_TOKEN_PRESENT;
         const REMOVABLE_DEVICE = CKF_REMOVABLE_DEVICE;
@@ -98,7 +99,9 @@ mod test {
 
     #[test]
     fn debug_flags_all() {
-        let expected = "TOKEN_PRESENT | REMOVABLE_DEVICE | HW_SLOT";
+        let expected = "SlotInfoFlags(
+    TOKEN_PRESENT | REMOVABLE_DEVICE | HW_SLOT,
+)";
         let all = SlotInfoFlags::all();
         let observed = format!("{all:#?}");
         assert_eq!(observed, expected);
@@ -116,7 +119,9 @@ mod test {
         let expected = r#"SlotInfo {
     slot_description: "Slot Description",
     manufacturer_id: "Manufacturer ID",
-    flags: (empty),
+    flags: SlotInfoFlags(
+        0x0,
+    ),
     hardware_version: Version {
         major: 0,
         minor: 255,

cryptoki/src/slot/token_info.rs

@@ -13,6 +13,7 @@ use std::fmt::Debug;
 
 bitflags! {
     /// Collection of flags defined for [`CK_TOKEN_INFO`]
+    #[derive(Debug, Clone, Copy)]
     struct TokenInfoFlags: CK_FLAGS {
         const RNG = CKF_RNG;
         const WRITE_PROTECTED = CKF_WRITE_PROTECTED;
@@ -463,13 +464,14 @@ mod test {
 
     #[test]
     fn debug_flags_all() {
-        let expected = "\
-RNG | WRITE_PROTECTED | LOGIN_REQUIRED | USER_PIN_INITIALIZED | \
-RESTORE_KEY_NOT_NEEDED | CLOCK_ON_TOKEN | PROTECTED_AUTHENTICATION_PATH | \
-DUAL_CRYPTO_OPERATIONS | TOKEN_INITIALIZED | SECONDARY_AUTHENTICATION | \
-USER_PIN_COUNT_LOW | USER_PIN_FINAL_TRY | USER_PIN_LOCKED | \
-USER_PIN_TO_BE_CHANGED | SO_PIN_COUNT_LOW | SO_PIN_FINAL_TRY | SO_PIN_LOCKED | \
-SO_PIN_TO_BE_CHANGED | ERROR_STATE";
+        let expected = "TokenInfoFlags(
+    RNG | WRITE_PROTECTED | LOGIN_REQUIRED | USER_PIN_INITIALIZED | \
+    RESTORE_KEY_NOT_NEEDED | CLOCK_ON_TOKEN | PROTECTED_AUTHENTICATION_PATH | \
+    DUAL_CRYPTO_OPERATIONS | TOKEN_INITIALIZED | SECONDARY_AUTHENTICATION | \
+    USER_PIN_COUNT_LOW | USER_PIN_FINAL_TRY | USER_PIN_LOCKED | \
+    USER_PIN_TO_BE_CHANGED | SO_PIN_COUNT_LOW | SO_PIN_FINAL_TRY | SO_PIN_LOCKED | \
+    SO_PIN_TO_BE_CHANGED | ERROR_STATE,
+)";
         let all = TokenInfoFlags::all();
         let observed = format!("{all:#?}");
         assert_eq!(observed, expected);
@@ -509,7 +511,9 @@ SO_PIN_TO_BE_CHANGED | ERROR_STATE";
     manufacturer_id: "Manufacturer ID",
     model: "Token Model",
     serial_number: "Serial Number",
-    flags: (empty),
+    flags: TokenInfoFlags(
+        0x0,
+    ),
     max_session_count: Max(
         100,
     ),

cryptoki/tests/basic.rs

@@ -1579,7 +1579,7 @@ fn get_session_info_test() -> TestResult {
     let session_info = session.get_session_info()?;
     assert!(session_info.read_write());
     assert_eq!(session_info.slot_id(), slot);
-    assert!(matches!(session_info.session_state(), SessionState::RwUser,));
+    assert!(matches!(session_info.session_state(), SessionState::RwUser));
     session.logout()?;
     session.login(UserType::So, Some(&AuthPin::new(SO_PIN.into())))?;
     let session_info = session.get_session_info()?;