PR feedback

Signed-off-by: Ionut Mihalcea <[email protected]>
parallaxsecond · Sep 7, 2022 · badc344 · badc344
1 parent 25d441e
commit badc344
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/cryptoki/src/context/mod.rs b/cryptoki/src/context/mod.rs
@@ -174,14 +174,14 @@ impl Pkcs11 {
     ///
     /// Note: No callback is set when opening the session.
     pub fn open_ro_session(&self, slot_id: Slot) -> Result<Session> {
-        session_management::open_session_no_callback(self, slot_id, false)
+        session_management::open_session(self, slot_id, false)
     }
 
     /// Open a new Read/Write session
     ///
     /// Note: No callback is set when opening the session.
     pub fn open_rw_session(&self, slot_id: Slot) -> Result<Session> {
-        session_management::open_session_no_callback(self, slot_id, true)
+        session_management::open_session(self, slot_id, true)
     }
 
     /// Check whether a given PKCS11 spec-defined function is supported by this implementation

diff --git a/cryptoki/src/context/session_management.rs b/cryptoki/src/context/session_management.rs
@@ -11,11 +11,7 @@ use crate::slot::Slot;
 use std::convert::TryInto;
 // See public docs on stub in parent mod.rs
 #[inline(always)]
-pub(super) fn open_session_no_callback(
-    ctx: &Pkcs11,
-    slot_id: Slot,
-    read_write: bool,
-) -> Result<Session> {
+pub(super) fn open_session(ctx: &Pkcs11, slot_id: Slot, read_write: bool) -> Result<Session> {
     let mut session_handle = 0;
 
     let flags = if read_write {

diff --git a/cryptoki/tests/basic.rs b/cryptoki/tests/basic.rs
@@ -751,7 +751,7 @@ fn ro_rw_session_test() -> Result<()> {
         ro_session.login(UserType::User, Some(USER_PIN))?;
 
         // generate a key pair
-        // This should NOT work using the Read/Write session
+        // This should NOT work using the Read-Only session
         let e = ro_session.create_object(&template).unwrap_err();
 
         if let Error::Pkcs11(RvError::SessionReadOnly) = e {