Skip to content

Fix tpm2-tss CI #2767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

Fix tpm2-tss CI #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/ci/integration/run_tpm2_tss_integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function curl_build() {
}

function tpm2_tss_build() {
git apply "${SCRIPT_DIR}/tpm2_tss_patch/aws-lc-tpm2-tss.patch"
patch -p1 --quiet -i "${SCRIPT_DIR}/tpm2_tss_patch/aws-lc-tpm2-tss.patch"
export PKG_CONFIG_PATH="${AWS_LC_INSTALL_FOLDER}/lib/pkgconfig:${CURL_INSTALL_FOLDER}/lib/pkgconfig"
/bin/sh ./bootstrap
./configure --enable-unit --with-crypto=ossl --prefix="${TPM2_TSS_INSTALL_FOLDER}"
Expand All @@ -67,7 +67,7 @@ function tpm2_abrmd_build() {
}

function tpm2_tools_build() {
git apply "${SCRIPT_DIR}/tpm2_tools_patch/aws-lc-tpm2-tools.patch"
patch -p1 --quiet -i "${SCRIPT_DIR}/tpm2_tools_patch/aws-lc-tpm2-tools.patch"
export PKG_CONFIG_PATH="${AWS_LC_INSTALL_FOLDER}/lib/pkgconfig:${TPM2_TSS_INSTALL_FOLDER}/lib/pkgconfig:${TPM2_ABRMD_INSTALL_FOLDER}/lib/pkgconfig"
/bin/sh ./bootstrap
./configure --with-crypto=ossl
Expand Down
9 changes: 0 additions & 9 deletions tests/ci/integration/tpm2_tss_patch/aws-lc-tpm2-tss.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,6 @@ index 75e81141..79f77fdf 100644
size_t ui;
AUTHORITY_INFO_ACCESS *info = NULL;
ASN1_IA5STRING *uri = NULL;
@@ -463,7 +463,7 @@ ifapi_get_curl_buffer(unsigned char * url, unsigned char ** buffer,
goto out_easy_cleanup;
}

- rc = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ rc = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
if (rc != CURLE_OK) {
LOG_ERROR("curl_easy_setopt for CURLOPT_FOLLOWLOCATION failed: %s",
curl_easy_strerror(rc));
diff --git a/src/tss2-fapi/ifapi_verify_cert_chain.c b/src/tss2-fapi/ifapi_verify_cert_chain.c
index b495e512..c741c8ad 100644
--- a/src/tss2-fapi/ifapi_verify_cert_chain.c
Expand Down
Loading