Bump bindgen and generate bindings to 2.4.6 TSS library

The x86_64-unknown-linux-gnu.rs bindings are already generated from 2.4.6 version of the library. This patch generates the other target bindings for the same version. In order to avoid any breaking changes, the new bindings generated are manually edited. Bidgen is also updated to the 0.66.1 which introduces minor changes. Signed-off-by: Gowtham Suresh Kumar <[email protected]>
parallaxsecond · Oct 3, 2023 · b1b5014 · b1b5014
1 parent 17992d4
commit b1b5014
Show file tree

Hide file tree

Showing 6 changed files with 503 additions and 414 deletions.
diff --git a/tss-esapi-sys/Cargo.toml b/tss-esapi-sys/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/crate/tss-esapi-sys"
 links = "tss2-esys"
 
 [build-dependencies]
-bindgen = { version = "0.63.0", optional = true }
+bindgen = { version = "0.66.1", optional = true }
 pkg-config = "0.3.18"
 target-lexicon = "0.12.0"
 

diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs
@@ -4,7 +4,7 @@
 #[cfg(feature = "generate-bindings")]
 use std::path::PathBuf;
 
-const MINIMUM_VERSION: &str = "2.3.3";
+const MINIMUM_VERSION: &str = "2.4.6";
 
 fn main() {
     if std::env::var("DOCS_RS").is_ok() {
@@ -100,7 +100,6 @@ pub fn generate_from_system(esapi_out: PathBuf) {
         .clang_arg(format!("-I{}/tss2/", tss2_esys_include_path))
         .clang_arg(format!("-I{}/tss2/", tss2_tctildr_include_path))
         .clang_arg(format!("-I{}/tss2/", tss2_mu_include_path))
-        .rustfmt_bindings(true)
         .header(format!("{}/tss2/tss2_esys.h", tss2_esys_include_path))
         .header(format!("{}/tss2/tss2_tctildr.h", tss2_tctildr_include_path))
         .header(format!("{}/tss2/tss2_mu.h", tss2_mu_include_path))

diff --git a/tss-esapi-sys/regenerate-bindings.sh b/tss-esapi-sys/regenerate-bindings.sh
@@ -11,7 +11,7 @@ set -euf -o pipefail
 OPENSSL_GIT="https://github.com/openssl/openssl.git"
 OPENSSL_VERSION="OpenSSL_1_1_1j"
 TPM2_TSS_GIT="https://github.com/tpm2-software/tpm2-tss.git"
-TPM2_TSS_VERSION="2.3.3"
+TPM2_TSS_VERSION="2.4.6"
 
 export SYSROOT="/tmp/sysroot"
 
@@ -103,4 +103,4 @@ cross-compile-tpm2-tss arm-linux-gnueabi
 rustup target add armv7-unknown-linux-gnueabi
 cargo clean
 cargo build --features generate-bindings --target armv7-unknown-linux-gnueabi
-find ../target -name tss_esapi_bindings.rs -exec cp {} ./src/bindings/arm-unknown-linux-gnueabi.rs \;
+find ../target -name tss_esapi_bindings.rs -exec cp {} ./src/bindings/arm-unknown-linux-gnueabi.rs \;
diff --git a/tss-esapi-sys/src/bindings/aarch64-unknown-linux-gnu.rs b/tss-esapi-sys/src/bindings/aarch64-unknown-linux-gnu.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.63.0 */
+/* automatically generated by rust-bindgen 0.66.1 */
 
 pub const _STDINT_H: u32 = 1;
 pub const _FEATURES_H: u32 = 1;
@@ -118,6 +118,30 @@ pub const TSS2_BASE_RC_BAD_TR: u32 = 24;
 pub const TSS2_BASE_RC_MULTIPLE_DECRYPT_SESSIONS: u32 = 25;
 pub const TSS2_BASE_RC_MULTIPLE_ENCRYPT_SESSIONS: u32 = 26;
 pub const TSS2_BASE_RC_RSP_AUTH_FAILED: u32 = 27;
+pub const TSS2_BASE_RC_NO_CONFIG: u32 = 28;
+pub const TSS2_BASE_RC_BAD_PATH: u32 = 29;
+pub const TSS2_BASE_RC_NOT_DELETABLE: u32 = 30;
+pub const TSS2_BASE_RC_PATH_ALREADY_EXISTS: u32 = 31;
+pub const TSS2_BASE_RC_KEY_NOT_FOUND: u32 = 32;
+pub const TSS2_BASE_RC_SIGNATURE_VERIFICATION_FAILED: u32 = 33;
+pub const TSS2_BASE_RC_HASH_MISMATCH: u32 = 34;
+pub const TSS2_BASE_RC_KEY_NOT_DUPLICABLE: u32 = 35;
+pub const TSS2_BASE_RC_PATH_NOT_FOUND: u32 = 36;
+pub const TSS2_BASE_RC_NO_CERT: u32 = 37;
+pub const TSS2_BASE_RC_NO_PCR: u32 = 38;
+pub const TSS2_BASE_RC_PCR_NOT_RESETTABLE: u32 = 39;
+pub const TSS2_BASE_RC_BAD_TEMPLATE: u32 = 40;
+pub const TSS2_BASE_RC_AUTHORIZATION_FAILED: u32 = 41;
+pub const TSS2_BASE_RC_AUTHORIZATION_UNKNOWN: u32 = 42;
+pub const TSS2_BASE_RC_NV_NOT_READABLE: u32 = 43;
+pub const TSS2_BASE_RC_NV_TOO_SMALL: u32 = 44;
+pub const TSS2_BASE_RC_NV_NOT_WRITEABLE: u32 = 45;
+pub const TSS2_BASE_RC_POLICY_UNKNOWN: u32 = 46;
+pub const TSS2_BASE_RC_NV_WRONG_TYPE: u32 = 47;
+pub const TSS2_BASE_RC_NAME_ALREADY_EXISTS: u32 = 48;
+pub const TSS2_BASE_RC_NO_TPM: u32 = 49;
+pub const TSS2_BASE_RC_BAD_KEY: u32 = 50;
+pub const TSS2_BASE_RC_NO_HANDLE: u32 = 51;
 pub const TSS2_LAYER_IMPLEMENTATION_SPECIFIC_OFFSET: u32 = 63488;
 pub const TSS2_LEVEL_IMPLEMENTATION_SPECIFIC_SHIFT: u32 = 11;
 pub const TPM2_MAX_COMMAND_SIZE: u32 = 4096;
@@ -166,7 +190,7 @@ pub const POLLHUP: u32 = 16;
 pub const POLLNVAL: u32 = 32;
 pub const TSS2_TCTI_TIMEOUT_BLOCK: i32 = -1;
 pub const TSS2_TCTI_TIMEOUT_NONE: u32 = 0;
-pub const TSS2_TCTI_INFO_SYMBOL: &[u8; 15usize] = b"Tss2_Tcti_Info\0";
+pub const TSS2_TCTI_INFO_SYMBOL: &[u8; 15] = b"Tss2_Tcti_Info\0";
 pub const TSS2_SYS_MAX_SESSIONS: u32 = 3;
 pub const ESYS_TR_NONE: u32 = 4095;
 pub const ESYS_TR_PASSWORD: u32 = 255;
@@ -212,128 +236,128 @@ pub const ESYS_TR_RH_AUTH_FIRST: u32 = 272;
 pub const ESYS_TR_MIN_OBJECT: u32 = 4096;
 pub const _INTTYPES_H: u32 = 1;
 pub const ____gwchar_t_defined: u32 = 1;
-pub const __PRI64_PREFIX: &[u8; 3usize] = b"ll\0";
-pub const PRId8: &[u8; 2usize] = b"d\0";
-pub const PRId16: &[u8; 2usize] = b"d\0";
-pub const PRId32: &[u8; 2usize] = b"d\0";
-pub const PRId64: &[u8; 4usize] = b"lld\0";
-pub const PRIdLEAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST16: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST32: &[u8; 2usize] = b"d\0";
-pub const PRIdLEAST64: &[u8; 4usize] = b"lld\0";
-pub const PRIdFAST8: &[u8; 2usize] = b"d\0";
-pub const PRIdFAST64: &[u8; 4usize] = b"lld\0";
-pub const PRIi8: &[u8; 2usize] = b"i\0";
-pub const PRIi16: &[u8; 2usize] = b"i\0";
-pub const PRIi32: &[u8; 2usize] = b"i\0";
-pub const PRIi64: &[u8; 4usize] = b"lli\0";
-pub const PRIiLEAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST16: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST32: &[u8; 2usize] = b"i\0";
-pub const PRIiLEAST64: &[u8; 4usize] = b"lli\0";
-pub const PRIiFAST8: &[u8; 2usize] = b"i\0";
-pub const PRIiFAST64: &[u8; 4usize] = b"lli\0";
-pub const PRIo8: &[u8; 2usize] = b"o\0";
-pub const PRIo16: &[u8; 2usize] = b"o\0";
-pub const PRIo32: &[u8; 2usize] = b"o\0";
-pub const PRIo64: &[u8; 4usize] = b"llo\0";
-pub const PRIoLEAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST16: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST32: &[u8; 2usize] = b"o\0";
-pub const PRIoLEAST64: &[u8; 4usize] = b"llo\0";
-pub const PRIoFAST8: &[u8; 2usize] = b"o\0";
-pub const PRIoFAST64: &[u8; 4usize] = b"llo\0";
-pub const PRIu8: &[u8; 2usize] = b"u\0";
-pub const PRIu16: &[u8; 2usize] = b"u\0";
-pub const PRIu32: &[u8; 2usize] = b"u\0";
-pub const PRIu64: &[u8; 4usize] = b"llu\0";
-pub const PRIuLEAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST16: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST32: &[u8; 2usize] = b"u\0";
-pub const PRIuLEAST64: &[u8; 4usize] = b"llu\0";
-pub const PRIuFAST8: &[u8; 2usize] = b"u\0";
-pub const PRIuFAST64: &[u8; 4usize] = b"llu\0";
-pub const PRIx8: &[u8; 2usize] = b"x\0";
-pub const PRIx16: &[u8; 2usize] = b"x\0";
-pub const PRIx32: &[u8; 2usize] = b"x\0";
-pub const PRIx64: &[u8; 4usize] = b"llx\0";
-pub const PRIxLEAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST16: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST32: &[u8; 2usize] = b"x\0";
-pub const PRIxLEAST64: &[u8; 4usize] = b"llx\0";
-pub const PRIxFAST8: &[u8; 2usize] = b"x\0";
-pub const PRIxFAST64: &[u8; 4usize] = b"llx\0";
-pub const PRIX8: &[u8; 2usize] = b"X\0";
-pub const PRIX16: &[u8; 2usize] = b"X\0";
-pub const PRIX32: &[u8; 2usize] = b"X\0";
-pub const PRIX64: &[u8; 4usize] = b"llX\0";
-pub const PRIXLEAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST16: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST32: &[u8; 2usize] = b"X\0";
-pub const PRIXLEAST64: &[u8; 4usize] = b"llX\0";
-pub const PRIXFAST8: &[u8; 2usize] = b"X\0";
-pub const PRIXFAST64: &[u8; 4usize] = b"llX\0";
-pub const PRIdMAX: &[u8; 4usize] = b"lld\0";
-pub const PRIiMAX: &[u8; 4usize] = b"lli\0";
-pub const PRIoMAX: &[u8; 4usize] = b"llo\0";
-pub const PRIuMAX: &[u8; 4usize] = b"llu\0";
-pub const PRIxMAX: &[u8; 4usize] = b"llx\0";
-pub const PRIXMAX: &[u8; 4usize] = b"llX\0";
-pub const SCNd8: &[u8; 4usize] = b"hhd\0";
-pub const SCNd16: &[u8; 3usize] = b"hd\0";
-pub const SCNd32: &[u8; 2usize] = b"d\0";
-pub const SCNd64: &[u8; 4usize] = b"lld\0";
-pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0";
-pub const SCNdLEAST32: &[u8; 2usize] = b"d\0";
-pub const SCNdLEAST64: &[u8; 4usize] = b"lld\0";
-pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0";
-pub const SCNdFAST64: &[u8; 4usize] = b"lld\0";
-pub const SCNi8: &[u8; 4usize] = b"hhi\0";
-pub const SCNi16: &[u8; 3usize] = b"hi\0";
-pub const SCNi32: &[u8; 2usize] = b"i\0";
-pub const SCNi64: &[u8; 4usize] = b"lli\0";
-pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0";
-pub const SCNiLEAST32: &[u8; 2usize] = b"i\0";
-pub const SCNiLEAST64: &[u8; 4usize] = b"lli\0";
-pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0";
-pub const SCNiFAST64: &[u8; 4usize] = b"lli\0";
-pub const SCNu8: &[u8; 4usize] = b"hhu\0";
-pub const SCNu16: &[u8; 3usize] = b"hu\0";
-pub const SCNu32: &[u8; 2usize] = b"u\0";
-pub const SCNu64: &[u8; 4usize] = b"llu\0";
-pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0";
-pub const SCNuLEAST32: &[u8; 2usize] = b"u\0";
-pub const SCNuLEAST64: &[u8; 4usize] = b"llu\0";
-pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0";
-pub const SCNuFAST64: &[u8; 4usize] = b"llu\0";
-pub const SCNo8: &[u8; 4usize] = b"hho\0";
-pub const SCNo16: &[u8; 3usize] = b"ho\0";
-pub const SCNo32: &[u8; 2usize] = b"o\0";
-pub const SCNo64: &[u8; 4usize] = b"llo\0";
-pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0";
-pub const SCNoLEAST32: &[u8; 2usize] = b"o\0";
-pub const SCNoLEAST64: &[u8; 4usize] = b"llo\0";
-pub const SCNoFAST8: &[u8; 4usize] = b"hho\0";
-pub const SCNoFAST64: &[u8; 4usize] = b"llo\0";
-pub const SCNx8: &[u8; 4usize] = b"hhx\0";
-pub const SCNx16: &[u8; 3usize] = b"hx\0";
-pub const SCNx32: &[u8; 2usize] = b"x\0";
-pub const SCNx64: &[u8; 4usize] = b"llx\0";
-pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0";
-pub const SCNxLEAST32: &[u8; 2usize] = b"x\0";
-pub const SCNxLEAST64: &[u8; 4usize] = b"llx\0";
-pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0";
-pub const SCNxFAST64: &[u8; 4usize] = b"llx\0";
-pub const SCNdMAX: &[u8; 4usize] = b"lld\0";
-pub const SCNiMAX: &[u8; 4usize] = b"lli\0";
-pub const SCNoMAX: &[u8; 4usize] = b"llo\0";
-pub const SCNuMAX: &[u8; 4usize] = b"llu\0";
-pub const SCNxMAX: &[u8; 4usize] = b"llx\0";
+pub const __PRI64_PREFIX: &[u8; 3] = b"ll\0";
+pub const PRId8: &[u8; 2] = b"d\0";
+pub const PRId16: &[u8; 2] = b"d\0";
+pub const PRId32: &[u8; 2] = b"d\0";
+pub const PRId64: &[u8; 4] = b"lld\0";
+pub const PRIdLEAST8: &[u8; 2] = b"d\0";
+pub const PRIdLEAST16: &[u8; 2] = b"d\0";
+pub const PRIdLEAST32: &[u8; 2] = b"d\0";
+pub const PRIdLEAST64: &[u8; 4] = b"lld\0";
+pub const PRIdFAST8: &[u8; 2] = b"d\0";
+pub const PRIdFAST64: &[u8; 4] = b"lld\0";
+pub const PRIi8: &[u8; 2] = b"i\0";
+pub const PRIi16: &[u8; 2] = b"i\0";
+pub const PRIi32: &[u8; 2] = b"i\0";
+pub const PRIi64: &[u8; 4] = b"lli\0";
+pub const PRIiLEAST8: &[u8; 2] = b"i\0";
+pub const PRIiLEAST16: &[u8; 2] = b"i\0";
+pub const PRIiLEAST32: &[u8; 2] = b"i\0";
+pub const PRIiLEAST64: &[u8; 4] = b"lli\0";
+pub const PRIiFAST8: &[u8; 2] = b"i\0";
+pub const PRIiFAST64: &[u8; 4] = b"lli\0";
+pub const PRIo8: &[u8; 2] = b"o\0";
+pub const PRIo16: &[u8; 2] = b"o\0";
+pub const PRIo32: &[u8; 2] = b"o\0";
+pub const PRIo64: &[u8; 4] = b"llo\0";
+pub const PRIoLEAST8: &[u8; 2] = b"o\0";
+pub const PRIoLEAST16: &[u8; 2] = b"o\0";
+pub const PRIoLEAST32: &[u8; 2] = b"o\0";
+pub const PRIoLEAST64: &[u8; 4] = b"llo\0";
+pub const PRIoFAST8: &[u8; 2] = b"o\0";
+pub const PRIoFAST64: &[u8; 4] = b"llo\0";
+pub const PRIu8: &[u8; 2] = b"u\0";
+pub const PRIu16: &[u8; 2] = b"u\0";
+pub const PRIu32: &[u8; 2] = b"u\0";
+pub const PRIu64: &[u8; 4] = b"llu\0";
+pub const PRIuLEAST8: &[u8; 2] = b"u\0";
+pub const PRIuLEAST16: &[u8; 2] = b"u\0";
+pub const PRIuLEAST32: &[u8; 2] = b"u\0";
+pub const PRIuLEAST64: &[u8; 4] = b"llu\0";
+pub const PRIuFAST8: &[u8; 2] = b"u\0";
+pub const PRIuFAST64: &[u8; 4] = b"llu\0";
+pub const PRIx8: &[u8; 2] = b"x\0";
+pub const PRIx16: &[u8; 2] = b"x\0";
+pub const PRIx32: &[u8; 2] = b"x\0";
+pub const PRIx64: &[u8; 4] = b"llx\0";
+pub const PRIxLEAST8: &[u8; 2] = b"x\0";
+pub const PRIxLEAST16: &[u8; 2] = b"x\0";
+pub const PRIxLEAST32: &[u8; 2] = b"x\0";
+pub const PRIxLEAST64: &[u8; 4] = b"llx\0";
+pub const PRIxFAST8: &[u8; 2] = b"x\0";
+pub const PRIxFAST64: &[u8; 4] = b"llx\0";
+pub const PRIX8: &[u8; 2] = b"X\0";
+pub const PRIX16: &[u8; 2] = b"X\0";
+pub const PRIX32: &[u8; 2] = b"X\0";
+pub const PRIX64: &[u8; 4] = b"llX\0";
+pub const PRIXLEAST8: &[u8; 2] = b"X\0";
+pub const PRIXLEAST16: &[u8; 2] = b"X\0";
+pub const PRIXLEAST32: &[u8; 2] = b"X\0";
+pub const PRIXLEAST64: &[u8; 4] = b"llX\0";
+pub const PRIXFAST8: &[u8; 2] = b"X\0";
+pub const PRIXFAST64: &[u8; 4] = b"llX\0";
+pub const PRIdMAX: &[u8; 4] = b"lld\0";
+pub const PRIiMAX: &[u8; 4] = b"lli\0";
+pub const PRIoMAX: &[u8; 4] = b"llo\0";
+pub const PRIuMAX: &[u8; 4] = b"llu\0";
+pub const PRIxMAX: &[u8; 4] = b"llx\0";
+pub const PRIXMAX: &[u8; 4] = b"llX\0";
+pub const SCNd8: &[u8; 4] = b"hhd\0";
+pub const SCNd16: &[u8; 3] = b"hd\0";
+pub const SCNd32: &[u8; 2] = b"d\0";
+pub const SCNd64: &[u8; 4] = b"lld\0";
+pub const SCNdLEAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdLEAST16: &[u8; 3] = b"hd\0";
+pub const SCNdLEAST32: &[u8; 2] = b"d\0";
+pub const SCNdLEAST64: &[u8; 4] = b"lld\0";
+pub const SCNdFAST8: &[u8; 4] = b"hhd\0";
+pub const SCNdFAST64: &[u8; 4] = b"lld\0";
+pub const SCNi8: &[u8; 4] = b"hhi\0";
+pub const SCNi16: &[u8; 3] = b"hi\0";
+pub const SCNi32: &[u8; 2] = b"i\0";
+pub const SCNi64: &[u8; 4] = b"lli\0";
+pub const SCNiLEAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiLEAST16: &[u8; 3] = b"hi\0";
+pub const SCNiLEAST32: &[u8; 2] = b"i\0";
+pub const SCNiLEAST64: &[u8; 4] = b"lli\0";
+pub const SCNiFAST8: &[u8; 4] = b"hhi\0";
+pub const SCNiFAST64: &[u8; 4] = b"lli\0";
+pub const SCNu8: &[u8; 4] = b"hhu\0";
+pub const SCNu16: &[u8; 3] = b"hu\0";
+pub const SCNu32: &[u8; 2] = b"u\0";
+pub const SCNu64: &[u8; 4] = b"llu\0";
+pub const SCNuLEAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuLEAST16: &[u8; 3] = b"hu\0";
+pub const SCNuLEAST32: &[u8; 2] = b"u\0";
+pub const SCNuLEAST64: &[u8; 4] = b"llu\0";
+pub const SCNuFAST8: &[u8; 4] = b"hhu\0";
+pub const SCNuFAST64: &[u8; 4] = b"llu\0";
+pub const SCNo8: &[u8; 4] = b"hho\0";
+pub const SCNo16: &[u8; 3] = b"ho\0";
+pub const SCNo32: &[u8; 2] = b"o\0";
+pub const SCNo64: &[u8; 4] = b"llo\0";
+pub const SCNoLEAST8: &[u8; 4] = b"hho\0";
+pub const SCNoLEAST16: &[u8; 3] = b"ho\0";
+pub const SCNoLEAST32: &[u8; 2] = b"o\0";
+pub const SCNoLEAST64: &[u8; 4] = b"llo\0";
+pub const SCNoFAST8: &[u8; 4] = b"hho\0";
+pub const SCNoFAST64: &[u8; 4] = b"llo\0";
+pub const SCNx8: &[u8; 4] = b"hhx\0";
+pub const SCNx16: &[u8; 3] = b"hx\0";
+pub const SCNx32: &[u8; 2] = b"x\0";
+pub const SCNx64: &[u8; 4] = b"llx\0";
+pub const SCNxLEAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxLEAST16: &[u8; 3] = b"hx\0";
+pub const SCNxLEAST32: &[u8; 2] = b"x\0";
+pub const SCNxLEAST64: &[u8; 4] = b"llx\0";
+pub const SCNxFAST8: &[u8; 4] = b"hhx\0";
+pub const SCNxFAST64: &[u8; 4] = b"llx\0";
+pub const SCNdMAX: &[u8; 4] = b"lld\0";
+pub const SCNiMAX: &[u8; 4] = b"lli\0";
+pub const SCNoMAX: &[u8; 4] = b"llo\0";
+pub const SCNuMAX: &[u8; 4] = b"llu\0";
+pub const SCNxMAX: &[u8; 4] = b"llx\0";
 pub const _STDLIB_H: u32 = 1;
 pub const WNOHANG: u32 = 1;
 pub const WUNTRACED: u32 = 2;
@@ -389,7 +413,7 @@ pub const BYTE_ORDER: u32 = 1234;
 pub const _BITS_BYTESWAP_H: u32 = 1;
 pub const _BITS_UINTN_IDENTITY_H: u32 = 1;
 pub const _SYS_SELECT_H: u32 = 1;
-pub const __FD_ZERO_STOS: &[u8; 6usize] = b"stosl\0";
+pub const __FD_ZERO_STOS: &[u8; 6] = b"stosl\0";
 pub const __sigset_t_defined: u32 = 1;
 pub const __timeval_defined: u32 = 1;
 pub const _STRUCT_TIMESPEC: u32 = 1;
@@ -3441,6 +3465,7 @@ impl Default for TPMS_AUTH_RESPONSE {
 pub type TPMI_AES_KEY_BITS = TPM2_KEY_BITS;
 pub type TPMI_SM4_KEY_BITS = TPM2_KEY_BITS;
 pub type TPMI_TPM2_CAMELLIA_KEY_BITS = TPM2_KEY_BITS;
+pub type TPMI_CAMELLIA_KEY_BITS = TPM2_KEY_BITS;
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub union TPMU_SYM_KEY_BITS {
@@ -10740,6 +10765,20 @@ extern "C" {
         nonceTPM: *mut *mut TPM2B_NONCE,
     ) -> TSS2_RC;
 }
+extern "C" {
+    pub fn Esys_TR_GetTpmHandle(
+        esys_context: *mut ESYS_CONTEXT,
+        esys_handle: ESYS_TR,
+        tpm_handle: *mut TPM2_HANDLE,
+    ) -> TSS2_RC;
+}
+extern "C" {
+    pub fn Esys_TRSess_GetAuthRequired(
+        esys_context: *mut ESYS_CONTEXT,
+        esys_handle: ESYS_TR,
+        auth_needed: *mut TPMI_YES_NO,
+    ) -> TSS2_RC;
+}
 extern "C" {
     pub fn Esys_Startup(esysContext: *mut ESYS_CONTEXT, startupType: TPM2_SU) -> TSS2_RC;
 }
@@ -13785,6 +13824,12 @@ extern "C" {
 extern "C" {
     pub fn Esys_Free(__ptr: *mut ::std::os::raw::c_void);
 }
+extern "C" {
+    pub fn Esys_GetSysContext(
+        esys_context: *mut ESYS_CONTEXT,
+        sys_context: *mut *mut TSS2_SYS_CONTEXT,
+    ) -> TSS2_RC;
+}
 pub type __gwchar_t = ::std::os::raw::c_uint;
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone)]