Skip to content

Fixup PKCS#11 headers definition (C_UnwrapKey) #303

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
merged 3 commits into from
Aug 1, 2025
Merged

Fixup PKCS#11 headers definition (C_UnwrapKey) #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86c78ff
Pull latest fixes to public headers
Jakuje Jul 30, 2025
91b09b5
Update bindgen to 0.72.0
Jakuje Jul 30, 2025
4e88981
Update bindings to fix C_UnwrapKey() definition
Jakuje Jul 30, 2025
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cryptoki-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ documentation = "https://docs.rs/crate/cryptoki-sys"
rust-version = "1.77"

[build-dependencies]
bindgen = { version = "0.71.1", optional = true }
bindgen = { version = "0.72.0", optional = true }

[dependencies]
libloading = "0.8.6"
Expand Down
6 changes: 3 additions & 3 deletions cryptoki-sys/src/bindings/aarch64-apple-darwin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 deletions cryptoki-sys/src/bindings/generic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -4478,7 +4478,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -5718,7 +5718,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
6 changes: 3 additions & 3 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
@@ -1,4 +1,4 @@
/* automatically generated by rust-bindgen 0.71.1 */
/* automatically generated by rust-bindgen 0.72.0 */

pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
Expand Down Expand Up @@ -6461,7 +6461,7 @@ pub struct Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down Expand Up @@ -7701,7 +7701,7 @@ impl Pkcs11 {
arg2: *mut CK_MECHANISM,
arg3: CK_OBJECT_HANDLE,
arg4: *mut CK_BYTE,
arg5: *mut CK_ULONG,
arg5: CK_ULONG,
arg6: *mut CK_ATTRIBUTE,
arg7: CK_ULONG,
arg8: *mut CK_OBJECT_HANDLE,
Expand Down
4 changes: 2 additions & 2 deletions cryptoki-sys/vendor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Vendor

This is downloaded from https://github.com/latchset/pkcs11-headers/blob/693bdfdbe5e674a389e8f43be2de47980e50699e/public-domain/3.2/pkcs11.h:
This is downloaded from https://github.com/latchset/pkcs11-headers/blob/b5bc9abb21c05b3f29714781311caa3132527cb7/public-domain/3.2/pkcs11.h:

```shell
wget https://raw.githubusercontent.com/latchset/pkcs11-headers/693bdfdbe5e674a389e8f43be2de47980e50699e/public-domain/3.2/pkcs11.h
wget https://raw.githubusercontent.com/latchset/pkcs11-headers/b5bc9abb21c05b3f29714781311caa3132527cb7/public-domain/3.2/pkcs11.h
```
4 changes: 2 additions & 2 deletions cryptoki-sys/vendor/pkcs11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ ULONGDEF(CK_XMSS_PARAMETER_SET_TYPE);
#define CKF_EXCLUDE_PIN 0x00000010UL
#define CKF_USER_FRIENDLY_OTP 0x00000020UL

/* CKF (paramters to functions) */
/* CKF (parameters to functions) */
#define CKF_DONT_BLOCK 1

/* CKF (session) */
Expand Down Expand Up @@ -2221,7 +2221,7 @@ extern CK_RV C_GenerateKeyPair(CK_SESSION_HANDLE, CK_MECHANISM *,
extern CK_RV C_WrapKey(CK_SESSION_HANDLE, CK_MECHANISM *, CK_OBJECT_HANDLE,
CK_OBJECT_HANDLE, CK_BYTE *, CK_ULONG *);
extern CK_RV C_UnwrapKey(CK_SESSION_HANDLE, CK_MECHANISM *, CK_OBJECT_HANDLE,
CK_BYTE *, CK_ULONG *, CK_ATTRIBUTE *, CK_ULONG,
CK_BYTE *, CK_ULONG, CK_ATTRIBUTE *, CK_ULONG,
CK_OBJECT_HANDLE *);
extern CK_RV C_DeriveKey(CK_SESSION_HANDLE, CK_MECHANISM *, CK_OBJECT_HANDLE,
CK_ATTRIBUTE *, CK_ULONG, CK_OBJECT_HANDLE *);
Expand Down
Loading