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.

diff --git a/src/boot/efi/measure.c b/src/boot/efi/measure.c
index 4dc42831bfea05088d4ca6e86bdc77ff349529e1..677fe640153f55392ba699cd472c86b7e62cb673 100644 (file)
--- a/src/boot/efi/measure.c
+++ b/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(

diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
index 8d3a10601f8280621087cce7dcf269b83ce3b4e2..e34fc77faa563ca0af437bed4ecb269215a91dae 100644 (file)
--- a/src/boot/efi/stub.c
+++ b/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"

diff --git a/src/boot/measure.c b/src/boot/measure.c
index abd562f72e9a7868609136dba0ccf88616edc19b..a62caf8a3ff0a1c6238774cd899717dbc5f08ae3 100644 (file)
--- a/src/boot/measure.c
+++ b/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"

diff --git a/src/boot/pcrphase.c b/src/boot/pcrphase.c
index 19401168dd2673d18fb69b6dba572c2b322043fb..08285d73184c1ebe0f514d3012af9c9e10e08cf8 100644 (file)
--- a/src/boot/pcrphase.c
+++ b/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;

diff --git a/src/creds/creds.c b/src/creds/creds.c
index 57f4aa68098627cf82e2bffbf0a4dff9bcca90a3..0bc55a36d208cd99157f331b9665d3ea9de120f7 100644 (file)
--- a/src/creds/creds.c
+++ b/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"
 

diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c
index 2bf3333132a01a1c44a18a6f131d8cc1c9ff98df..1ffa2fb5f2d2a0c84c17c2652e1e9165574cf74d 100644 (file)
--- a/src/cryptenroll/cryptenroll.c
+++ b/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;

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index ced815f11cee783775b53be8fc5752afdf18998d..adf881dc5c56d9cb2936d95c2f2cd140405ab50b 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/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 */

diff --git a/src/fundamental/tpm-pcr.h b/src/fundamental/tpm2-pcr.h
similarity index 100%
rename from src/fundamental/tpm-pcr.h
rename to src/fundamental/tpm2-pcr.h

diff --git a/src/partition/repart.c b/src/partition/repart.c
index ab10b9acbf1c8dbc032c43fbfb1268dd2bd9f125..e403012e92dd79fb2cb882cdab94ab00c796ba91 100644 (file)
--- a/src/partition/repart.c
+++ b/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"

diff --git a/src/shared/efi-loader.c b/src/shared/efi-loader.c
index 5fd9351ff4b690fa3f2a56167fd4688dd69de2ee..7cbd69bfb0abd1cdd8fcb31e57f7d3086a050152 100644 (file)
--- a/src/shared/efi-loader.c
+++ b/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

diff --git a/src/shared/tpm2-util.h b/src/shared/tpm2-util.h
index 2ae1a8809f92904a07c511944fa489c21633597b..62d46d69a3d2647fc88373d400170dae0e920f29 100644 (file)
--- a/src/shared/tpm2-util.h
+++ b/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,
 };