commit b3683ba10709847dad512a33630de74e02547ce8
author Stefan Berger <stefanb@linux.ibm.com> Fri Aug 18 13:31:35 2023 -0400
committer Stefan Berger <stefanb@us.ibm.com> Sat Aug 19 09:18:09 2023 -0400
tree 876d49699ed368fd549ccadbb13d8a4f4048f35c
parent f03c5aaf712342ede25d383064e60d7037f7a888

swtpm_setup: Pass key_type to function creating filename for key

To make the function creating filenames for keys less ek-specific,
pass the key_type, such as "ek", into this function.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

src/swtpm_setup/swtpm_setup.c

diff --git a/src/swtpm_setup/swtpm_setup.c b/src/swtpm_setup/swtpm_setup.c
index dc3c6c0..eb1ca93 100644
--- a/src/swtpm_setup/swtpm_setup.c
+++ b/src/swtpm_setup/swtpm_setup.c
@@ -292,9 +292,11 @@
     return ret;
 }
 
-static char *create_ek_certfile_name(const gchar *user_certsdir, const gchar *key_description)
+static char *create_certfile_name(const gchar *user_certsdir,
+                                  const gchar *key_type,
+                                  const gchar *key_description)
 {
-    g_autofree gchar *filename = g_strdup_printf("ek-%s.crt", key_description);
+    g_autofree gchar *filename = g_strdup_printf("%s-%s.crt", key_type, key_description);
 
     return g_strjoin(G_DIR_SEPARATOR_S, user_certsdir, filename, NULL);
 }
@@ -303,7 +305,8 @@
  * Remove the cert file unless the user wants a copy of it.
  */
 static int certfile_move_or_delete(unsigned long flags, gboolean preserve, const gchar *certfile,
-                                   const gchar *user_certsdir, const gchar *key_description)
+                                   const gchar *user_certsdir, const gchar *key_type,
+                                   const gchar *key_description)
 {
     g_autofree gchar *content = NULL;
     g_autofree gchar *cf = NULL;
@@ -315,7 +318,7 @@
         if (!g_file_get_contents(certfile, &content, &content_length, &error))
             goto error;
 
-        cf = create_ek_certfile_name(user_certsdir, key_description);
+        cf = create_certfile_name(user_certsdir, key_type, key_description);
         if (!(flags & SETUP_TPM2_F)) {
             /* A TPM 1.2 certificate has a 7 byte header at the beginning
              * that we now remove */
@@ -365,6 +368,7 @@
     g_autofree gchar *ekparam = NULL;
     const char *key_description;
     unsigned long cert_flags;
+    const gchar *key_type;
     size_t idx;
     int ret;
 
@@ -412,8 +416,10 @@
                     return 1;
                 }
 
+                key_type = flags_to_certfiles[idx].flag & SETUP_EK_CERT_F ? "ek" : "";
+
                 if (certfile_move_or_delete(flags, !!(flags_to_certfiles[idx].flag & SETUP_EK_CERT_F),
-                                            certfile, user_certsdir, key_description) != 0)
+                                            certfile, user_certsdir, key_type, key_description) != 0)
                     return 1;
             }
         }
@@ -618,6 +624,7 @@
     g_autofree gchar *filecontent = NULL;
     g_autofree gchar *certfile = NULL;
     unsigned int cert_flags;
+    const gchar *key_type;
     gsize filecontent_len;
     size_t idx;
     int ret;
@@ -657,8 +664,10 @@
                 return 1;
             }
 
+            key_type = flags_to_certfiles[idx].flag & SETUP_EK_CERT_F ? "ek" : "";
+
             if (certfile_move_or_delete(flags, !!(flags_to_certfiles[idx].flag & SETUP_EK_CERT_F),
-                                        certfile, user_certsdir, "rsa2048") != 0)
+                                        certfile, user_certsdir, key_type, "rsa2048") != 0)
                 return 1;
         }
     }