From e9073e6b19d2f3977716764eb59fa6d12293c562 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Wed, 27 Nov 2024 13:04:52 +0100 Subject: [PATCH] Add keyring key type in volume key comparison function. --- lib/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/setup.c b/lib/setup.c index f74d1d5c..7459140e 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -3173,7 +3173,8 @@ static int _compare_volume_keys(struct volume_key *svk, unsigned skeyring_only, return crypt_backend_memeq(svk->key, tvk->key, svk->keylength); if (svk->key_description && tvk->key_description) - return strcmp(svk->key_description, tvk->key_description); + return (svk->keyring_key_type != tvk->keyring_key_type || + strcmp(svk->key_description, tvk->key_description)); return 0; }