Skip to content

Don't raise an error at close when it's expected #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Don't raise an error at close when it's expected #325

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a8dc29
Don't raise an error when the close fails because the session is inva…
EliseChouleur Nov 20, 2025
9bd68cb
Rust formatting
EliseChouleur Nov 20, 2025
43551e6
better message
EliseChouleur Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions cryptoki/src/session/session_management.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
//! Session management functions

use crate::context::Function;
use crate::error::{Result, Rv};
use crate::error::{Error, Result, Rv, RvError};
use crate::session::{Session, SessionInfo, UserType};
use crate::types::{AuthPin, RawAuthPin};

#[cfg(doc)]
use cryptoki_sys::CKF_PROTECTED_AUTHENTICATION_PATH;
use cryptoki_sys::CK_SESSION_INFO;
use log::error;
use log::{error, warn};
use secrecy::ExposeSecret;
use std::convert::{TryFrom, TryInto};

Expand All @@ -27,7 +27,12 @@ impl Drop for Session {
}

if let Err(err) = close(self) {
error!("Failed to close session: {err}");
match err {
Error::Pkcs11(RvError::SessionHandleInvalid, _) => {
warn!("Failed to close session: The specified session handle is invalid, the session must be already closed.");
}
_ => error!("Failed to close session: {err}"),
}
}
}
}
Expand Down
Loading