diff --git a/Cargo.lock b/Cargo.lock index 951eaa96..d0232fee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.71.1" +version = "0.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +checksum = "4f72209734318d0b619a5e0f5129918b848c416e122a3c4ce054e03cb87b726f" dependencies = [ "bitflags 2.4.2", "cexpr", diff --git a/cryptoki-sys/Cargo.toml b/cryptoki-sys/Cargo.toml index 0dbecd81..1a1b1f21 100644 --- a/cryptoki-sys/Cargo.toml +++ b/cryptoki-sys/Cargo.toml @@ -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" diff --git a/cryptoki-sys/src/bindings/aarch64-apple-darwin.rs b/cryptoki-sys/src/bindings/aarch64-apple-darwin.rs index be845490..f508810d 100644 --- a/cryptoki-sys/src/bindings/aarch64-apple-darwin.rs +++ b/cryptoki-sys/src/bindings/aarch64-apple-darwin.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/aarch64-unknown-linux-gnu.rs b/cryptoki-sys/src/bindings/aarch64-unknown-linux-gnu.rs index be845490..f508810d 100644 --- a/cryptoki-sys/src/bindings/aarch64-unknown-linux-gnu.rs +++ b/cryptoki-sys/src/bindings/aarch64-unknown-linux-gnu.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/arm-unknown-linux-gnueabi.rs b/cryptoki-sys/src/bindings/arm-unknown-linux-gnueabi.rs index d1fe14f6..c6d1e04f 100644 --- a/cryptoki-sys/src/bindings/arm-unknown-linux-gnueabi.rs +++ b/cryptoki-sys/src/bindings/arm-unknown-linux-gnueabi.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/generic.rs b/cryptoki-sys/src/bindings/generic.rs index 3acb014b..366382e4 100644 --- a/cryptoki-sys/src/bindings/generic.rs +++ b/cryptoki-sys/src/bindings/generic.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/i686-unknown-linux-gnu.rs b/cryptoki-sys/src/bindings/i686-unknown-linux-gnu.rs index d1fe14f6..c6d1e04f 100644 --- a/cryptoki-sys/src/bindings/i686-unknown-linux-gnu.rs +++ b/cryptoki-sys/src/bindings/i686-unknown-linux-gnu.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/loongarch64-unknown-linux-gnu.rs b/cryptoki-sys/src/bindings/loongarch64-unknown-linux-gnu.rs index be845490..f508810d 100644 --- a/cryptoki-sys/src/bindings/loongarch64-unknown-linux-gnu.rs +++ b/cryptoki-sys/src/bindings/loongarch64-unknown-linux-gnu.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/powerpc64-unknown-linux-gnu.rs b/cryptoki-sys/src/bindings/powerpc64-unknown-linux-gnu.rs index be845490..f508810d 100644 --- a/cryptoki-sys/src/bindings/powerpc64-unknown-linux-gnu.rs +++ b/cryptoki-sys/src/bindings/powerpc64-unknown-linux-gnu.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/riscv64gc-unknown-linux-gnu.rs b/cryptoki-sys/src/bindings/riscv64gc-unknown-linux-gnu.rs index be845490..f508810d 100644 --- a/cryptoki-sys/src/bindings/riscv64gc-unknown-linux-gnu.rs +++ b/cryptoki-sys/src/bindings/riscv64gc-unknown-linux-gnu.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/x86_64-apple-darwin.rs b/cryptoki-sys/src/bindings/x86_64-apple-darwin.rs index be845490..f508810d 100644 --- a/cryptoki-sys/src/bindings/x86_64-apple-darwin.rs +++ b/cryptoki-sys/src/bindings/x86_64-apple-darwin.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/x86_64-pc-windows-msvc.rs b/cryptoki-sys/src/bindings/x86_64-pc-windows-msvc.rs index 270aa7f1..0b338900 100644 --- a/cryptoki-sys/src/bindings/x86_64-pc-windows-msvc.rs +++ b/cryptoki-sys/src/bindings/x86_64-pc-windows-msvc.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/x86_64-unknown-freebsd.rs b/cryptoki-sys/src/bindings/x86_64-unknown-freebsd.rs index be845490..f508810d 100644 --- a/cryptoki-sys/src/bindings/x86_64-unknown-freebsd.rs +++ b/cryptoki-sys/src/bindings/x86_64-unknown-freebsd.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/src/bindings/x86_64-unknown-linux-gnu.rs b/cryptoki-sys/src/bindings/x86_64-unknown-linux-gnu.rs index be845490..f508810d 100644 --- a/cryptoki-sys/src/bindings/x86_64-unknown-linux-gnu.rs +++ b/cryptoki-sys/src/bindings/x86_64-unknown-linux-gnu.rs @@ -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; @@ -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, @@ -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, diff --git a/cryptoki-sys/vendor/README.md b/cryptoki-sys/vendor/README.md index c7c12ff9..e14a1861 100644 --- a/cryptoki-sys/vendor/README.md +++ b/cryptoki-sys/vendor/README.md @@ -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 ``` diff --git a/cryptoki-sys/vendor/pkcs11.h b/cryptoki-sys/vendor/pkcs11.h index 4140fd70..6be07a00 100644 --- a/cryptoki-sys/vendor/pkcs11.h +++ b/cryptoki-sys/vendor/pkcs11.h @@ -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) */ @@ -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 *);