Fix tests

Nitrokey · Sep 10, 2024 · 334812d · 334812d
1 parent 0ab6075
commit 334812d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pkcs11/src/api/generation.rs b/pkcs11/src/api/generation.rs
@@ -8,7 +8,7 @@ use crate::{
         db::attr::CkRawAttrTemplate,
         mechanism::{CkRawMechanism, Mechanism},
     },
-    lock_session, read_session,
+    read_session,
 };
 
 pub extern "C" fn C_GenerateKey(
@@ -232,7 +232,7 @@ pub extern "C" fn C_GenerateRandom(
 
         return cryptoki_sys::CKR_ARGUMENTS_BAD;
     }
-    lock_session!(hSession, session);
+    read_session!(hSession, session);
 
     if !session
         .login_ctx

diff --git a/pkcs11/src/backend/login.rs b/pkcs11/src/backend/login.rs
@@ -170,7 +170,7 @@ impl LoginCtx {
     }
 
     fn administrator(&self) -> Option<Configuration> {
-        get_user_api_config(self.operator_config(), self.next_instance())
+        get_user_api_config(self.admin_config(), self.next_instance())
     }
 
     fn operator_or_administrator(&self) -> Option<Configuration> {

diff --git a/pkcs11/src/utils.rs b/pkcs11/src/utils.rs
@@ -41,7 +41,6 @@ macro_rules! lock_session {
                     return cryptoki_sys::CKR_SESSION_HANDLE_INVALID;
                 }
             };
-        #[allow(unused_mut)]
         let mut $session = $crate::lock_mutex!($session);
     };
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,6 @@ macro_rules! lock_session { @@
                         return cryptoki_sys::CKR_SESSION_HANDLE_INVALID;
                     }
                 };
-            #[allow(unused_mut)]
             let mut $session = $crate::lock_mutex!($session);
         };
     }
@@ Expand Down @@