From: Mimi Zohar <zohar@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.ibm.com>
Subject: [PATCH v3 2/2] ima-evm-utils: log unknown keyid's as errors
Date: Thu, 18 Jul 2019 10:29:54 -0400 [thread overview]
Message-ID: <1563460194-21569-2-git-send-email-zohar@linux.ibm.com> (raw)
In-Reply-To: <1563460194-21569-1-git-send-email-zohar@linux.ibm.com>
Each tima a new unknown key is encountered, emit a message of the format
"key #: <keyid> unknown". The individual files using unknown keys are
then only logged in verbose mode.
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
---
src/libimaevm.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/libimaevm.c b/src/libimaevm.c
index 43eb4ef2412c..d2194a6ca0f8 100644
--- a/src/libimaevm.c
+++ b/src/libimaevm.c
@@ -402,13 +402,26 @@ static struct public_key_entry *public_keys = NULL;
static EVP_PKEY *find_keyid(uint32_t keyid)
{
- struct public_key_entry *entry;
+ struct public_key_entry *entry, *tail = public_keys;
+ int i = 1;
for (entry = public_keys; entry != NULL; entry = entry->next) {
if (entry->keyid == keyid)
return entry->key;
+ i++;
+ tail = entry;
}
- return NULL;
+
+ /* add unknown keys to list */
+ entry = calloc(1, sizeof(struct public_key_entry));
+ if (!entry) {
+ perror("calloc");
+ return 0;
+ }
+ entry->keyid = keyid;
+ tail->next = entry;
+ log_err("key %d: %x unknown\n", i, __be32_to_cpup(&keyid));
+ return 0;
}
void init_public_keys(const char *keyfiles)
@@ -470,8 +483,8 @@ static int verify_hash_v2(const char *file, const unsigned char *hash, int size,
pkey = find_keyid(keyid);
if (!pkey) {
- log_err("%s: unknown keyid: %x\n",
- file, __be32_to_cpup(&keyid));
+ log_info("%s: unknown keyid: %x\n",
+ file, __be32_to_cpup(&keyid));
return -1;
}
--
2.7.5
next prev parent reply other threads:[~2019-07-18 14:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 14:29 [PATCH v3 1/2] ima_evm_utils: erroneous "verification failed: 0 (invalid padding)" message Mimi Zohar
2019-07-18 14:29 ` Mimi Zohar [this message]
2019-07-23 22:18 ` [PATCH v3 2/2] ima-evm-utils: log unknown keyid's as errors Vitaly Chikunov
2019-07-23 22:59 ` Mimi Zohar
2019-07-23 23:13 ` Vitaly Chikunov
2019-07-24 0:19 ` Mimi Zohar
2019-07-24 0:50 ` Vitaly Chikunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1563460194-21569-2-git-send-email-zohar@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=linux-integrity@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).