Skip to content

Remove skipping of kryoptic tests as they should work now #258

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

Merged
merged 3 commits into from
Apr 22, 2025
Merged

Remove skipping of kryoptic tests as they should work now #258

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c41316a
tests: Remove skipping of tests for kryoptic
Jakuje Apr 14, 2025
8d90d9f
tests: Add missing usage attributes
Jakuje Apr 14, 2025
7e92fca
tests: Kryoptic has now PKCS#11 3.2 API
Jakuje Apr 17, 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
25 changes: 2 additions & 23 deletions cryptoki/tests/basic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,11 +601,6 @@ fn encrypt_decrypt_multipart_already_initialized() -> TestResult {
#[test]
#[serial]
fn derive_key() -> TestResult {
/* FIXME: This is now broken in Kryoptic: https://github.com/latchset/kryoptic/issues/184 */
if !is_softhsm() {
/* return Ignore(); */
return Ok(());
}
let (pkcs11, slot) = init_pins();

// open a session
Expand Down Expand Up @@ -904,12 +899,6 @@ fn session_objecthandle_iterator() -> testresult::TestResult {
#[test]
#[serial]
fn wrap_and_unwrap_key() {
/* FIXME: This is now broken in Kryoptic: https://github.com/latchset/kryoptic/issues/184 */
if !is_softhsm() {
/* return Ignore(); */
return;
}

let (pkcs11, slot) = init_pins();
// open a session
let session = pkcs11.open_rw_session(slot).unwrap();
Expand Down Expand Up @@ -952,7 +941,7 @@ fn wrap_and_unwrap_key() {
];

// priv key template
let priv_key_template = vec![Attribute::Token(true)];
let priv_key_template = vec![Attribute::Token(true), (Attribute::Unwrap(true))];

let (wrapping_key, unwrapping_key) = session
.generate_key_pair(
Expand Down Expand Up @@ -1048,7 +1037,7 @@ fn get_info_test() -> TestResult {
assert_eq!(info.cryptoki_version().minor(), 40);
} else {
assert_eq!(info.cryptoki_version().major(), 3);
assert_eq!(info.cryptoki_version().minor(), 0);
assert_eq!(info.cryptoki_version().minor(), 2);
}
Ok(())
}
Expand Down Expand Up @@ -1352,11 +1341,6 @@ fn test_clone_initialize() {
#[test]
#[serial]
fn aes_key_attributes_test() -> TestResult {
/* FIXME: This is now broken in Kryoptic: https://github.com/latchset/kryoptic/issues/182 */
if !is_softhsm() {
/* return Ignore(); */
return Ok(());
}
let (pkcs11, slot) = init_pins();

// open a session
Expand Down Expand Up @@ -1672,11 +1656,6 @@ fn sha256_digest_multipart() -> TestResult {
#[test]
#[serial]
fn sha256_digest_multipart_with_key() -> TestResult {
// FIXME: Getting value from sensitive objects is now broken in Kryoptic: https://github.com/latchset/kryoptic/issues/193
if !is_softhsm() {
return Ok(());
}

let (pkcs11, slot) = init_pins();

// Open a session and log in
Expand Down
Loading