Skip to content

Commit a7bee1b

Browse files
hug-devhug-dev
authored
Merge pull request #312 from Jakuje/pkcs11-3.2-wrap-authenticated
Fix WrapKeyAuthenticated parameter type from pkcs11 header
2 parents e702367 + 4bf190b commit a7bee1b

14 files changed

+52
-52
lines changed

‎cryptoki-sys/src/bindings/aarch64-apple-darwin.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

‎cryptoki-sys/src/bindings/aarch64-unknown-linux-gnu.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

‎cryptoki-sys/src/bindings/arm-unknown-linux-gnueabi.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

‎cryptoki-sys/src/bindings/generic.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -3718,7 +3718,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
37183718
arg3: CK_OBJECT_HANDLE,
37193719
arg4: CK_OBJECT_HANDLE,
37203720
arg5: *mut CK_BYTE,
3721-
arg6: *mut CK_ULONG,
3721+
arg6: CK_ULONG,
37223722
arg7: *mut CK_BYTE,
37233723
arg8: *mut CK_ULONG,
37243724
) -> CK_RV,
@@ -4809,7 +4809,7 @@ pub struct Pkcs11 {
48094809
arg3: CK_OBJECT_HANDLE,
48104810
arg4: CK_OBJECT_HANDLE,
48114811
arg5: *mut CK_BYTE,
4812-
arg6: *mut CK_ULONG,
4812+
arg6: CK_ULONG,
48134813
arg7: *mut CK_BYTE,
48144814
arg8: *mut CK_ULONG,
48154815
) -> CK_RV,
@@ -6215,7 +6215,7 @@ impl Pkcs11 {
62156215
arg3: CK_OBJECT_HANDLE,
62166216
arg4: CK_OBJECT_HANDLE,
62176217
arg5: *mut CK_BYTE,
6218-
arg6: *mut CK_ULONG,
6218+
arg6: CK_ULONG,
62196219
arg7: *mut CK_BYTE,
62206220
arg8: *mut CK_ULONG,
62216221
) -> CK_RV {

‎cryptoki-sys/src/bindings/i686-unknown-linux-gnu.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

‎cryptoki-sys/src/bindings/loongarch64-unknown-linux-gnu.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

‎cryptoki-sys/src/bindings/powerpc64-unknown-linux-gnu.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

‎cryptoki-sys/src/bindings/riscv64gc-unknown-linux-gnu.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

‎cryptoki-sys/src/bindings/x86_64-apple-darwin.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

‎cryptoki-sys/src/bindings/x86_64-pc-windows-msvc.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* automatically generated by rust-bindgen 0.72.0 */
1+
/* automatically generated by rust-bindgen 0.72.1 */
22

33
pub const CRYPTOKI_VERSION_MAJOR: CK_BYTE = 3;
44
pub const CRYPTOKI_VERSION_MINOR: CK_BYTE = 2;
@@ -5155,7 +5155,7 @@ pub type CK_C_WrapKeyAuthenticated = ::std::option::Option<
51555155
arg3: CK_OBJECT_HANDLE,
51565156
arg4: CK_OBJECT_HANDLE,
51575157
arg5: *mut CK_BYTE,
5158-
arg6: *mut CK_ULONG,
5158+
arg6: CK_ULONG,
51595159
arg7: *mut CK_BYTE,
51605160
arg8: *mut CK_ULONG,
51615161
) -> CK_RV,
@@ -6792,7 +6792,7 @@ pub struct Pkcs11 {
67926792
arg3: CK_OBJECT_HANDLE,
67936793
arg4: CK_OBJECT_HANDLE,
67946794
arg5: *mut CK_BYTE,
6795-
arg6: *mut CK_ULONG,
6795+
arg6: CK_ULONG,
67966796
arg7: *mut CK_BYTE,
67976797
arg8: *mut CK_ULONG,
67986798
) -> CK_RV,
@@ -8198,7 +8198,7 @@ impl Pkcs11 {
81988198
arg3: CK_OBJECT_HANDLE,
81998199
arg4: CK_OBJECT_HANDLE,
82008200
arg5: *mut CK_BYTE,
8201-
arg6: *mut CK_ULONG,
8201+
arg6: CK_ULONG,
82028202
arg7: *mut CK_BYTE,
82038203
arg8: *mut CK_ULONG,
82048204
) -> CK_RV {

0 commit comments

Comments
 (0)