WIP

Signed-off-by: Simo Sorce <simo@redhat.com>

Author: simo5

.github/workflows/build.yml

@@ -188,7 +188,7 @@ jobs:
           export TEST_PKCS11_MODULE
 
           #TEST
-          cargo test -vv $OPTS --features "$FEATURES"
+          cargo test -vv $OPTS --features "$FEATURES" -- --no-capture
 
       - uses: actions/upload-artifact@v4
         if: failure()

src/lib.rs

@@ -498,20 +498,6 @@ static CONFIG: LazyLock<RwLock<GlobalConfig>> = LazyLock::new(|| {
     })
 });
 
-/// loads the default configuration if available
-fn load_default_config(gconf: &mut GlobalConfig) {
-    let conf = match Config::default_config() {
-        Ok(conf) => conf,
-        Err(_) => Config::new(),
-    };
-
-    /* if there is no config file or the configuration is malformed,
-     * sets an empty config, an error will be returned later at
-     * fn_initialize() time */
-    gconf.conf = conf;
-    gconf.conf.load_env_vars_overrides();
-}
-
 /// tests helper
 #[cfg(test)]
 pub fn add_slot(slot: config::Slot) -> CK_RV {
@@ -527,14 +513,14 @@ pub fn add_slot(slot: config::Slot) -> CK_RV {
 /// Version 3.1 Specification: [https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/os/pkcs11-spec-v3.1-os.html#_Toc111203255](https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/os/pkcs11-spec-v3.1-os.html#_Toc111203255)
 
 extern "C" fn fn_initialize(_init_args: CK_VOID_PTR) -> CK_RV {
+    eprintln!("Initialize");
     let mut gconf = global_wlock!(noinitcheck; (*CONFIG));
-
-    if gconf.conf.slots.is_empty() {
-        load_default_config(&mut gconf);
-    }
+    eprintln!("Got gconf");
 
     let mut ret: CK_RV = CKR_OK;
 
+    /* Before loading the default config see if there is a cutsom config
+     * provided via reserved ag pointer */
     if !_init_args.is_null() {
         let args = unsafe { *(_init_args as *const CK_C_INITIALIZE_ARGS) };
 
@@ -549,6 +535,18 @@ extern "C" fn fn_initialize(_init_args: CK_VOID_PTR) -> CK_RV {
         }
     }
 
+    if gconf.conf.slots.is_empty() {
+        eprintln!("Reading default conf");
+        let conf = match Config::default_config() {
+            Ok(conf) => conf,
+            Err(_) => Config::new(),
+        };
+        /* if there is no config file or the configuration is malformed,
+         * sets an empty config, an Token initialization will fail later */
+    }
+
+    gconf.conf.load_env_vars_overrides();
+
     let mut wstate = global_wlock!(noinitcheck; (*STATE));
     if wstate.is_initialized() {
         ret = CKR_CRYPTOKI_ALREADY_INITIALIZED;
@@ -615,8 +613,11 @@ fn set_fips_behavior(slot_id: CK_SLOT_ID, val: config::FipsBehavior) -> CK_RV {
 /// Version 3.1 Specification: [https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/os/pkcs11-spec-v3.1-os.html#_Toc111203256](https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/os/pkcs11-spec-v3.1-os.html#_Toc111203256)
 
 extern "C" fn fn_finalize(_reserved: CK_VOID_PTR) -> CK_RV {
+    eprintln!("Finalize");
     let ret = global_wlock!((*STATE)).finalize();
+    eprintln!("Got gconf");
     let mut gconf = global_wlock!(noinitcheck; (*CONFIG));
+    eprintln!("Wiping conf");
     gconf.conf = Config::new();
     ret
 }

src/token.rs

@@ -164,6 +164,9 @@ impl Token {
                 CKR_CRYPTOKI_NOT_INITIALIZED => {
                     token.uninitialized_token_info();
                 }
+                CKR_TOKEN_NOT_PRESENT => {
+                    eprintln!("WHAT THE ... dbtype: {}, dbargs: {:?}", dbtype, &dbargs);
+                }
                 _ => return Err(err),
             },
         }