Attempt to resolve 208

Author: testingapisname

cryptoki/src/context/mod.rs

@@ -92,21 +92,27 @@ impl Pkcs11Impl {
     }
 }
 
-impl Drop for Pkcs11Impl {
+impl Drop for Pkcs11 {
     fn drop(&mut self) {
-        if let Err(e) = self.finalize() {
-            error!("Failed to finalize: {}", e);
+        if self.finalize_on_drop {
+            if let Err(e) = self.impl_.finalize() {
+                error!("Failed to finalize: {}", e);
+            }
         }
     }
 }
 
+
+
 /// Main PKCS11 context. Should usually be unique per application.
 #[derive(Clone, Debug)]
 pub struct Pkcs11 {
     pub(crate) impl_: Arc<Pkcs11Impl>,
     initialized: Arc<RwLock<bool>>,
+    finalize_on_drop: bool, // NEW FIELD
 }
 
+
 impl Pkcs11 {
     /// Instantiate a new context from the path of a PKCS11 dynamic library implementation.
     pub fn new<P>(filename: P) -> Result<Self>
@@ -154,13 +160,15 @@ impl Pkcs11 {
                 if list.version.major >= 3 {
                     let list30_ptr: *mut cryptoki_sys::CK_FUNCTION_LIST_3_0 =
                         ifce.pFunctionList as *mut cryptoki_sys::CK_FUNCTION_LIST_3_0;
-                    return Ok(Pkcs11 {
-                        impl_: Arc::new(Pkcs11Impl {
-                            _pkcs11_lib: pkcs11_lib,
-                            function_list: FunctionList::V3_0(*list30_ptr),
-                        }),
-                        initialized: Arc::new(RwLock::new(false)),
-                    });
+                return Ok(Pkcs11 {
+                    impl_: Arc::new(Pkcs11Impl {
+                        _pkcs11_lib: pkcs11_lib,
+                        function_list: FunctionList::V3_0(*list30_ptr),
+                    }),
+                    initialized: Arc::new(RwLock::new(false)),
+                    finalize_on_drop: true,
+                });
+
                 }
                 /* fall back to the 2.* API */
             }
@@ -179,7 +187,9 @@ impl Pkcs11 {
                 function_list: FunctionList::V2(v2tov3(*list_ptr)),
             }),
             initialized: Arc::new(RwLock::new(false)),
+            finalize_on_drop: true,
         })
+
     }
 
     /// Initialize the PKCS11 library
@@ -217,6 +227,16 @@ impl Pkcs11 {
     pub fn is_fn_supported(&self, function: Function) -> bool {
         is_fn_supported(self, function)
     }
+    /// Create a `Pkcs11` instance that does NOT automatically call `C_Finalize` when dropped.
+    /// This is useful in environments (e.g., C++ wrappers) where PKCS#11 is initialized externally.
+    pub fn new_no_finalize<P: AsRef<Path>>(library_path: P) -> Result<Self> {
+        let pkcs11_lib = unsafe { cryptoki_sys::Pkcs11::new(library_path.as_ref()) }?;
+
+        let mut instance = unsafe { Self::_new(pkcs11_lib)? };
+        instance.finalize_on_drop = false;
+        Ok(instance)
+    }
+
 }
 
 /// This would be great to be From/Into, but it would have to live inside of the cryptoki-sys