Skip to content

Commit bd535ab

Browse files
committed
Updated the tpm2-tss version for bindings.
- Generate the bindings from version 3.2.2 of the tpm2-tss library. - Add comment in the generated bindings from what version it was generated. - Starts using an explicit 4.0.1 version in tests. Signed-off-by: Jesper Brynolf <jesper.brynolf@gmail.com>
1 parent bc886df commit bd535ab

File tree

10 files changed

+2059
-1054
lines changed

10 files changed

+2059
-1054
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
- name: Run the cross-compilation script
4545
run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/cross-compile.sh
4646

47-
tests-ubuntu-v3:
48-
name: Ubuntu tests on v3.x.y of tpm2-tss
47+
tests-ubuntu-v4:
48+
name: Ubuntu tests on v4.x.y of tpm2-tss
4949
runs-on: ubuntu-latest
5050
steps:
5151
- uses: actions/checkout@v2
5252
- name: Build the container
53-
run: docker build -t ubuntucontainer tss-esapi/tests/ --build-arg TPM2_TSS_VERSION=3.0.4 --file tss-esapi/tests/Dockerfile-ubuntu
53+
run: docker build -t ubuntucontainer tss-esapi/tests/ --build-arg TPM2_TSS_VERSION=4.0.1 --file tss-esapi/tests/Dockerfile-ubuntu
5454
- name: Run the container
5555
run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
5656

tss-esapi-sys/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ must therefore link to all of them at build time.
1818

1919
The paths to the libraries are discovered using `pkg-config` - make sure they
2020
are discoverable in this way on your system. Our build script looks for
21-
`tss2-esys`, `tss2-tctildr` and `tss2-mu`. A minimum version of `2.3.3` is
21+
`tss2-esys`, `tss2-tctildr` and `tss2-mu`. A minimum version of `3.2.2` is
2222
required for all of them.
2323

2424
Having installed the open-source implementation libraries at `/usr/local/lib` (by default), it

tss-esapi-sys/build.rs

Lines changed: 1 addition & 1 deletion
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.4.6";
7+
const MINIMUM_VERSION: &str = "3.2.2";
88

99
fn main() {
1010
if std::env::var("DOCS_RS").is_ok() {

tss-esapi-sys/regenerate-bindings.sh

Lines changed: 1 addition & 1 deletion
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.4.6"
14+
TPM2_TSS_VERSION="3.2.2"
1515

1616
export SYSROOT="/tmp/sysroot"
1717

0 commit comments

Comments
 (0)