Bump cryptoki to 0.7.0. Add pkcs11 function to errors.

spruceid · Jun 18, 2024 · 4e7449b · 4e7449b
1 parent 4f6d229
commit 4e7449b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/r2d2-cryptoki/"
 serde = ["cryptoki/serde"]
 
 [dependencies]
-cryptoki = "0.6.0"
+cryptoki = "0.7.0"
 r2d2 = "0.8.10"
 
 [dev-dependencies]

diff --git a/src/lib.rs b/src/lib.rs
@@ -5,7 +5,7 @@ pub use cryptoki;
 pub use r2d2;
 
 use cryptoki::{
-    context::Pkcs11,
+    context::{Function, Pkcs11},
     error::RvError,
     session::{Session, SessionState, UserType},
     slot::{Limit, Slot},
@@ -136,7 +136,7 @@ impl ManageConnection for SessionManager {
         };
         if let Some(user_type) = maybe_user_info {
             match session.login(user_type.0, Some(user_type.1)) {
-                Err(Self::Error::Pkcs11(RvError::UserAlreadyLoggedIn)) => {}
+                Err(Self::Error::Pkcs11(RvError::UserAlreadyLoggedIn, Function::Login)) => {}
                 res => res?,
             };
         }
@@ -147,7 +147,7 @@ impl ManageConnection for SessionManager {
         let actual_state = session.get_session_info()?.session_state();
         let expected_state = &self.session_type;
         if actual_state != expected_state.as_state() {
-            Err(Self::Error::Pkcs11(RvError::UserNotLoggedIn))
+            Err(Self::Error::Pkcs11(RvError::UserNotLoggedIn, Function::GetSessionInfo))
         } else {
             Ok(())
         }