Skip to content

Commit 380776b

Browse files
Fix tpm2-tss CI
1 parent e0ee14e commit 380776b

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

tests/ci/integration/run_tpm2_tss_integration.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function curl_build() {
4747
}
4848

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

6969
function tpm2_tools_build() {
70-
git apply "${SCRIPT_DIR}/tpm2_tools_patch/aws-lc-tpm2-tools.patch"
70+
patch -p1 --quiet -i "${SCRIPT_DIR}/tpm2_tools_patch/aws-lc-tpm2-tools.patch"
7171
export PKG_CONFIG_PATH="${AWS_LC_INSTALL_FOLDER}/lib/pkgconfig:${TPM2_TSS_INSTALL_FOLDER}/lib/pkgconfig:${TPM2_ABRMD_INSTALL_FOLDER}/lib/pkgconfig"
7272
/bin/sh ./bootstrap
7373
./configure --with-crypto=ossl

tests/ci/integration/tpm2_tss_patch/aws-lc-tpm2-tss.patch

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,6 @@ index 75e81141..79f77fdf 100644
7070
size_t ui;
7171
AUTHORITY_INFO_ACCESS *info = NULL;
7272
ASN1_IA5STRING *uri = NULL;
73-
@@ -463,7 +463,7 @@ ifapi_get_curl_buffer(unsigned char * url, unsigned char ** buffer,
74-
goto out_easy_cleanup;
75-
}
76-
77-
- rc = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
78-
+ rc = curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
79-
if (rc != CURLE_OK) {
80-
LOG_ERROR("curl_easy_setopt for CURLOPT_FOLLOWLOCATION failed: %s",
81-
curl_easy_strerror(rc));
8273
diff --git a/src/tss2-fapi/ifapi_verify_cert_chain.c b/src/tss2-fapi/ifapi_verify_cert_chain.c
8374
index b495e512..c741c8ad 100644
8475
--- a/src/tss2-fapi/ifapi_verify_cert_chain.c

0 commit comments

Comments
 (0)