- Fixed a bug in Pkcs11::new by replacing MaybeUninit::uninit() with null-assigned variables; this resolves an issue that prevented my PKCS#11 library from loading

- Ran `cargo update` to refresh crate versions
- Raised `rust-version` to 1.77 in `Cargo.toml`, since `mem::offset_of` is stabilized only in this version
- Made `basic.rs` tests compile successfully again

Author: mematthias

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cryptoki-sys"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Contributors to the Parsec project"]
 edition = '2021'
 description = "FFI wrapper around the PKCS #11 API"
@@ -10,13 +10,13 @@ categories = ["api-bindings", "external-ffi-bindings", "cryptography", "hardware
 license = "Apache-2.0"
 repository = "https://github.com/parallaxsecond/rust-cryptoki"
 documentation = "https://docs.rs/crate/cryptoki-sys"
-rust-version = "1.66.0"
+rust-version = "1.77.0"
 
 [build-dependencies]
-bindgen = { version = "0.70.1", optional = true }
+bindgen = { version = "0.72.0", optional = true }
 
 [dependencies]
-libloading = "0.8.6"
+libloading = "0.8.8"
 
 [features]
 generate-bindings = ["bindgen"]

cryptoki-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cryptoki"
-version = "0.10.0"
+version = "0.10.1"
 authors = ["Contributors to the Parsec project"]
 edition = '2021'
 description = "Rust-native wrapper around the PKCS #11 API"
@@ -10,20 +10,18 @@ categories = ["api-bindings", "external-ffi-bindings", "cryptography", "hardware
 license = "Apache-2.0"
 repository = "https://github.com/parallaxsecond/rust-cryptoki"
 documentation = "https://docs.rs/crate/cryptoki"
-rust-version = "1.66.0"
+rust-version = "1.77.0"
 
 [dependencies]
-bitflags = "1.3"
-libloading = "0.8.6"
-log = "0.4.14"
-cryptoki-sys = { path = "../cryptoki-sys", version = "0.4.0" }
-paste = "1.0.6"
+bitflags = "1.3.2"
+libloading = "0.8.8"
+log = "0.4.27"
+cryptoki-sys = { path = "../cryptoki-sys", version = "0.4.1" }
+paste = "1.0.15"
 secrecy = "0.10.3"
 
 [dev-dependencies]
-num-traits = "0.2.14"
-hex = "0.4.3"
-serial_test = "0.5.1"
+serial_test = "3.2.0"
 testresult = "0.4.1"
 
 [features]

cryptoki/Cargo.toml

@@ -32,7 +32,6 @@ use crate::error::{Error, Result, Rv};
 
 use log::error;
 use std::fmt;
-use std::mem;
 use std::path::Path;
 use std::ptr;
 use std::sync::Arc;
@@ -135,18 +134,17 @@ impl Pkcs11 {
     unsafe fn _new(pkcs11_lib: cryptoki_sys::Pkcs11) -> Result<Self> {
         /* First try the 3.0 API to get default interface. It might have some more functions than
          * the 2.4 API */
-        let mut interface = mem::MaybeUninit::uninit();
+        let mut interface: *mut cryptoki_sys::CK_INTERFACE = ptr::null_mut();
         if pkcs11_lib.C_GetInterface.is_ok() {
             Rv::from(pkcs11_lib.C_GetInterface(
                 ptr::null_mut(),
                 ptr::null_mut(),
-                interface.as_mut_ptr(),
+                &mut interface,
                 0,
             ))
             .into_result(Function::GetInterface)?;
-            if !interface.as_ptr().is_null() {
-                let ifce_ptr: *mut cryptoki_sys::CK_INTERFACE = *interface.as_ptr();
-                let ifce: cryptoki_sys::CK_INTERFACE = *ifce_ptr;
+            if !interface.is_null() {
+                let ifce: cryptoki_sys::CK_INTERFACE = *interface;
 
                 let list_ptr: *mut cryptoki_sys::CK_FUNCTION_LIST =
                     ifce.pFunctionList as *mut cryptoki_sys::CK_FUNCTION_LIST;
@@ -166,13 +164,10 @@ impl Pkcs11 {
             }
         }
 
-        let mut list = mem::MaybeUninit::uninit();
-
-        Rv::from(pkcs11_lib.C_GetFunctionList(list.as_mut_ptr()))
+        let mut list_ptr: *mut cryptoki_sys::CK_FUNCTION_LIST = ptr::null_mut();
+        Rv::from(pkcs11_lib.C_GetFunctionList(&mut list_ptr))
             .into_result(Function::GetFunctionList)?;
 
-        let list_ptr = *list.as_ptr();
-
         Ok(Pkcs11 {
             impl_: Arc::new(Pkcs11Impl {
                 _pkcs11_lib: pkcs11_lib,

cryptoki/src/context/mod.rs

@@ -4,6 +4,7 @@
 //! See: <https://docs.oasis-open.org/pkcs11/pkcs11-curr/v3.0/os/pkcs11-curr-v3.0-os.html#_Toc30061446>
 
 use core::{convert::TryInto, marker::PhantomData, ptr};
+use std::mem::size_of;
 use std::num::NonZeroUsize;
 
 use cryptoki_sys::{

cryptoki/src/mechanism/kbkdf.rs

@@ -34,7 +34,7 @@ impl Session {
             Rv::from(get_pkcs11!(self.client(), C_GenerateRandom)(
                 self.handle(),
                 result.as_mut_ptr(),
-                random_len.into(),
+                random_len,
             ))
             .into_result(Function::GenerateRandom)?;
         }

cryptoki/src/session/random.rs

@@ -10,8 +10,8 @@ use std::fmt::Debug;
 bitflags! {
     /// Collection of flags defined for [`CK_SLOT_INFO`]
     struct SlotInfoFlags: CK_FLAGS {
-        const TOKEN_PRESENT=CKF_TOKEN_PRESENT;
-        const REMOVABLE_DEVICE=CKF_REMOVABLE_DEVICE;
+        const TOKEN_PRESENT = CKF_TOKEN_PRESENT;
+        const REMOVABLE_DEVICE = CKF_REMOVABLE_DEVICE;
         const HW_SLOT = CKF_HW_SLOT;
     }
 }

cryptoki/src/slot/slot_info.rs

@@ -127,6 +127,14 @@ pub struct Ulong {
     val: CK_ULONG,
 }
 
+impl Ulong {
+    /// Create a new variable
+    #[must_use]
+    pub const fn new(ulong: CK_ULONG) -> Self {
+        Ulong { val: ulong }
+    }
+}
+
 impl Deref for Ulong {
     type Target = CK_ULONG;
 
@@ -284,7 +292,6 @@ pub type RawAuthPin = SecretBox<Vec<u8>>;
 
 #[cfg(test)]
 mod test {
-
     use super::*;
     const UTC_TIME: UtcTime = UtcTime {
         year: 1970,