From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 17 Sep 2022 13:20:32 +0000 (+0200)
Subject: measure: rename measure_pcr() to measure_kernel()
X-Git-Tag: v252-rc1~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f578c659c41832924d9a3c1707c0fa5d5f79149b;p=thirdparty%2Fsystemd.git

measure: rename measure_pcr() to measure_kernel()

Let's say what we actually measure, not what into (which is obvious
anyway).

This is generally more descriptive, but also good for later work that
allows measuring the boot phase too.
---

diff --git a/src/boot/measure.c b/src/boot/measure.c
index bc8f720514b..983d407e39b 100644
--- a/src/boot/measure.c
+++ b/src/boot/measure.c
@@ -311,7 +311,7 @@ static int pcr_state_extend(PcrState *pcr_state, const void *data, size_t sz) {
 
 #define BUFFER_SIZE (16U * 1024U)
 
-static int measure_pcr(PcrState *pcr_states, size_t n) {
+static int measure_kernel(PcrState *pcr_states, size_t n) {
         _cleanup_free_ void *buffer = NULL;
         int r;
 
@@ -415,7 +415,7 @@ static int measure_pcr(PcrState *pcr_states, size_t n) {
                         if (r < 0)
                                 return r;
 
-                        /* Retrieve hash of data an measure it*/
+                        /* Retrieve hash of data and measure it */
                         if (EVP_DigestFinal_ex(mdctx[i], data_hash, &data_hash_size) != 1)
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to finalize hash context.");
 
@@ -486,7 +486,7 @@ static int verb_calculate(int argc, char *argv[], void *userdata) {
 
         n = (size_t) r;
 
-        r = measure_pcr(pcr_states, n);
+        r = measure_kernel(pcr_states, n);
         if (r < 0)
                 return r;
 
@@ -591,7 +591,7 @@ static int verb_sign(int argc, char *argv[], void *userdata) {
 
         n = (size_t) r;
 
-        r = measure_pcr(pcr_states, n);
+        r = measure_kernel(pcr_states, n);
         if (r < 0)
                 return r;