From 31dad49ce5154c2ffa5af07d8f0dcc72cdf2b970 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Wed, 13 Nov 2024 11:33:34 -0500 Subject: [PATCH] swtpm_cert: Move error message about importing signing key into else branch Move the error message about the failure to import a signing key into the else branch where it should be (all other branches of the if-then-else statement have a check already). Also mention the key's filename. Signed-off-by: Stefan Berger --- src/swtpm_cert/ek-cert.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/swtpm_cert/ek-cert.c b/src/swtpm_cert/ek-cert.c index 6fa477abe..288d49ec4 100644 --- a/src/swtpm_cert/ek-cert.c +++ b/src/swtpm_cert/ek-cert.c @@ -1436,11 +1436,12 @@ if (_err != GNUTLS_E_SUCCESS) { \ } else { err = gnutls_x509_privkey_import(sigkey, &datum, GNUTLS_X509_FMT_PEM); } + /* 'certtool --infile -k' not working?? */ + CHECK_GNUTLS_ERROR(err, "Could not import signing key %s: %s\n", + sigkey_filename, gnutls_strerror(err)); } gnutls_free(datum.data); datum.data = NULL; - CHECK_GNUTLS_ERROR(err, "Could not import signing key : %s\n", - gnutls_strerror(err)); err = gnutls_load_file(issuercert_filename, &datum); CHECK_GNUTLS_ERROR(err, "Could not read certificate from file %s : %s\n",