From c41316a2bbb1b98acd98982d68e1dfa6bec9f753 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 14 Apr 2025 21:58:13 +0200 Subject: [PATCH 1/3] tests: Remove skipping of tests for kryoptic They are fixed in 1.1.0 release Signed-off-by: Jakub Jelen --- cryptoki/tests/basic.rs | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/cryptoki/tests/basic.rs b/cryptoki/tests/basic.rs index e3f418ec..47d28cbe 100644 --- a/cryptoki/tests/basic.rs +++ b/cryptoki/tests/basic.rs @@ -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 @@ -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(); @@ -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 @@ -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 From 8d90d9feecce771321fbde34a39037585f450f34 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 14 Apr 2025 21:58:34 +0200 Subject: [PATCH 2/3] tests: Add missing usage attributes Signed-off-by: Jakub Jelen --- cryptoki/tests/basic.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptoki/tests/basic.rs b/cryptoki/tests/basic.rs index 47d28cbe..c243d2c1 100644 --- a/cryptoki/tests/basic.rs +++ b/cryptoki/tests/basic.rs @@ -941,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( From 7e92fca47e307190f8986e6abccc988f8f3227fa Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 17 Apr 2025 12:10:43 +0200 Subject: [PATCH 3/3] tests: Kryoptic has now PKCS#11 3.2 API Signed-off-by: Jakub Jelen --- cryptoki/tests/basic.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptoki/tests/basic.rs b/cryptoki/tests/basic.rs index c243d2c1..1950f5fe 100644 --- a/cryptoki/tests/basic.rs +++ b/cryptoki/tests/basic.rs @@ -1037,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(()) }