fix: unsafe code

Nitrokey · Sep 25, 2023 · 51a534c · 51a534c
1 parent 95f21ec
commit 51a534c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pkcs11/Cargo.toml b/pkcs11/Cargo.toml
@@ -12,7 +12,6 @@ env_logger = { default-features = false, version = "0.10.0", features = [
   "auto-color",
   "humantime",
 ] }
-libc = { default-features = false, version = "0.2.80" }
 cryptoki-sys = "0.1.6"
 log = "0.4.19"
 merge = { features = [

diff --git a/pkcs11/src/api/generation.rs b/pkcs11/src/api/generation.rs
@@ -127,14 +127,6 @@ pub extern "C" fn C_GenerateKeyPair(
         )
     };
 
-    public_template.iter().for_each(|attr| {
-        trace!(
-            "Public template: {:?}, {:?}",
-            attr.type_(),
-            attr.val_bytes()
-        );
-    });
-
     let keys = match session.generate_key(&private_template, Some(&public_template), &mech) {
         Ok(keys) => keys,
         Err(e) => {

diff --git a/pkcs11/src/api/object.rs b/pkcs11/src/api/object.rs
@@ -55,13 +55,11 @@ pub extern "C" fn C_FindObjects(
     };
     trace!("C_FindObjects() objects: {:?}", objects);
 
+    let returned_count = objects.len();
+
     unsafe {
-        std::ptr::copy_nonoverlapping(
-            objects.as_ptr(),
-            phObject,
-            objects.len().min(ulMaxObjectCount as usize),
-        );
-        std::ptr::write(pulObjectCount, objects.len() as CK_ULONG);
+        std::ptr::copy_nonoverlapping(objects.as_ptr(), phObject, returned_count);
+        std::ptr::write(pulObjectCount, returned_count as CK_ULONG);
     }
 
     cryptoki_sys::CKR_OK

diff --git a/pkcs11/src/api/session.rs b/pkcs11/src/api/session.rs
@@ -40,7 +40,7 @@ pub extern "C" fn C_OpenSession(
     trace!("C_OpenSession() created session: {:?}", session);
 
     unsafe {
-        *phSession = session;
+        std::ptr::write(phSession, session);
     }
 
     cryptoki_sys::CKR_OK

diff --git a/pkcs11/src/data.rs b/pkcs11/src/data.rs
@@ -18,8 +18,7 @@ lazy_static! {
     pub static ref DEVICE: Device = match config::initialization::initialize_configuration() {
         Ok(config) => config,
         Err(e) => {
-            eprintln!("Error initializing configuration: {:?}", e);
-            unsafe { libc::exit(1) }
+            panic!("Error initializing configuration: {:?}", e);
         }
     };
     pub static ref SESSION_MANAGER : Arc<Mutex<SessionManager>> =  Arc::new(Mutex::new(SessionManager::new()));