Skip to content

Commit e9954e4

Browse files
committed
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]>
1 parent 17992d4 commit e9954e4

File tree

6 files changed

+503
-414
lines changed

6 files changed

+503
-414
lines changed

tss-esapi-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/crate/tss-esapi-sys"
1313
links = "tss2-esys"
1414

1515
[build-dependencies]
16-
bindgen = { version = "0.63.0", optional = true }
16+
bindgen = { version = "0.66.1", optional = true }
1717
pkg-config = "0.3.18"
1818
target-lexicon = "0.12.0"
1919

tss-esapi-sys/build.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#[cfg(feature = "generate-bindings")]
55
use std::path::PathBuf;
66

7-
const MINIMUM_VERSION: &str = "2.3.3";
7+
const MINIMUM_VERSION: &str = "2.4.6";
88

99
fn main() {
1010
if std::env::var("DOCS_RS").is_ok() {
@@ -100,7 +100,6 @@ pub fn generate_from_system(esapi_out: PathBuf) {
100100
.clang_arg(format!("-I{}/tss2/", tss2_esys_include_path))
101101
.clang_arg(format!("-I{}/tss2/", tss2_tctildr_include_path))
102102
.clang_arg(format!("-I{}/tss2/", tss2_mu_include_path))
103-
.rustfmt_bindings(true)
104103
.header(format!("{}/tss2/tss2_esys.h", tss2_esys_include_path))
105104
.header(format!("{}/tss2/tss2_tctildr.h", tss2_tctildr_include_path))
106105
.header(format!("{}/tss2/tss2_mu.h", tss2_mu_include_path))

tss-esapi-sys/regenerate-bindings.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -euf -o pipefail
1111
OPENSSL_GIT="https://github.com/openssl/openssl.git"
1212
OPENSSL_VERSION="OpenSSL_1_1_1j"
1313
TPM2_TSS_GIT="https://github.com/tpm2-software/tpm2-tss.git"
14-
TPM2_TSS_VERSION="2.3.3"
14+
TPM2_TSS_VERSION="2.4.6"
1515

1616
export SYSROOT="/tmp/sysroot"
1717

@@ -103,4 +103,4 @@ cross-compile-tpm2-tss arm-linux-gnueabi
103103
rustup target add armv7-unknown-linux-gnueabi
104104
cargo clean
105105
cargo build --features generate-bindings --target armv7-unknown-linux-gnueabi
106-
find ../target -name tss_esapi_bindings.rs -exec cp {} ./src/bindings/arm-unknown-linux-gnueabi.rs \;
106+
find ../target -name tss_esapi_bindings.rs -exec cp {} ./src/bindings/arm-unknown-linux-gnueabi.rs \;

tss-esapi-sys/src/bindings/aarch64-unknown-linux-gnu.rs

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

33
pub const _STDINT_H: u32 = 1;
44
pub const _FEATURES_H: u32 = 1;
@@ -118,6 +118,30 @@ pub const TSS2_BASE_RC_BAD_TR: u32 = 24;
118118
pub const TSS2_BASE_RC_MULTIPLE_DECRYPT_SESSIONS: u32 = 25;
119119
pub const TSS2_BASE_RC_MULTIPLE_ENCRYPT_SESSIONS: u32 = 26;
120120
pub const TSS2_BASE_RC_RSP_AUTH_FAILED: u32 = 27;
121+
pub const TSS2_BASE_RC_NO_CONFIG: u32 = 28;
122+
pub const TSS2_BASE_RC_BAD_PATH: u32 = 29;
123+
pub const TSS2_BASE_RC_NOT_DELETABLE: u32 = 30;
124+
pub const TSS2_BASE_RC_PATH_ALREADY_EXISTS: u32 = 31;
125+
pub const TSS2_BASE_RC_KEY_NOT_FOUND: u32 = 32;
126+
pub const TSS2_BASE_RC_SIGNATURE_VERIFICATION_FAILED: u32 = 33;
127+
pub const TSS2_BASE_RC_HASH_MISMATCH: u32 = 34;
128+
pub const TSS2_BASE_RC_KEY_NOT_DUPLICABLE: u32 = 35;
129+
pub const TSS2_BASE_RC_PATH_NOT_FOUND: u32 = 36;
130+
pub const TSS2_BASE_RC_NO_CERT: u32 = 37;
131+
pub const TSS2_BASE_RC_NO_PCR: u32 = 38;
132+
pub const TSS2_BASE_RC_PCR_NOT_RESETTABLE: u32 = 39;
133+
pub const TSS2_BASE_RC_BAD_TEMPLATE: u32 = 40;
134+
pub const TSS2_BASE_RC_AUTHORIZATION_FAILED: u32 = 41;
135+
pub const TSS2_BASE_RC_AUTHORIZATION_UNKNOWN: u32 = 42;
136+
pub const TSS2_BASE_RC_NV_NOT_READABLE: u32 = 43;
137+
pub const TSS2_BASE_RC_NV_TOO_SMALL: u32 = 44;
138+
pub const TSS2_BASE_RC_NV_NOT_WRITEABLE: u32 = 45;
139+
pub const TSS2_BASE_RC_POLICY_UNKNOWN: u32 = 46;
140+
pub const TSS2_BASE_RC_NV_WRONG_TYPE: u32 = 47;
141+
pub const TSS2_BASE_RC_NAME_ALREADY_EXISTS: u32 = 48;
142+
pub const TSS2_BASE_RC_NO_TPM: u32 = 49;
143+
pub const TSS2_BASE_RC_BAD_KEY: u32 = 50;
144+
pub const TSS2_BASE_RC_NO_HANDLE: u32 = 51;
121145
pub const TSS2_LAYER_IMPLEMENTATION_SPECIFIC_OFFSET: u32 = 63488;
122146
pub const TSS2_LEVEL_IMPLEMENTATION_SPECIFIC_SHIFT: u32 = 11;
123147
pub const TPM2_MAX_COMMAND_SIZE: u32 = 4096;
@@ -166,7 +190,7 @@ pub const POLLHUP: u32 = 16;
166190
pub const POLLNVAL: u32 = 32;
167191
pub const TSS2_TCTI_TIMEOUT_BLOCK: i32 = -1;
168192
pub const TSS2_TCTI_TIMEOUT_NONE: u32 = 0;
169-
pub const TSS2_TCTI_INFO_SYMBOL: &[u8; 15usize] = b"Tss2_Tcti_Info\0";
193+
pub const TSS2_TCTI_INFO_SYMBOL: &[u8; 15] = b"Tss2_Tcti_Info\0";
170194
pub const TSS2_SYS_MAX_SESSIONS: u32 = 3;
171195
pub const ESYS_TR_NONE: u32 = 4095;
172196
pub const ESYS_TR_PASSWORD: u32 = 255;
@@ -212,128 +236,128 @@ pub const ESYS_TR_RH_AUTH_FIRST: u32 = 272;
212236
pub const ESYS_TR_MIN_OBJECT: u32 = 4096;
213237
pub const _INTTYPES_H: u32 = 1;
214238
pub const ____gwchar_t_defined: u32 = 1;
215-
pub const __PRI64_PREFIX: &[u8; 3usize] = b"ll\0";
216-
pub const PRId8: &[u8; 2usize] = b"d\0";
217-
pub const PRId16: &[u8; 2usize] = b"d\0";
218-
pub const PRId32: &[u8; 2usize] = b"d\0";
219-
pub const PRId64: &[u8; 4usize] = b"lld\0";
220-
pub const PRIdLEAST8: &[u8; 2usize] = b"d\0";
221-
pub const PRIdLEAST16: &[u8; 2usize] = b"d\0";
222-
pub const PRIdLEAST32: &[u8; 2usize] = b"d\0";
223-
pub const PRIdLEAST64: &[u8; 4usize] = b"lld\0";
224-
pub const PRIdFAST8: &[u8; 2usize] = b"d\0";
225-
pub const PRIdFAST64: &[u8; 4usize] = b"lld\0";
226-
pub const PRIi8: &[u8; 2usize] = b"i\0";
227-
pub const PRIi16: &[u8; 2usize] = b"i\0";
228-
pub const PRIi32: &[u8; 2usize] = b"i\0";
229-
pub const PRIi64: &[u8; 4usize] = b"lli\0";
230-
pub const PRIiLEAST8: &[u8; 2usize] = b"i\0";
231-
pub const PRIiLEAST16: &[u8; 2usize] = b"i\0";
232-
pub const PRIiLEAST32: &[u8; 2usize] = b"i\0";
233-
pub const PRIiLEAST64: &[u8; 4usize] = b"lli\0";
234-
pub const PRIiFAST8: &[u8; 2usize] = b"i\0";
235-
pub const PRIiFAST64: &[u8; 4usize] = b"lli\0";
236-
pub const PRIo8: &[u8; 2usize] = b"o\0";
237-
pub const PRIo16: &[u8; 2usize] = b"o\0";
238-
pub const PRIo32: &[u8; 2usize] = b"o\0";
239-
pub const PRIo64: &[u8; 4usize] = b"llo\0";
240-
pub const PRIoLEAST8: &[u8; 2usize] = b"o\0";
241-
pub const PRIoLEAST16: &[u8; 2usize] = b"o\0";
242-
pub const PRIoLEAST32: &[u8; 2usize] = b"o\0";
243-
pub const PRIoLEAST64: &[u8; 4usize] = b"llo\0";
244-
pub const PRIoFAST8: &[u8; 2usize] = b"o\0";
245-
pub const PRIoFAST64: &[u8; 4usize] = b"llo\0";
246-
pub const PRIu8: &[u8; 2usize] = b"u\0";
247-
pub const PRIu16: &[u8; 2usize] = b"u\0";
248-
pub const PRIu32: &[u8; 2usize] = b"u\0";
249-
pub const PRIu64: &[u8; 4usize] = b"llu\0";
250-
pub const PRIuLEAST8: &[u8; 2usize] = b"u\0";
251-
pub const PRIuLEAST16: &[u8; 2usize] = b"u\0";
252-
pub const PRIuLEAST32: &[u8; 2usize] = b"u\0";
253-
pub const PRIuLEAST64: &[u8; 4usize] = b"llu\0";
254-
pub const PRIuFAST8: &[u8; 2usize] = b"u\0";
255-
pub const PRIuFAST64: &[u8; 4usize] = b"llu\0";
256-
pub const PRIx8: &[u8; 2usize] = b"x\0";
257-
pub const PRIx16: &[u8; 2usize] = b"x\0";
258-
pub const PRIx32: &[u8; 2usize] = b"x\0";
259-
pub const PRIx64: &[u8; 4usize] = b"llx\0";
260-
pub const PRIxLEAST8: &[u8; 2usize] = b"x\0";
261-
pub const PRIxLEAST16: &[u8; 2usize] = b"x\0";
262-
pub const PRIxLEAST32: &[u8; 2usize] = b"x\0";
263-
pub const PRIxLEAST64: &[u8; 4usize] = b"llx\0";
264-
pub const PRIxFAST8: &[u8; 2usize] = b"x\0";
265-
pub const PRIxFAST64: &[u8; 4usize] = b"llx\0";
266-
pub const PRIX8: &[u8; 2usize] = b"X\0";
267-
pub const PRIX16: &[u8; 2usize] = b"X\0";
268-
pub const PRIX32: &[u8; 2usize] = b"X\0";
269-
pub const PRIX64: &[u8; 4usize] = b"llX\0";
270-
pub const PRIXLEAST8: &[u8; 2usize] = b"X\0";
271-
pub const PRIXLEAST16: &[u8; 2usize] = b"X\0";
272-
pub const PRIXLEAST32: &[u8; 2usize] = b"X\0";
273-
pub const PRIXLEAST64: &[u8; 4usize] = b"llX\0";
274-
pub const PRIXFAST8: &[u8; 2usize] = b"X\0";
275-
pub const PRIXFAST64: &[u8; 4usize] = b"llX\0";
276-
pub const PRIdMAX: &[u8; 4usize] = b"lld\0";
277-
pub const PRIiMAX: &[u8; 4usize] = b"lli\0";
278-
pub const PRIoMAX: &[u8; 4usize] = b"llo\0";
279-
pub const PRIuMAX: &[u8; 4usize] = b"llu\0";
280-
pub const PRIxMAX: &[u8; 4usize] = b"llx\0";
281-
pub const PRIXMAX: &[u8; 4usize] = b"llX\0";
282-
pub const SCNd8: &[u8; 4usize] = b"hhd\0";
283-
pub const SCNd16: &[u8; 3usize] = b"hd\0";
284-
pub const SCNd32: &[u8; 2usize] = b"d\0";
285-
pub const SCNd64: &[u8; 4usize] = b"lld\0";
286-
pub const SCNdLEAST8: &[u8; 4usize] = b"hhd\0";
287-
pub const SCNdLEAST16: &[u8; 3usize] = b"hd\0";
288-
pub const SCNdLEAST32: &[u8; 2usize] = b"d\0";
289-
pub const SCNdLEAST64: &[u8; 4usize] = b"lld\0";
290-
pub const SCNdFAST8: &[u8; 4usize] = b"hhd\0";
291-
pub const SCNdFAST64: &[u8; 4usize] = b"lld\0";
292-
pub const SCNi8: &[u8; 4usize] = b"hhi\0";
293-
pub const SCNi16: &[u8; 3usize] = b"hi\0";
294-
pub const SCNi32: &[u8; 2usize] = b"i\0";
295-
pub const SCNi64: &[u8; 4usize] = b"lli\0";
296-
pub const SCNiLEAST8: &[u8; 4usize] = b"hhi\0";
297-
pub const SCNiLEAST16: &[u8; 3usize] = b"hi\0";
298-
pub const SCNiLEAST32: &[u8; 2usize] = b"i\0";
299-
pub const SCNiLEAST64: &[u8; 4usize] = b"lli\0";
300-
pub const SCNiFAST8: &[u8; 4usize] = b"hhi\0";
301-
pub const SCNiFAST64: &[u8; 4usize] = b"lli\0";
302-
pub const SCNu8: &[u8; 4usize] = b"hhu\0";
303-
pub const SCNu16: &[u8; 3usize] = b"hu\0";
304-
pub const SCNu32: &[u8; 2usize] = b"u\0";
305-
pub const SCNu64: &[u8; 4usize] = b"llu\0";
306-
pub const SCNuLEAST8: &[u8; 4usize] = b"hhu\0";
307-
pub const SCNuLEAST16: &[u8; 3usize] = b"hu\0";
308-
pub const SCNuLEAST32: &[u8; 2usize] = b"u\0";
309-
pub const SCNuLEAST64: &[u8; 4usize] = b"llu\0";
310-
pub const SCNuFAST8: &[u8; 4usize] = b"hhu\0";
311-
pub const SCNuFAST64: &[u8; 4usize] = b"llu\0";
312-
pub const SCNo8: &[u8; 4usize] = b"hho\0";
313-
pub const SCNo16: &[u8; 3usize] = b"ho\0";
314-
pub const SCNo32: &[u8; 2usize] = b"o\0";
315-
pub const SCNo64: &[u8; 4usize] = b"llo\0";
316-
pub const SCNoLEAST8: &[u8; 4usize] = b"hho\0";
317-
pub const SCNoLEAST16: &[u8; 3usize] = b"ho\0";
318-
pub const SCNoLEAST32: &[u8; 2usize] = b"o\0";
319-
pub const SCNoLEAST64: &[u8; 4usize] = b"llo\0";
320-
pub const SCNoFAST8: &[u8; 4usize] = b"hho\0";
321-
pub const SCNoFAST64: &[u8; 4usize] = b"llo\0";
322-
pub const SCNx8: &[u8; 4usize] = b"hhx\0";
323-
pub const SCNx16: &[u8; 3usize] = b"hx\0";
324-
pub const SCNx32: &[u8; 2usize] = b"x\0";
325-
pub const SCNx64: &[u8; 4usize] = b"llx\0";
326-
pub const SCNxLEAST8: &[u8; 4usize] = b"hhx\0";
327-
pub const SCNxLEAST16: &[u8; 3usize] = b"hx\0";
328-
pub const SCNxLEAST32: &[u8; 2usize] = b"x\0";
329-
pub const SCNxLEAST64: &[u8; 4usize] = b"llx\0";
330-
pub const SCNxFAST8: &[u8; 4usize] = b"hhx\0";
331-
pub const SCNxFAST64: &[u8; 4usize] = b"llx\0";
332-
pub const SCNdMAX: &[u8; 4usize] = b"lld\0";
333-
pub const SCNiMAX: &[u8; 4usize] = b"lli\0";
334-
pub const SCNoMAX: &[u8; 4usize] = b"llo\0";
335-
pub const SCNuMAX: &[u8; 4usize] = b"llu\0";
336-
pub const SCNxMAX: &[u8; 4usize] = b"llx\0";
239+
pub const __PRI64_PREFIX: &[u8; 3] = b"ll\0";
240+
pub const PRId8: &[u8; 2] = b"d\0";
241+
pub const PRId16: &[u8; 2] = b"d\0";
242+
pub const PRId32: &[u8; 2] = b"d\0";
243+
pub const PRId64: &[u8; 4] = b"lld\0";
244+
pub const PRIdLEAST8: &[u8; 2] = b"d\0";
245+
pub const PRIdLEAST16: &[u8; 2] = b"d\0";
246+
pub const PRIdLEAST32: &[u8; 2] = b"d\0";
247+
pub const PRIdLEAST64: &[u8; 4] = b"lld\0";
248+
pub const PRIdFAST8: &[u8; 2] = b"d\0";
249+
pub const PRIdFAST64: &[u8; 4] = b"lld\0";
250+
pub const PRIi8: &[u8; 2] = b"i\0";
251+
pub const PRIi16: &[u8; 2] = b"i\0";
252+
pub const PRIi32: &[u8; 2] = b"i\0";
253+
pub const PRIi64: &[u8; 4] = b"lli\0";
254+
pub const PRIiLEAST8: &[u8; 2] = b"i\0";
255+
pub const PRIiLEAST16: &[u8; 2] = b"i\0";
256+
pub const PRIiLEAST32: &[u8; 2] = b"i\0";
257+
pub const PRIiLEAST64: &[u8; 4] = b"lli\0";
258+
pub const PRIiFAST8: &[u8; 2] = b"i\0";
259+
pub const PRIiFAST64: &[u8; 4] = b"lli\0";
260+
pub const PRIo8: &[u8; 2] = b"o\0";
261+
pub const PRIo16: &[u8; 2] = b"o\0";
262+
pub const PRIo32: &[u8; 2] = b"o\0";
263+
pub const PRIo64: &[u8; 4] = b"llo\0";
264+
pub const PRIoLEAST8: &[u8; 2] = b"o\0";
265+
pub const PRIoLEAST16: &[u8; 2] = b"o\0";
266+
pub const PRIoLEAST32: &[u8; 2] = b"o\0";
267+
pub const PRIoLEAST64: &[u8; 4] = b"llo\0";
268+
pub const PRIoFAST8: &[u8; 2] = b"o\0";
269+
pub const PRIoFAST64: &[u8; 4] = b"llo\0";
270+
pub const PRIu8: &[u8; 2] = b"u\0";
271+
pub const PRIu16: &[u8; 2] = b"u\0";
272+
pub const PRIu32: &[u8; 2] = b"u\0";
273+
pub const PRIu64: &[u8; 4] = b"llu\0";
274+
pub const PRIuLEAST8: &[u8; 2] = b"u\0";
275+
pub const PRIuLEAST16: &[u8; 2] = b"u\0";
276+
pub const PRIuLEAST32: &[u8; 2] = b"u\0";
277+
pub const PRIuLEAST64: &[u8; 4] = b"llu\0";
278+
pub const PRIuFAST8: &[u8; 2] = b"u\0";
279+
pub const PRIuFAST64: &[u8; 4] = b"llu\0";
280+
pub const PRIx8: &[u8; 2] = b"x\0";
281+
pub const PRIx16: &[u8; 2] = b"x\0";
282+
pub const PRIx32: &[u8; 2] = b"x\0";
283+
pub const PRIx64: &[u8; 4] = b"llx\0";
284+
pub const PRIxLEAST8: &[u8; 2] = b"x\0";
285+
pub const PRIxLEAST16: &[u8; 2] = b"x\0";
286+
pub const PRIxLEAST32: &[u8; 2] = b"x\0";
287+
pub const PRIxLEAST64: &[u8; 4] = b"llx\0";
288+
pub const PRIxFAST8: &[u8; 2] = b"x\0";
289+
pub const PRIxFAST64: &[u8; 4] = b"llx\0";
290+
pub const PRIX8: &[u8; 2] = b"X\0";
291+
pub const PRIX16: &[u8; 2] = b"X\0";
292+
pub const PRIX32: &[u8; 2] = b"X\0";
293+
pub const PRIX64: &[u8; 4] = b"llX\0";
294+
pub const PRIXLEAST8: &[u8; 2] = b"X\0";
295+
pub const PRIXLEAST16: &[u8; 2] = b"X\0";
296+
pub const PRIXLEAST32: &[u8; 2] = b"X\0";
297+
pub const PRIXLEAST64: &[u8; 4] = b"llX\0";
298+
pub const PRIXFAST8: &[u8; 2] = b"X\0";
299+
pub const PRIXFAST64: &[u8; 4] = b"llX\0";
300+
pub const PRIdMAX: &[u8; 4] = b"lld\0";
301+
pub const PRIiMAX: &[u8; 4] = b"lli\0";
302+
pub const PRIoMAX: &[u8; 4] = b"llo\0";
303+
pub const PRIuMAX: &[u8; 4] = b"llu\0";
304+
pub const PRIxMAX: &[u8; 4] = b"llx\0";
305+
pub const PRIXMAX: &[u8; 4] = b"llX\0";
306+
pub const SCNd8: &[u8; 4] = b"hhd\0";
307+
pub const SCNd16: &[u8; 3] = b"hd\0";
308+
pub const SCNd32: &[u8; 2] = b"d\0";
309+
pub const SCNd64: &[u8; 4] = b"lld\0";
310+
pub const SCNdLEAST8: &[u8; 4] = b"hhd\0";
311+
pub const SCNdLEAST16: &[u8; 3] = b"hd\0";
312+
pub const SCNdLEAST32: &[u8; 2] = b"d\0";
313+
pub const SCNdLEAST64: &[u8; 4] = b"lld\0";
314+
pub const SCNdFAST8: &[u8; 4] = b"hhd\0";
315+
pub const SCNdFAST64: &[u8; 4] = b"lld\0";
316+
pub const SCNi8: &[u8; 4] = b"hhi\0";
317+
pub const SCNi16: &[u8; 3] = b"hi\0";
318+
pub const SCNi32: &[u8; 2] = b"i\0";
319+
pub const SCNi64: &[u8; 4] = b"lli\0";
320+
pub const SCNiLEAST8: &[u8; 4] = b"hhi\0";
321+
pub const SCNiLEAST16: &[u8; 3] = b"hi\0";
322+
pub const SCNiLEAST32: &[u8; 2] = b"i\0";
323+
pub const SCNiLEAST64: &[u8; 4] = b"lli\0";
324+
pub const SCNiFAST8: &[u8; 4] = b"hhi\0";
325+
pub const SCNiFAST64: &[u8; 4] = b"lli\0";
326+
pub const SCNu8: &[u8; 4] = b"hhu\0";
327+
pub const SCNu16: &[u8; 3] = b"hu\0";
328+
pub const SCNu32: &[u8; 2] = b"u\0";
329+
pub const SCNu64: &[u8; 4] = b"llu\0";
330+
pub const SCNuLEAST8: &[u8; 4] = b"hhu\0";
331+
pub const SCNuLEAST16: &[u8; 3] = b"hu\0";
332+
pub const SCNuLEAST32: &[u8; 2] = b"u\0";
333+
pub const SCNuLEAST64: &[u8; 4] = b"llu\0";
334+
pub const SCNuFAST8: &[u8; 4] = b"hhu\0";
335+
pub const SCNuFAST64: &[u8; 4] = b"llu\0";
336+
pub const SCNo8: &[u8; 4] = b"hho\0";
337+
pub const SCNo16: &[u8; 3] = b"ho\0";
338+
pub const SCNo32: &[u8; 2] = b"o\0";
339+
pub const SCNo64: &[u8; 4] = b"llo\0";
340+
pub const SCNoLEAST8: &[u8; 4] = b"hho\0";
341+
pub const SCNoLEAST16: &[u8; 3] = b"ho\0";
342+
pub const SCNoLEAST32: &[u8; 2] = b"o\0";
343+
pub const SCNoLEAST64: &[u8; 4] = b"llo\0";
344+
pub const SCNoFAST8: &[u8; 4] = b"hho\0";
345+
pub const SCNoFAST64: &[u8; 4] = b"llo\0";
346+
pub const SCNx8: &[u8; 4] = b"hhx\0";
347+
pub const SCNx16: &[u8; 3] = b"hx\0";
348+
pub const SCNx32: &[u8; 2] = b"x\0";
349+
pub const SCNx64: &[u8; 4] = b"llx\0";
350+
pub const SCNxLEAST8: &[u8; 4] = b"hhx\0";
351+
pub const SCNxLEAST16: &[u8; 3] = b"hx\0";
352+
pub const SCNxLEAST32: &[u8; 2] = b"x\0";
353+
pub const SCNxLEAST64: &[u8; 4] = b"llx\0";
354+
pub const SCNxFAST8: &[u8; 4] = b"hhx\0";
355+
pub const SCNxFAST64: &[u8; 4] = b"llx\0";
356+
pub const SCNdMAX: &[u8; 4] = b"lld\0";
357+
pub const SCNiMAX: &[u8; 4] = b"lli\0";
358+
pub const SCNoMAX: &[u8; 4] = b"llo\0";
359+
pub const SCNuMAX: &[u8; 4] = b"llu\0";
360+
pub const SCNxMAX: &[u8; 4] = b"llx\0";
337361
pub const _STDLIB_H: u32 = 1;
338362
pub const WNOHANG: u32 = 1;
339363
pub const WUNTRACED: u32 = 2;
@@ -389,7 +413,7 @@ pub const BYTE_ORDER: u32 = 1234;
389413
pub const _BITS_BYTESWAP_H: u32 = 1;
390414
pub const _BITS_UINTN_IDENTITY_H: u32 = 1;
391415
pub const _SYS_SELECT_H: u32 = 1;
392-
pub const __FD_ZERO_STOS: &[u8; 6usize] = b"stosl\0";
416+
pub const __FD_ZERO_STOS: &[u8; 6] = b"stosl\0";
393417
pub const __sigset_t_defined: u32 = 1;
394418
pub const __timeval_defined: u32 = 1;
395419
pub const _STRUCT_TIMESPEC: u32 = 1;
@@ -3441,6 +3465,7 @@ impl Default for TPMS_AUTH_RESPONSE {
34413465
pub type TPMI_AES_KEY_BITS = TPM2_KEY_BITS;
34423466
pub type TPMI_SM4_KEY_BITS = TPM2_KEY_BITS;
34433467
pub type TPMI_TPM2_CAMELLIA_KEY_BITS = TPM2_KEY_BITS;
3468+
pub type TPMI_CAMELLIA_KEY_BITS = TPM2_KEY_BITS;
34443469
#[repr(C)]
34453470
#[derive(Copy, Clone)]
34463471
pub union TPMU_SYM_KEY_BITS {
@@ -10740,6 +10765,20 @@ extern "C" {
1074010765
nonceTPM: *mut *mut TPM2B_NONCE,
1074110766
) -> TSS2_RC;
1074210767
}
10768+
extern "C" {
10769+
pub fn Esys_TR_GetTpmHandle(
10770+
esys_context: *mut ESYS_CONTEXT,
10771+
esys_handle: ESYS_TR,
10772+
tpm_handle: *mut TPM2_HANDLE,
10773+
) -> TSS2_RC;
10774+
}
10775+
extern "C" {
10776+
pub fn Esys_TRSess_GetAuthRequired(
10777+
esys_context: *mut ESYS_CONTEXT,
10778+
esys_handle: ESYS_TR,
10779+
auth_needed: *mut TPMI_YES_NO,
10780+
) -> TSS2_RC;
10781+
}
1074310782
extern "C" {
1074410783
pub fn Esys_Startup(esysContext: *mut ESYS_CONTEXT, startupType: TPM2_SU) -> TSS2_RC;
1074510784
}
@@ -13785,6 +13824,12 @@ extern "C" {
1378513824
extern "C" {
1378613825
pub fn Esys_Free(__ptr: *mut ::std::os::raw::c_void);
1378713826
}
13827+
extern "C" {
13828+
pub fn Esys_GetSysContext(
13829+
esys_context: *mut ESYS_CONTEXT,
13830+
sys_context: *mut *mut TSS2_SYS_CONTEXT,
13831+
) -> TSS2_RC;
13832+
}
1378813833
pub type __gwchar_t = ::std::os::raw::c_uint;
1378913834
#[repr(C)]
1379013835
#[derive(Debug, Default, Copy, Clone)]

0 commit comments

Comments
 (0)