From 9d970ea1cf5611bd6642ac9534cea6661785ec62 Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Thu, 7 Mar 2024 16:31:37 +0000 Subject: [PATCH 1/3] CI: Update CI script for building all features Signed-off-by: Gowtham Suresh Kumar --- ci.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci.sh b/ci.sh index 29226ec..7797740 100755 --- a/ci.sh +++ b/ci.sh @@ -9,6 +9,8 @@ set -euf -o pipefail RUST_BACKTRACE=1 cargo build +RUST_BACKTRACE=1 cargo build --all-features + RUST_BACKTRACE=1 cargo build --target arm-unknown-linux-gnueabi RUST_BACKTRACE=1 cargo build --target armv7-unknown-linux-gnueabi RUST_BACKTRACE=1 cargo build --target armv7-unknown-linux-gnueabihf From 21f0ee6a8866dff886547a2b636b0f4fab92b1cd Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Fri, 8 Mar 2024 13:06:35 +0000 Subject: [PATCH 2/3] Fix unnecessary qualification error Signed-off-by: Gowtham Suresh Kumar --- cryptoki/src/context/general_purpose.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptoki/src/context/general_purpose.rs b/cryptoki/src/context/general_purpose.rs index 1fa44e2..a411437 100644 --- a/cryptoki/src/context/general_purpose.rs +++ b/cryptoki/src/context/general_purpose.rs @@ -17,7 +17,7 @@ pub(super) fn initialize(ctx: &Pkcs11, init_args: CInitializeArgs) -> Result<()> let init_args_ptr = &mut init_args; unsafe { Rv::from(get_pkcs11!(ctx, C_Initialize)( - init_args_ptr as *mut CK_C_INITIALIZE_ARGS as *mut ::std::ffi::c_void, + init_args_ptr as *mut CK_C_INITIALIZE_ARGS as *mut std::ffi::c_void, )) .into_result(Function::Initialize) } From ff32a33f7167b557bdf776daecdf1c14fa440acc Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Tue, 18 Jun 2024 14:24:52 +0100 Subject: [PATCH 3/3] Fix typos Signed-off-by: Gowtham Suresh Kumar --- cryptoki/src/slot/token_info.rs | 2 +- cryptoki/src/types.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cryptoki/src/slot/token_info.rs b/cryptoki/src/slot/token_info.rs index cd020d4..9653c9b 100644 --- a/cryptoki/src/slot/token_info.rs +++ b/cryptoki/src/slot/token_info.rs @@ -51,7 +51,7 @@ pub enum Limit { #[derive(Debug, Clone)] pub struct TokenInfo { // The following four strings are limited in size based on - // the orignating struct definition. Sizes are in *bytes* + // the originating struct definition. Sizes are in *bytes* // but UTF-8 data may represent fewer characters. // Original buffers were space (0x20) padded. label: String, // len <= 32 bytes diff --git a/cryptoki/src/types.rs b/cryptoki/src/types.rs index 2711bdc..1924945 100644 --- a/cryptoki/src/types.rs +++ b/cryptoki/src/types.rs @@ -261,7 +261,7 @@ impl UtcTime { // UTC time has the format YYYYMMDDhhmmss00 as ASCII digits pub(crate) fn convert_utc_time(orig: [u8; 16]) -> Result { - // Note: No validaiton of these values beyond being ASCII digits + // Note: No validation of these values beyond being ASCII digits // because PKCS#11 doesn't impose any such restrictions. Ok(UtcTime { year: std::str::from_utf8(&orig[0..4])?.parse()?,