From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Aug 2022 13:35:25 +0000 (+0200)
Subject: tpm2-util: rename tpmKey → primary
X-Git-Tag: v252-rc1~458
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9420fea8fd100d53726ce85ee173bed2040d7670;p=thirdparty%2Fsystemd.git

tpm2-util: rename tpmKey → primary

Let's use the nomenclature from the spec. "tpmKey" is just too genric.
---

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,