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 <[email protected]>

Author: Superhepper

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Build the container
-        run: docker build -t ubuntucontainer tss-esapi/tests/ --build-arg TPM2_TSS_VERSION=3.0.4 --file tss-esapi/tests/Dockerfile-ubuntu
+        run: docker build -t ubuntucontainer tss-esapi/tests/ --build-arg TPM2_TSS_VERSION=4.0.1 --file tss-esapi/tests/Dockerfile-ubuntu
       - name: Run the container
         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
 

tss-esapi-sys/README.md

@@ -18,7 +18,7 @@ must therefore link to all of them at build time.
 
 The paths to the libraries are discovered using `pkg-config` - make sure they
 are discoverable in this way on your system. Our build script looks for 
-`tss2-esys`, `tss2-tctildr` and `tss2-mu`. A minimum version of `2.3.3` is 
+`tss2-esys`, `tss2-tctildr` and `tss2-mu`. A minimum version of `3.2.2` is 
 required for all of them.
 
 Having installed the open-source implementation libraries at `/usr/local/lib` (by default), it

tss-esapi-sys/build.rs

@@ -4,7 +4,7 @@
 #[cfg(feature = "generate-bindings")]
 use std::path::PathBuf;
 
-const MINIMUM_VERSION: &str = "2.4.6";
+const MINIMUM_VERSION: &str = "3.2.2";
 
 fn main() {
     if std::env::var("DOCS_RS").is_ok() {

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.4.6"
+TPM2_TSS_VERSION="3.2.2"
 
 export SYSROOT="/tmp/sysroot"
 

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

@@ -7,7 +7,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 
 FROM rust-toolchain AS tpm2-tss
 # Download and install the TSS library
-ARG TPM2_TSS_VERSION=2.4.6
+ARG TPM2_TSS_VERSION=3.2.2
 ENV TPM2_TSS_VERSION=$TPM2_TSS_VERSION
 ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
 RUN git clone https://github.com/tpm2-software/tpm2-tss.git --branch $TPM2_TSS_VERSION
@@ -20,8 +20,8 @@ RUN cd tpm2-tss \
 
 FROM tpm2-tss AS tpm2-tools
 # Download and install TPM2 tools
-RUN git clone https://github.com/tpm2-software/tpm2-tools.git --branch 4.1
+RUN git clone https://github.com/tpm2-software/tpm2-tools.git --branch 5.6
 RUN cd tpm2-tools \
 	&& ./bootstrap \
-	&& ./configure --enable-unit \
+	&& ./configure \
 	&& make install

tss-esapi-sys/src/bindings/arm-unknown-linux-gnueabi.rs

@@ -23,7 +23,7 @@ fi
 #################################################
 # Generate bindings for non-"standard" versions #
 #################################################
-if [[ "$TPM2_TSS_VERSION" != "2.4.6" ]]; then
+if [[ "$TPM2_TSS_VERSION" != "3.2.2" ]]; then
 	FEATURES="generate-bindings integration-tests"
 else
 	FEATURES="integration-tests"

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

@@ -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.4.6"
+TPM2_TSS_VERSION="3.2.2"
 
 export SYSROOT="/tmp/sysroot"