Skip to content

Commit

Permalink
Updated the tpm2-tss version for bindings.
Browse files Browse the repository at this point in the history
- 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]>
  • Loading branch information
Superhepper committed Feb 26, 2024
1 parent 23994df commit 8ab0de2
Show file tree
Hide file tree
Showing 10 changed files with 2,059 additions and 1,054 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ jobs:
- name: Run the cross-compilation script
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

tests-ubuntu-v3:
name: Ubuntu tests on v3.x.y of tpm2-tss
tests-ubuntu-v4:
name: Ubuntu tests on v4.x.y of tpm2-tss
runs-on: ubuntu-latest
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

Expand Down
2 changes: 1 addition & 1 deletion tss-esapi-sys/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tss-esapi-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tss-esapi-sys/regenerate-bindings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading

0 comments on commit 8ab0de2

Please sign in to comment.