Skip to content

Commit 8c8cc9e

Browse files
JakujeJakuje
committed
Fix type for the CKV_ constants
Signed-off-by: Jakub Jelen <[email protected]>
1 parent 4ec6073 commit 8c8cc9e

13 files changed

+97
-96
lines changed

‎cryptoki-sys/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ mod generate {
3131
("CKC_", "CK_CERTIFICATE_TYPE"),
3232
("CKD_", "CK_EC_KDF_TYPE"),
3333
("CKF_", "CK_FLAGS"),
34+
("CKV_", "CK_ULONG"),
3435
("CKG_MGF1_", "CK_RSA_PKCS_MGF_TYPE"),
3536
("CKG", "CK_GENERATOR_FUNCTION"),
3637
("CKH_", "CK_HW_FEATURE_TYPE"),

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,14 +1039,14 @@ pub const CKT_TRUST_MUST_VERIFY_TRUST: u32 = 4;
10391039
pub const CKU_SO: CK_USER_TYPE = 0;
10401040
pub const CKU_USER: CK_USER_TYPE = 1;
10411041
pub const CKU_CONTEXT_SPECIFIC: CK_USER_TYPE = 2;
1042-
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: u32 = 0;
1043-
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: u32 = 1;
1044-
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: u32 = 2;
1045-
pub const CKV_TYPE_UNSPECIFIED: u32 = 0;
1046-
pub const CKV_TYPE_SOFTWARE: u32 = 1;
1047-
pub const CKV_TYPE_HARDWARE: u32 = 2;
1048-
pub const CKV_TYPE_FIRMWARE: u32 = 3;
1049-
pub const CKV_TYPE_HYBRID: u32 = 4;
1042+
pub const CKV_AUTHORITY_TYPE_UNSPECIFIED: CK_ULONG = 0;
1043+
pub const CKV_AUTHORITY_TYPE_NIST_CMVP: CK_ULONG = 1;
1044+
pub const CKV_AUTHORITY_TYPE_COMMON_CRITERIA: CK_ULONG = 2;
1045+
pub const CKV_TYPE_UNSPECIFIED: CK_ULONG = 0;
1046+
pub const CKV_TYPE_SOFTWARE: CK_ULONG = 1;
1047+
pub const CKV_TYPE_HARDWARE: CK_ULONG = 2;
1048+
pub const CKV_TYPE_FIRMWARE: CK_ULONG = 3;
1049+
pub const CKV_TYPE_HYBRID: CK_ULONG = 4;
10501050
pub const CKZ_DATA_SPECIFIED: CK_RSA_PKCS_OAEP_SOURCE_TYPE = 1;
10511051
pub const CKZ_SALT_SPECIFIED: CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE = 1;
10521052
pub type CK_BBOOL = ::std::os::raw::c_uchar;

0 commit comments

Comments
 (0)