Skip to content

fix: CK_TRUST types on 64-bit systems are ULONG, not u32 as now #361

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.

Sign up for GitHub

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

Merged
hug-dev merged 1 commit into from
Mar 22, 2026
Merged

fix: CK_TRUST types on 64-bit systems are ULONG, not u32 as now #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions cryptoki-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ mod generate {
("CKP_", "CK_PROFILE_ID"),
("CKR_", "CK_RV"),
("CKS_", "CK_STATE"),
("CKT_", "CK_TRUST"),
("CKU_", "CK_USER_TYPE"),
("CKZ_DATA_SPECIFIED", "CK_RSA_PKCS_OAEP_SOURCE_TYPE"),
("CKZ_SALT_SPECIFIED", "CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE"),
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/aarch64-apple-darwin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/aarch64-unknown-linux-gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/arm-unknown-linux-gnueabi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/generic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/i686-unknown-linux-gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/loongarch64-unknown-linux-gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/powerpc64-unknown-linux-gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/riscv64gc-unknown-linux-gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/x86_64-apple-darwin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/x86_64-pc-windows-msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/x86_64-unknown-freebsd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
10 changes: 5 additions & 5 deletions cryptoki-sys/src/bindings/x86_64-unknown-linux-gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,11 +1031,11 @@ pub const CKS_RW_PUBLIC_SESSION: CK_STATE = 2;
pub const CKS_RW_USER_FUNCTIONS: CK_STATE = 3;
pub const CKS_RW_SO_FUNCTIONS: CK_STATE = 4;
pub const CKS_LAST_VALIDATION_OK: CK_STATE = 1;
pub const CKT_TRUST_UNKNOWN: u32 = 0;
pub const CKT_TRUSTED: u32 = 1;
pub const CKT_TRUST_ANCHOR: u32 = 2;
pub const CKT_NOT_TRUSTED: u32 = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
pub const CKT_TRUST_UNKNOWN: CK_TRUST = 0;
pub const CKT_TRUSTED: CK_TRUST = 1;
pub const CKT_TRUST_ANCHOR: CK_TRUST = 2;
pub const CKT_NOT_TRUSTED: CK_TRUST = 3;
pub const CKT_TRUST_MUST_VERIFY_TRUST: CK_TRUST = 4;
pub const CKU_SO: CK_USER_TYPE = 0;
pub const CKU_USER: CK_USER_TYPE = 1;
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
Expand Down
Loading