d6d145b71a
- Power guest secure boot with static keys: GRUB2 signing portion (jsc#SLE-18271) (bsc#1192764) * grub2.spec - Power guest secure boot with static keys: GRUB2 portion (jsc#SLE-18144) (bsc#1192686) * 0001-ieee1275-Drop-HEAP_MAX_ADDR-and-HEAP_MIN_SIZE-consta.patch * 0002-ieee1275-claim-more-memory.patch * 0003-ieee1275-request-memory-with-ibm-client-architecture.patch * 0004-Add-suport-for-signing-grub-with-an-appended-signatu.patch * 0005-docs-grub-Document-signing-grub-under-UEFI.patch * 0006-docs-grub-Document-signing-grub-with-an-appended-sig.patch * 0007-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch * 0008-pgp-factor-out-rsa_pad.patch * 0009-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch * 0010-posix_wrap-tweaks-in-preparation-for-libtasn1.patch * 0011-libtasn1-import-libtasn1-4.18.0.patch * 0012-libtasn1-disable-code-not-needed-in-grub.patch * 0013-libtasn1-changes-for-grub-compatibility.patch * 0014-libtasn1-compile-into-asn1-module.patch * 0015-test_asn1-test-module-for-libtasn1.patch * 0016-grub-install-support-embedding-x509-certificates.patch * 0017-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch * 0018-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch * 0019-appended-signatures-support-verifying-appended-signa.patch * 0020-appended-signatures-verification-tests.patch * 0021-appended-signatures-documentation.patch * 0022-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch * 0023-x509-allow-Digitial-Signature-plus-other-Key-Usages.patch - Fix no menuentry is found if hibernation on btrfs RAID1 (bsc#1193090) OBS-URL: https://build.opensuse.org/request/show/945751 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=401
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 5a690183091c2c161481123b17e1925148e516e4 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Axtens <dja@axtens.net>
|
|
Date: Tue, 30 Nov 2021 15:00:57 +1100
|
|
Subject: [PATCH 23/23] x509: allow Digitial Signature plus other Key Usages
|
|
|
|
Currently the x509 certificate parser for appended signature
|
|
verification requires that the certificate have the Digitial Signature
|
|
key usage and _only_ the Digitial Signature use. This is overly strict
|
|
and becomes policy enforcement rather than a security property.
|
|
|
|
Require that the Digitial Signature usage is present, but do not
|
|
require that it is the only usage present.
|
|
|
|
Reported-by: Michal Suchanek <msuchanek@suse.com>
|
|
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
|
---
|
|
grub-core/commands/appendedsig/x509.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c
|
|
index 70480aa73..6ae985b30 100644
|
|
--- a/grub-core/commands/appendedsig/x509.c
|
|
+++ b/grub-core/commands/appendedsig/x509.c
|
|
@@ -547,7 +547,7 @@ cleanup:
|
|
|
|
/*
|
|
* Verify the Key Usage extension.
|
|
- * We only permit the Digital signature usage.
|
|
+ * We require the Digital signature usage.
|
|
*/
|
|
static grub_err_t
|
|
verify_key_usage (grub_uint8_t *value, int value_size)
|
|
@@ -586,10 +586,10 @@ verify_key_usage (grub_uint8_t *value, int value_size)
|
|
goto cleanup;
|
|
}
|
|
|
|
- if (usage != digitalSignatureUsage)
|
|
+ if (!(usage & digitalSignatureUsage))
|
|
{
|
|
err =
|
|
- grub_error (GRUB_ERR_BAD_FILE_TYPE, "Unexpected Key Usage value: %x",
|
|
+ grub_error (GRUB_ERR_BAD_FILE_TYPE, "Key Usage (0x%x) missing Digital Signature usage",
|
|
usage);
|
|
goto cleanup;
|
|
}
|
|
--
|
|
2.31.1
|
|
|