Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port 0.6 changes #210

Merged
merged 3 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cryptoki/src/context/general_purpose.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion cryptoki/src/slot/token_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cryptoki/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<UtcTime> {
// 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()?,
Expand Down
Loading