aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2023-03-24 15:30:49 +0000
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2023-03-24 11:35:35 -0400
commit5f7c8a7abdd622d18379cd3a8742b00a4f82f486 (patch)
tree3401284b631d18fc32ab70d914d9f3ceb0529177
parentebd7ed47000caa972be7ba5d7392be9d8020137d (diff)
downloadopenssl_tpm2_engine-5f7c8a7abdd622d18379cd3a8742b00a4f82f486.tar.gz
tpm2-common.c: Fix gcc-13 being picky about int to enum conversion
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--src/include/tpm2-common.h2
-rw-r--r--src/libcommon/tpm2-common.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/include/tpm2-common.h b/src/include/tpm2-common.h
index 39a5036..7a70c4e 100644
--- a/src/include/tpm2-common.h
+++ b/src/include/tpm2-common.h
@@ -54,7 +54,7 @@ struct app_data {
void tpm2_error(TPM_RC rc, const char *reason);
TPM_RC tpm2_load_srk(TSS_CONTEXT *tssContext, TPM_HANDLE *h, const char *auth,
- TPM2B_PUBLIC *pub, TPM_HANDLE handle, int version);
+ TPM2B_PUBLIC *pub, TPM_HANDLE handle, enum tpm2_type type);
void tpm2_flush_handle(TSS_CONTEXT *tssContext, TPM_HANDLE h);
EVP_PKEY *tpm2_to_openssl_public(TPMT_PUBLIC *pub);
void tpm2_flush_srk(TSS_CONTEXT *tssContext, TPM_HANDLE hSRK);
diff --git a/src/libcommon/tpm2-common.c b/src/libcommon/tpm2-common.c
index 27d7bf5..0c97e6d 100644
--- a/src/libcommon/tpm2-common.c
+++ b/src/libcommon/tpm2-common.c
@@ -1991,7 +1991,8 @@ int tpm2_load_bf(BIO *bf, struct app_data *app_data, const char *srk_auth)
parentHandle = tpm2_handle_int(tssContext, app_data->parent);
if (tpm2_handle_mso(tssContext, parentHandle, TPM_HT_PERMANENT)) {
tpm2_load_srk(tssContext, &parentHandle,
- srk_auth, NULL, parentHandle, 1);
+ srk_auth, NULL, parentHandle,
+ TPM2_LOADABLE);
}
rc = tpm2_get_session_handle(tssContext, &session,