minor changes

- get_pkcs11! macro rewrite
- test code refactoring

Signed-off-by: Eric Devolder <[email protected]>

Author: keldonin

cryptoki/src/context/mod.rs

@@ -3,13 +3,10 @@
 //! Pkcs11 context and initialization types
 
 /// Directly get the PKCS #11 operation from the context structure and check for null pointers.
+/// Note that this macro depends on the get_pkcs11_func! macro.
 macro_rules! get_pkcs11 {
     ($pkcs11:expr, $func_name:ident) => {
-        ($pkcs11
-            .impl_
-            .function_list
-            .$func_name
-            .ok_or(crate::error::Error::NullFunctionPointer)?)
+        (get_pkcs11_func!($pkcs11, $func_name).ok_or(crate::error::Error::NullFunctionPointer)?)
     };
 }
 

cryptoki/tests/basic.rs

@@ -378,7 +378,7 @@ fn session_objecthandle_iterator() -> testresult::TestResult {
 
     // we generate 11 keys with the same CKA_ID
 
-    (1..=11).for_each(|i| {
+    for i in 1..=11 {
         let key_template = vec![
             Attribute::Token(true),
             Attribute::Encrypt(true),
@@ -387,8 +387,8 @@ fn session_objecthandle_iterator() -> testresult::TestResult {
         ];
 
         // generate a secret key
-        let _key = session.generate_key(&Mechanism::Des3KeyGen, &key_template);
-    });
+        session.generate_key(&Mechanism::Des3KeyGen, &key_template)?;
+    }
 
     // retrieve these keys using this template
     let key_search_template = vec![