fundamental: rename tpm-pcr.h → tpm2-pcr.h

I always found it confusing that most of our TPM related definitions are
in tpm2-util.h, but the PCR names in tpm-pcr.h, without the "2". Let's
fix that and make this systematic, in particular as the definitions in
the file all start with TPM2_ already.

No code flow changes, just some renaming.

src/boot/efi/measure.c

@@ -5,7 +5,7 @@
 #include "macro-fundamental.h"
 #include "measure.h"
 #include "proto/tcg.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 #include "util.h"
 
 static EFI_STATUS tpm1_measure_to_pcr_and_event_log(

src/boot/efi/stub.c

@@ -13,7 +13,7 @@
 #include "secure-boot.h"
 #include "shim.h"
 #include "splash.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 #include "uki.h"
 #include "util.h"
 #include "version.h"

src/boot/measure.c

@@ -18,7 +18,7 @@
 #include "pretty-print.h"
 #include "sha256.h"
 #include "terminal-util.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 #include "tpm2-util.h"
 #include "uki.h"
 #include "verbs.h"

src/boot/pcrphase.c

@@ -18,7 +18,7 @@
 #include "openssl-util.h"
 #include "parse-argument.h"
 #include "pretty-print.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 #include "tpm2-util.h"
 
 static bool arg_graceful = false;

src/creds/creds.c

@@ -22,7 +22,7 @@
 #include "stat-util.h"
 #include "string-table.h"
 #include "terminal-util.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 #include "tpm2-util.h"
 #include "verbs.h"
 

src/cryptenroll/cryptenroll.c

@@ -27,7 +27,7 @@
 #include "string-table.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 
 static EnrollType arg_enroll_type = _ENROLL_TYPE_INVALID;
 static char *arg_unlock_keyfile = NULL;

src/cryptsetup/cryptsetup.c

@@ -40,7 +40,7 @@
 #include "random-util.h"
 #include "string-table.h"
 #include "strv.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 #include "tpm2-util.h"
 
 /* internal helper */

src/partition/repart.c

@@ -68,9 +68,9 @@
 #include "string-util.h"
 #include "strv.h"
 #include "sync-util.h"
-#include "tmpfile-util.h"
 #include "terminal-util.h"
-#include "tpm-pcr.h"
+#include "tmpfile-util.h"
+#include "tpm2-pcr.h"
 #include "tpm2-util.h"
 #include "user-util.h"
 #include "utf8.h"

src/shared/efi-loader.c

@@ -7,7 +7,7 @@
 #include "path-util.h"
 #include "stat-util.h"
 #include "strv.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 #include "utf8.h"
 
 #if ENABLE_EFI

src/shared/tpm2-util.h

@@ -9,7 +9,7 @@
 #include "macro.h"
 #include "openssl-util.h"
 #include "sha256.h"
-#include "tpm-pcr.h"
+#include "tpm2-pcr.h"
 
 typedef enum TPM2Flags {
         TPM2_FLAGS_USE_PIN = 1 << 0,
@@ -316,7 +316,7 @@ int tpm2_util_pbkdf2_hmac_sha256(const void *pass,
                     uint8_t res[static SHA256_DIGEST_SIZE]);
 
 enum {
-        /* Additional defines for the PCR index naming enum from "fundamental/tpm-pcr.h" */
+        /* Additional defines for the PCR index naming enum from "fundamental/tpm2-pcr.h" */
         _TPM2_PCR_INDEX_MAX_DEFINED = TPM2_PCRS_MAX,
         _TPM2_PCR_INDEX_INVALID     = -EINVAL,
 };