From 9420fea8fd100d53726ce85ee173bed2040d7670 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 12 Aug 2022 15:35:25 +0200 Subject: [PATCH] =?utf8?q?tpm2-util:=20rename=20tpmKey=20=E2=86=92=20prima?= =?utf8?q?ry?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Let's use the nomenclature from the spec. "tpmKey" is just too genric. --- src/shared/tpm2-util.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c index b13fe875d4f..0018c45aaa7 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -598,7 +598,7 @@ static int tpm2_get_best_pcr_bank( static int tpm2_make_encryption_session( ESYS_CONTEXT *c, - ESYS_TR tpmKey, + ESYS_TR primary, ESYS_TR *ret_session) { static const TPMT_SYM_DEF symmetric = { @@ -624,7 +624,7 @@ static int tpm2_make_encryption_session( * recover the salt, which is then used for key derivation. */ rc = sym_Esys_StartAuthSession( c, - tpmKey, + primary, ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE, @@ -659,7 +659,7 @@ static int tpm2_make_encryption_session( static int tpm2_make_pcr_session( ESYS_CONTEXT *c, - ESYS_TR tpmKey, + ESYS_TR primary, ESYS_TR parent_session, uint32_t pcr_mask, uint16_t pcr_bank, /* If UINT16_MAX, pick best bank automatically, otherwise specify bank explicitly. */ @@ -709,7 +709,7 @@ static int tpm2_make_pcr_session( rc = sym_Esys_StartAuthSession( c, - tpmKey, + primary, ESYS_TR_NONE, parent_session, ESYS_TR_NONE, -- 2.47.3