Appended Signature Secure Boot Support for PowerPC
v11 cover Appended Signature Secure Boot Support for PowerPC
This patch set contains v11 the consolidated version of the patch sets for secure boot using appended signatures on powerpc, rebased on top of git HEAD.
The v9 series is at
https://lists.gnu.org/archive/html/grub-devel/2025-08/msg00186.html
The v10 series is at
https://lists.gnu.org/archive/html/grub-devel/2025-09/msg00089.html
Changes since v9:
- Daniel Kiper review comments addressed:
- v10 patch 11: It is patch 12 in v8, added comments for ignored "-Waddress-of-packed-member" changed is_pks_present return type to bool, added grub_pks_get_keystore function to return PKS or NULL.
- v10 patch 12: added new patch take out key management environment variable changes from patch 13
- v10 patch 13: defined typedef struct sb_database sb_database_t and used it. removed the unnecessary grub_memset, merged the is_hash_present_in_dbx() and is_hash_present_in_db() into check_hash_presence.
- v10 patch 17: changed build_static_db_list to load_elf2db, create_db_list to load_pks2db, and grub_pks_free_keystore to grub_pks_tmp_free.
- v10 patch 18: changed the variable name is_binary_hash to bin_hash, is_cert_fingerprint_match to cert_fingerprint_match. all ways shown all the GRUB commands.
- v10 patch 21: removed grub-install example and added installing of created core image file
- v10 patch 22: moved the common statements into appended signature section
- Srish review comments on v10 addressed;
- v11 patch 11: change the MACRO SB_VERSION_KEY_NAME ((grub_uint8_t *) "SB_VERSION") to "SB_VERSION", removed the check of missing == IEEE1275_CELL_INVALID, and moved the SB_VERSION check in read_sbversion_from_pks.
Linux on Power LPAR secure boot ensures the integrity of the Linux boot stack. The hypervisor and partition firmware are part of the core root of trust. The partition firmware verifies the signature on the GRUB image before handing control to GRUB. Similarly, GRUB verifies the signature on the kernel image before booting the OS. This ensures that every image running at the boot time is verified and trusted. UEFI platforms relies on PECOFF based signature scheme. Since Power is not a UEFI platform, an alternative mechanism is needed. Power already uses appended signatures on the Linux Kernel, and is now extended to sign the grub as well.
Linux on Power also allows multiple signers, and if any one of the signature passes, then the image passes the validation. Appended signature scheme uses CMS structure to contain signatures. On Power, the multiple signature support relies on the multiple signers features already supported by CMS standards. It does require that all the signers should sign at the same time and are not allowed to add or remove the signatures randomly.
By default, Linux LPAR secure boot uses static key management[1]. This means that each image embeds the keys it needs to verify the image it loads. For example, the keys used to verify the GRUB image are built into the firmware image. Similarly, the keys used for verifying the kernel image are built into the GRUB image. These are pre-defined keys and they cannot be modified at runtime. The drawback of this approach is that key rotations results in both firmware and OS updates. This is where dynamic key management is useful.
An admin can switch from static keys to dynamic keys by coordinating with Hardware Management Console(HMC) admin and enabling the required flags for the given LPAR.
The dynamic key management relies on the Platform KeyStore(PKS)[2] storage allocation for each LPAR with individually managed access controls to store sensitive information securely. Once switched to dynamic keys, HMC advertises this flag to the PowerVM, which then initializes the PKS with the default secvars. It also creates a variable SB_VERSION that represents the secure boot key management mode. The default secvars are used by Partition firmware, grub and the linux kernel to reads keys for verification. These secvars can be managed by user interface exposed via linux kernel. The linux kernel already supports this interface and it is available in the upstream kernel.
This patchset adds the appended signature support both for signing and verification and the key management to the grub component. The whole patchset can be split into following four main parts:
The series has following four main parts:
1.) Sign grub.elf with an appended signature. (Patches 1, 20, 21)
These patches provide some infrastructure and documentation for signing grub's core.elf with a Linux-kernel-module style appended signature.
An appended signature is a 'dumb' signature over the contents of a file. (It is distinct from schemes like Authenticode that are aware of the structure of the file and only sign certain parts.) The signature is wrapped in a PKCS#7 message, and is appended to the signed file along with some metadata and a magic string. The signatures are validated against a public key which is usually provided as an x509 certificate.
Because some platforms, such as powerpc-ieee1275, may load grub from a raw disk partition rather than a filesystem, we extend grub-install to add an ELF note that allows us to specify the size and location of the signature.
2.) Enable lockdown if secure boot is enabled (Patch 9)
Read secure boot mode from 'ibm,secure-boot' property and
If the 'ibm,secure-boot' property of the root node is 2, enter lockdown. Else it is considered as disabled.
There are three secure boot modes. They are
0 - disabled
No signature verification is performed. This is the default.
1 - audit
Signature verification is performed and if signature verification fails, post the errors and allow the boot to continue.
2 - enforce
Lockdown the GRUB. Signature verification is performed and If signature verification fails, post the errors and stop the boot.
Now, only support disabled and enforce.
3.) Enable appended signature verification using builtin keys (Patches 2 - 8 and 10).
Part of a secure boot chain is allowing grub to verify the boot kernel. For UEFI platforms, this is usually delegated to the shim. However, for platforms that do not implement UEFI, an alternative scheme is required.
This part teaches grub how to verify Linux kernel-style appended signatures. Kernels on powerpc are already signed with this scheme and can be verified by IMA for kexec.
As PKCS#7 messages and x509 certificates are both based on ASN.1, we import libtasn1 to parse them. Because ASN.1 isn't self-documenting, we import from GNUTLS the information we need to navigate their structure.
This section is composed of the following patches:
- patches 2 and 3 are small refactorings.
- patch 4 allows x509 certificates to be built in to the grub core in much the same way as PGP keys.
- patch 5 brings in the code from GNUTLS that allows us to parse PKCS#7 and x509 with libtasn1.
- patch 6, 7 and 8 is our ASN1 node, PKCS#7 and x509 parser. They're minimal and fairly strict parsers that extract only the bits we need to verify the signatures.
- patch 10 is the guts of the appended signature verifier.
4.) Enable accessing keys dynamically from Platform KeyStore (Patch 11 - 18)
This part teaches grub how to read db and dbx variables from platform keystore using client interface call then load keys from those two variable, and use it to verify Linux kernel.
This section is composed of the following patches:
- patch 11 is an exposes an interface in ieee1275 for reading secure boot variable db and dbx from Platform Keystore. Read secure boot variables such as db and dbx from PKS and extract certificates from ESL.
- patch 12 is introducing key management environment variable.
- patch 13 is create the db and dbx lists from PKS.
- patch 14 is verify the kernel using db and dbx lists
- patch 15 is GRUB commands to manage the certificates
- patch 16 sets the use_static_keys flag if DB not available in PKS, and patch 17 is reads the DB default keys from ELF Note and store it in trusted lists if use_static_keys flag is set.
- patch 18 adds GRUB commands to access db and dbx.
5.) patch 19 adds unit test and 22 adds GRUB commands and an appended signatures
documentation.
Thanks to Daniel Kiper and srish for providing review comments.
I've pushed this all to
https://github.com/SudhakarKuppusamy1/grub/tree/appendedsig-2.13
[1]https://www.ibm.com/docs/en/linux-on-systems?topic=servers-guest-secure-boot-static-keys [2]https://community.ibm.com/community/user/power/blogs/chris-engel1/2020/11/20/powervm-introduces-the-platform-keystore
Daniel Axtens (2):
crypto: Move storage for grub_crypto_pk_* to crypto.c docs/grub: Document signing GRUB under UEFI
Sudhakar Kuppusamy (20):
powerpc-ieee1275: Add support for signing GRUB with an appended
signature
pgp: Rename OBJ_TYPE_PUBKEY to OBJ_TYPE_GPG_PUBKEY
grub-install: Support embedding x509 certificates
appended signatures: Import GNUTLS's ASN.1 description files appended signatures: Parse ASN1 node
appended signatures: Parse PKCS#7 signed data
appended signatures: Parse X.509 certificates
powerpc_ieee1275: Enter lockdown based on /ibm,secure-boot appended signatures: Support verifying appended signatures
powerpc_ieee1275: Read the db and dbx secure boot variables appended signatures: Introducing key management environment variable appended signatures: Create db and dbx lists
appended signatures: Using db and dbx lists for signature verification appended signatures: GRUB commands to manage the certificates
powerpc_ieee1275: Introduce use_static_keys flag
appended signatures: Read default db keys from the ELF Note appended signatures: GRUB commands to manage the hashes appended signatures: Verification tests
docs/grub: Document signing GRUB with an appended signature docs/grub: Document appended signature
docs/grub.texi | 483 ++++- grub-core/Makefile.am | 2 + grub-core/Makefile.core.def | 26 + grub-core/commands/appendedsig/appendedsig.c | 1723 +++++++++++++++++ grub-core/commands/appendedsig/appendedsig.h | 134 ++ grub-core/commands/appendedsig/asn1util.c | 97 + .../commands/appendedsig/gnutls_asn1_tab.c | 148 ++ grub-core/commands/appendedsig/pkcs7.c | 452 +++++ .../commands/appendedsig/pkix_asn1_tab.c | 485 +++++ grub-core/commands/appendedsig/x509.c | 979 ++++++++++ grub-core/commands/pgp.c | 6 +- grub-core/kern/ieee1275/ieee1275.c | 1 - grub-core/kern/ieee1275/init.c | 58 + grub-core/kern/powerpc/ieee1275/ieee1275.c | 137 ++ .../kern/powerpc/ieee1275/platform_keystore.c | 368 ++++ grub-core/lib/crypto.c | 4 + grub-core/tests/appended_signature_test.c | 348 ++++ grub-core/tests/appended_signatures.h | 975 ++++++++++ grub-core/tests/lib/functional_test.c | 1 + include/grub/crypto.h | 1 + include/grub/efi/pks.h | 112 ++ include/grub/err.h | 3 +- include/grub/file.h | 4 + include/grub/ieee1275/ieee1275.h | 3 + include/grub/kernel.h | 3 +- include/grub/lockdown.h | 3 +- include/grub/powerpc/ieee1275/ieee1275.h | 18 + .../grub/powerpc/ieee1275/platform_keystore.h | 127 ++ include/grub/types.h | 4 + include/grub/util/install.h | 10 +- include/grub/util/mkimage.h | 4 +- util/grub-install-common.c | 42 +- util/grub-mkimage.c | 32 +- util/grub-mkimagexx.c | 40 +- util/mkimage.c | 50 +- 35 files changed, 6839 insertions(+), 44 deletions(-) create mode 100644 grub-core/commands/appendedsig/appendedsig.c create mode 100644 grub-core/commands/appendedsig/appendedsig.h create mode 100644 grub-core/commands/appendedsig/asn1util.c create mode 100644 grub-core/commands/appendedsig/gnutls_asn1_tab.c create mode 100644 grub-core/commands/appendedsig/pkcs7.c create mode 100644 grub-core/commands/appendedsig/pkix_asn1_tab.c create mode 100644 grub-core/commands/appendedsig/x509.c create mode 100644 grub-core/kern/powerpc/ieee1275/ieee1275.c create mode 100644 grub-core/kern/powerpc/ieee1275/platform_keystore.c create mode 100644 grub-core/tests/appended_signature_test.c create mode 100644 grub-core/tests/appended_signatures.h create mode 100644 include/grub/efi/pks.h create mode 100644 include/grub/powerpc/ieee1275/platform_keystore.h
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 1/22 powerpc-ieee1275: Add support for signing GRUB with an appended signature
Add infrastructure to allow firmware to verify the integrity of GRUB by use of a Linux-kernel-module-style appended signature. We initially target powerpc-ieee1275, but the code should be extensible to other platforms.
Usually these signatures are appended to a file without modifying the ELF file itself. (This is what the 'sign-file' tool does, for example.) The verifier loads the signed file from the file system and looks at the end of the file for the appended signature. However, on powerpc-ieee1275 platforms, the bootloader is often stored directly in the PReP partition as raw bytes without a file-system. This makes determining the location of an appended signature more difficult.
To address this, we add a new ELF Note.
The name field of shall be the string "Appended-Signature", zero-padded to 4 byte alignment. The type field shall be 0x41536967 (the ASCII values for the string "ASig"). It must be the final section in the ELF binary.
The description shall contain the appended signature structure as defined by the Linux kernel. The description will also be padded to be a multiple of 4 bytes. The padding shall be added before the appended signature structure (not at the end) so that the final bytes of a signed ELF file are the appended signature magic.
A subsequent patch documents how to create a GRUB core.img validly signed under this scheme.
--- include/grub/util/install.h | 7 +++++-- include/grub/util/mkimage.h | 4 ++-- util/grub-install-common.c | 23 ++++++++++++++++++--- util/grub-mkimage.c | 18 +++++++++++++++++ util/grub-mkimagexx.c | 40 ++++++++++++++++++++++++++++++++++++- util/mkimage.c | 9 ++++++--- 6 files changed, 90 insertions(+), 11 deletions(-)
include/grub/util/install.h +5 -2
@@ -69,6 +69,8 @@ N_("disable shim_lock verifier"), 0 }, \ {"disable-cli" ,GRUB_INSTALL_OPTIONS_DISABLE_CLI ,0 ,0 , \ N_("disabled command line interface access"), 0 }, \ + { "appended-signature-size", GRUB_INSTALL_OPTIONS_APPENDED_SIGNATURE_SIZE, \ + "SIZE", 0, N_("Add a note segment reserving SIZE bytes for an appended signature"), 1}, \ { "verbose", 'v', 0, 0, \ N_("print verbose messages."), 1 }
@@ -132,7 +134,8 @@ enum grub_install_options {GRUB_INSTALL_OPTIONS_DTB ,GRUB_INSTALL_OPTIONS_SBAT ,GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK , - GRUB_INSTALL_OPTIONS_DISABLE_CLI +GRUB_INSTALL_OPTIONS_DISABLE_CLI , + GRUB_INSTALL_OPTIONS_APPENDED_SIGNATURE_SIZE };extern char *grub_install_source_directory;
@@ -192,7 +195,7 @@ grub_install_generate_image (const char *dir, const char *prefix,size_t npubkeys, char *config_path, const struct grub_install_image_target_desc *image_target, - int note, + int note, size_t appsig_size, grub_compression_t comp, const char *dtb_file, const char *sbat_path, const int disable_shim_lock, const int disable_cli);
include/grub/util/mkimage.h +2 -2
@@ -51,12 +51,12 @@ grub_mkimage_load_image64 (const char *kernel_path, const struct grub_install_image_target_desc *image_target);void grub_mkimage_generate_elf32 (const struct grub_install_image_target_desc *image_target, -int note,char *sbat,char **core_img,size_t *core_size, +int note,char *sbat,size_t appsig_size,char **core_img,size_t *core_size,Elf32_Addr target_addr,struct grub_mkimage_layout *layout);void grub_mkimage_generate_elf64 (const struct grub_install_image_target_desc *image_target, -int note,char *sbat,char **core_img,size_t *core_size, +int note,char *sbat,size_t appsig_size,char **core_img,size_t *core_size,Elf64_Addr target_addr,struct grub_mkimage_layout *layout);
util/grub-install-common.c +20 -3
@@ -467,10 +467,13 @@ static char *sbat;static int disable_shim_lock;static grub_compression_t compression;static int disable_cli; +static size_t appsig_size;int grub_install_parse (int key,char *arg) { +const char *end; +switch (key) {case GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS :
@@ -571,6 +574,19 @@ grub_install_parse (int key, char *arg)grub_util_error (_ ("Unrecognized compression `%s'" ), arg);case GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE :return 1 ; +case GRUB_INSTALL_OPTIONS_APPENDED_SIGNATURE_SIZE : + appsig_size =grub_strtoul (arg, &end,10 ); +if (*arg =='\0' || *end !='\0' ) + { +grub_util_error (_ ("non-numeric or invalid appended signature size `%s'" ), arg); +return 0 ; + } +else if (appsig_size ==0 ) + { +grub_util_error (_ ("appended signature size `%s', and it should not be zero" ), arg); +return 0 ; + } +return 1 ;default :return 0 ; }
@@ -683,9 +699,10 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, *p ='\0' ;grub_util_info ("grub-mkimage --directory '%s' --prefix '%s' --output '%s'" -" --format '%s' --compression '%s'%s%s%s%s\n" , +" --format '%s' --compression '%s'" +" --appended-signature-size %zu %s %s %s %s\n" , dir, prefix, outname, - mkimage_target, compnames[compression], + mkimage_target, compnames[compression], appsig_size, note ?" --note" :"" , disable_shim_lock ?" --disable-shim-lock" :"" , disable_cli ?" --disable-cli" :"" , s);
@@ -698,7 +715,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,grub_install_generate_image (dir, prefix, fp, outname, modules.entries, memdisk_path, pubkeys, npubkeys, config_path, tgt, - note, compression, dtb, sbat, + note, appsig_size, compression, dtb, sbat, disable_shim_lock, disable_cli);while (dc--)grub_install_pop_module ();
util/grub-mkimage.c +18 -0
@@ -84,6 +84,7 @@ static struct argp_option options[] = { {"sbat", 's', N_("FILE"), 0, N_("SBAT metadata"), 0}, {"disable-shim-lock", GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK, 0, 0, N_("disable shim_lock verifier"), 0}, {"disable-cli", GRUB_INSTALL_OPTIONS_DISABLE_CLI, 0, 0, N_("disable command line interface access"), 0}, + {"appended-signature-size", 'S', N_("SIZE"), 0, N_("Add a note segment reserving SIZE bytes for an appended signature"), 0}, {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, { 0, 0, 0, 0, 0, 0 } };
@@ -130,6 +131,7 @@ struct argumentsint note;int disable_shim_lock;int disable_cli; +size_t appsig_size;const struct grub_install_image_target_desc *image_target;grub_compression_t comp; };
@@ -140,6 +142,7 @@ argp_parser (int key, char *arg, struct argp_state *state)/* Get the input argument from argp_parse, which we know is a pointer to our arguments structure. */ struct arguments *arguments = state->input; +const char *end;switch (key) {
@@ -172,6 +175,20 @@ argp_parser (int key, char *arg, struct argp_state *state) arguments->note =1 ;break ; +case 'S' : + arguments->appsig_size =grub_strtoul (arg, &end,10 ); +if (*arg =='\0' || *end !='\0' ) + { +grub_util_error (_ ("non-numeric or invalid appended signature size `%s'" ), arg); +return 1 ; + } +else if (arguments->appsig_size ==0 ) + { +grub_util_error (_ ("appended signature size `%s', and it should not be zero" ), arg); +return 1 ; + } +break ; +case 'm' :if (arguments->memdisk)free (arguments->memdisk);
@@ -330,6 +347,7 @@ main (int argc, char *argv[]) arguments.memdisk, arguments.pubkeys, arguments.npubkeys, arguments.config, arguments.image_target, arguments.note, + arguments.appsig_size, arguments.comp, arguments.dtb, arguments.sbat, arguments.disable_shim_lock, arguments.disable_cli);
util/grub-mkimagexx.c +39 -1
@@ -115,6 +115,14 @@ struct grub_sbat_note {char name[ALIGN_UP (sizeof (GRUB_SBAT_NOTE_NAME ),4 )]; }; +#define GRUB_APPENDED_SIGNATURE_NOTE_NAME "Appended-Signature" +#define GRUB_APPENDED_SIGNATURE_NOTE_TYPE 0x41536967/* "ASig" */ +struct grub_appended_signature_note +{ +Elf32_Nhdr header; +char name[ALIGN_UP (sizeof (GRUB_APPENDED_SIGNATURE_NOTE_NAME ),4 )]; +}; +static int is_relocatable (const struct grub_install_image_target_desc *image_target) {
@@ -216,7 +224,7 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)void SUFFIX (grub_mkimage_generate_elf ) (const struct grub_install_image_target_desc *image_target, -int note,char *sbat,char **core_img,size_t *core_size, +int note,char *sbat,size_t appsig_size,char **core_img,size_t *core_size,Elf_Addr target_addr,struct grub_mkimage_layout *layout) {
@@ -237,6 +245,12 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc footer_size +=ALIGN_UP (sizeof (struct grub_sbat_note ) + layout->sbat_size,4 ); } +if (appsig_size) + { + phnum++; + footer_size +=ALIGN_UP (sizeof (struct grub_appended_signature_note ),4 ); + } +if (image_target->id !=IMAGE_LOONGSON_ELF ) phnum +=2 ;
@@ -518,6 +532,30 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_descmemcpy (note_ptr->name,GRUB_SBAT_NOTE_NAME ,sizeof (GRUB_SBAT_NOTE_NAME ));memcpy ((char *)(note_ptr +1 ), sbat, layout->sbat_size); + phdr++; + phdr->p_type =grub_host_to_target32 (PT_NOTE ); + phdr->p_flags =grub_host_to_target32 (PF_R ); + phdr->p_align =grub_host_to_target32 (image_target->voidp_sizeof); + phdr->p_vaddr =0 ; + phdr->p_paddr =0 ; + phdr->p_filesz =grub_host_to_target32 (note_size); + phdr->p_memsz =0 ; + phdr->p_offset =grub_host_to_target32 (header_size + program_size + footer_offset); + footer += note_size; + footer_offset += note_size; + } + +if (appsig_size) + { +int note_size =ALIGN_UP (sizeof (struct grub_appended_signature_note ) + appsig_size,4 ); +struct grub_appended_signature_note *note_ptr = (struct grub_appended_signature_note *) footer; + + note_ptr->header.n_namesz =grub_host_to_target32 (sizeof (GRUB_APPENDED_SIGNATURE_NOTE_NAME )); +/* Needs to sit at the end, so we round this up and sign some zero padding. */ + note_ptr->header.n_descsz =grub_host_to_target32 (ALIGN_UP (appsig_size,4 )); + note_ptr->header.n_type =grub_host_to_target32 (GRUB_APPENDED_SIGNATURE_NOTE_TYPE ); +strcpy (note_ptr->name,GRUB_APPENDED_SIGNATURE_NOTE_NAME ); + phdr++; phdr->p_type =grub_host_to_target32 (PT_NOTE ); phdr->p_flags =grub_host_to_target32 (PF_R );
util/mkimage.c +6 -3
@@ -885,7 +885,7 @@ grub_install_generate_image (const char *dir, const char *prefix, char *memdisk_path, char **pubkey_paths, size_t npubkeys, char *config_path, const struct grub_install_image_target_desc *image_target, - int note, grub_compression_t comp, const char *dtb_path, + int note, size_t appsig_size, grub_compression_t comp, const char *dtb_path, const char *sbat_path, int disable_shim_lock, int disable_cli) {
@@ -946,6 +946,9 @@ grub_install_generate_image (const char *dir, const char *prefix,if (sbat_path !=NULL && (image_target->id !=IMAGE_EFI && image_target->id !=IMAGE_PPC ))grub_util_error (_ ("SBAT data can be added only to EFI or powerpc-ieee1275 images" )); +if (appsig_size !=0 && image_target->id !=IMAGE_PPC ) +grub_util_error (_ ("appended signature can be support only to powerpc-ieee1275 images" )); +if (disable_shim_lock) total_module_size +=sizeof (struct grub_module_header );
@@ -1833,10 +1836,10 @@ grub_install_generate_image (const char *dir, const char *prefix,else target_addr = image_target->link_addr;if (image_target->voidp_sizeof ==4 ) -grub_mkimage_generate_elf32 (image_target, note, sbat, &core_img, &core_size, +grub_mkimage_generate_elf32 (image_target, note, sbat, appsig_size, &core_img, &core_size, target_addr, &layout);else -grub_mkimage_generate_elf64 (image_target, note, sbat, &core_img, &core_size, +grub_mkimage_generate_elf64 (image_target, note, sbat, appsig_size, &core_img, &core_size, target_addr, &layout); }break ;
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 2/22 crypto: Move storage for grub_crypto_pk_* to crypto.c
In reply to Sudhakar Kuppusamy via Grub-develFrom: Daniel Axtens <[email protected]>
The way gcry_rsa and friends (the asymmetric ciphers) are loaded for the pgp module is a bit quirky.
include/grub/crypto.h contains:
extern struct gcry_pk_spec *grub_crypto_pk_rsa;
commands/pgp.c contains the actual storage:
struct gcry_pk_spec *grub_crypto_pk_rsa;
And the module itself saves to the storage in pgp.c:
GRUB_MOD_INIT(gcry_rsa)
{
grub_crypto_pk_rsa = &_gcry_pubkey_spec_rsa;}
This is annoying: gcry_rsa now has a dependency on pgp!
We want to be able to bring in gcry_rsa without bringing in PGP, so move the storage to crypto.c.
Previously, gcry_rsa depended on pgp and mpi. Now it depends on crypto and mpi. As pgp depends on crypto, this doesn't add any new module dependencies using the PGP verfier.
[FWIW, the story is different for the symmetric ciphers. cryptodisk and friends (zfs encryption etc) use grub_crypto_lookup_cipher_by_name() to get a cipher handle. That depends on grub_ciphers being populated by people calling grub_cipher_register. import_gcry.py ensures that the symmetric ciphers call it.]
--- grub-core/commands/pgp.c | 4 ---- grub-core/lib/crypto.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)
grub-core/commands/pgp.c +0 -4
@@ -136,10 +136,6 @@ struct signature_v4_headergrub_uint16_t hashed_sub; }GRUB_PACKED ; -struct gcry_pk_spec *grub_crypto_pk_dsa; -struct gcry_pk_spec *grub_crypto_pk_ecdsa; -struct gcry_pk_spec *grub_crypto_pk_rsa; -struct {const char *name;
grub-core/lib/crypto.c +4 -0
@@ -170,6 +170,10 @@ grub_md_unregister (gcry_md_spec_t *cipher) } } +struct gcry_pk_spec *grub_crypto_pk_dsa; +struct gcry_pk_spec *grub_crypto_pk_ecdsa; +struct gcry_pk_spec *grub_crypto_pk_rsa; +void grub_crypto_hash (const gcry_md_spec_t *hash,void *out,const void *in,grub_size_t inlen)
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 3/22 pgp: Rename OBJ_TYPE_PUBKEY to OBJ_TYPE_GPG_PUBKEY
In reply to Sudhakar Kuppusamy via Grub-develPrior to the addition of the X.509 public key support for appended signature, current PGP signature relied on the GPG public key. Changing the enum name from "OBJ_TYPE_PUBKEY" to "OBJ_TYPE_GPG_PUBKEY" to differentiate between x509 certificate based appended signature and GPG certificate based PGP signature.
--- docs/grub.texi | 34 +++++++++++++++++----------------- grub-core/commands/pgp.c | 2 +- include/grub/kernel.h | 2 +- util/grub-mkimage.c | 2 +- util/mkimage.c | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-)
docs/grub.texi +17 -17
@@ -3357,8 +3357,8 @@ entry when selected. @node check_signatures @subsection check_signatures -This variable controls whether GRUB enforces digital signature -validation on loaded files. @xref{Using digital signatures}. +This variable controls whether GRUB enforces GPG-style digital signature +validation on loaded files. @xref{Using GPG-style digital signatures}. @node chosen @subsection chosen
@@ -7054,7 +7054,7 @@ These keys are used to validate signatures when environment variable @code{check_signatures} is set to @code{enforce} (@pxref{check_signatures}), and by some invocations of @command{verify_detached} (@pxref{verify_detached}). @xref{Using -digital signatures}, for more information. +GPG-style digital signatures}, for more information. @end deffn @node drivemap
@@ -7470,7 +7470,7 @@ The output is in GPG's v4 key fingerprint format (i.e., the output of @code{gpg --fingerprint}). The least significant four bytes (last eight hexadecimal digits) can be used as an argument to @command{distrust} (@pxref{distrust}). -@xref{Using digital signatures}, for more information about uses for +@xref{Using GPG-style digital signatures}, for more information about uses for these keys. @end deffn
@@ -7505,7 +7505,7 @@ When used with care, @option{--skip-sig} and the whitelist enable an administrator to configure a system to boot only signed configurations, but to allow the user to select from among multiple configurations, and to enable ``one-shot'' boot attempts and -``savedefault'' behavior. @xref{Using digital signatures}, for more +``savedefault'' behavior. @xref{Using GPG-style digital signatures}, for more information. @end deffn
@@ -7877,7 +7877,7 @@ read. It is possible to modify a digitally signed environment block file from within GRUB using this command, such that its signature will no longer be valid on subsequent boots. Care should be taken in such advanced configurations to avoid rendering the system -unbootable. @xref{Using digital signatures}, for more information. +unbootable. @xref{Using GPG-style digital signatures}, for more information. @end deffn
@@ -8367,7 +8367,7 @@ signatures when environment variable @code{check_signatures} is set to must itself be properly signed. The @option{--skip-sig} option can be used to disable signature-checking when reading @var{pubkey_file} itself. It is expected that @option{--skip-sig} is useful for testing -and manual booting. @xref{Using digital signatures}, for more +and manual booting. @xref{Using GPG-style digital signatures}, for more information. @end deffn
@@ -8440,7 +8440,7 @@ tried. Exit code @code{$?} is set to 0 if the signature validates successfully. If validation fails, it is set to a non-zero value. -@xref{Using digital signatures}, for more information. +@xref{Using GPG-style digital signatures}, for more information. @end deffn @node videoinfo
@@ -8900,13 +8900,13 @@ environment variables and commands are listed in the same order. @chapter Security @menu -* Authentication and authorisation:: Users and access control -* Using digital signatures:: Booting digitally signed code -* UEFI secure boot and shim:: Booting digitally signed PE files -* Secure Boot Advanced Targeting:: Embedded information for generation number based revocation -* Measured Boot:: Measuring boot components -* Lockdown:: Lockdown when booting on a secure setup -* TPM2 key protector:: Managing disk key with TPM2 key protector +* Authentication and authorisation:: Users and access control +* Using GPG-style digital signatures:: Booting digitally signed code +* UEFI secure boot and shim:: Booting digitally signed PE files +* Secure Boot Advanced Targeting:: Embedded information for generation number based revocation +* Measured Boot:: Measuring boot components +* Lockdown:: Lockdown when booting on a secure setup +* TPM2 key protector:: Managing disk key with TPM2 key protector @end menu @node Authentication and authorisation
@@ -8982,8 +8982,8 @@ generating configuration files with authentication. You can use adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2} commands. -@node Using digital signatures -@section Using digital signatures in GRUB +@node Using GPG-style digital signatures +@section Using GPG-style digital signatures in GRUB GRUB's @file{core.img} can optionally provide enforcement that all files subsequently read from disk are covered by a valid digital signature.
grub-core/commands/pgp.c +1 -1
@@ -920,7 +920,7 @@ GRUB_MOD_INIT(pgp)grub_memset (&pseudo_file,0 ,sizeof (pseudo_file));/* Not an ELF module, skip. */ -if (header->type !=OBJ_TYPE_PUBKEY ) +if (header->type !=OBJ_TYPE_GPG_PUBKEY )continue ; pseudo_file.fs = &pseudo_fs;
include/grub/kernel.h +1 -1
@@ -28,7 +28,7 @@ enumOBJ_TYPE_MEMDISK ,OBJ_TYPE_CONFIG ,OBJ_TYPE_PREFIX , -OBJ_TYPE_PUBKEY , +OBJ_TYPE_GPG_PUBKEY ,OBJ_TYPE_DTB ,OBJ_TYPE_DISABLE_SHIM_LOCK ,OBJ_TYPE_DISABLE_CLI
util/grub-mkimage.c +1 -1
@@ -75,7 +75,7 @@ static struct argp_option options[] = {/* TRANSLATORS: "embed" is a verb (command description). "*/ {"config", 'c', N_("FILE"), 0, N_("embed FILE as an early config"), 0},/* TRANSLATORS: "embed" is a verb (command description). "*/ - {"pubkey", 'k', N_("FILE"), 0, N_("embed FILE as public key for signature checking"), 0}, + {"pubkey", 'k', N_("FILE"), 0, N_("embed FILE as public key for PGP signature checking"), 0},/* TRANSLATORS: NOTE is a name of segment. */ {"note", 'n', 0, 0, N_("add NOTE segment for CHRP IEEE1275"), 0}, {"output", 'o', N_("FILE"), 0, N_("output a generated image to FILE [default=stdout]"), 0},
util/mkimage.c +1 -1
@@ -1056,7 +1056,7 @@ grub_install_generate_image (const char *dir, const char *prefix, curs =grub_util_get_image_size (pubkey_paths[i]); header = (struct grub_module_header *) (kernel_img + offset); - header->type =grub_host_to_target32 (OBJ_TYPE_PUBKEY ); + header->type =grub_host_to_target32 (OBJ_TYPE_GPG_PUBKEY ); header->size =grub_host_to_target32 (curs +sizeof (*header)); offset +=sizeof (*header);
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v11 03/22] pgp: Rename OBJ_TYPE_PUBKEY to OBJ_TYPE_GPG_PUBKEY
Quoted 10 lines · Sudhakar Kuppusamy
Prior to the addition of the X.509 public key support for appended signature, current PGP signature relied on the GPG public key. Changing the enum name from "
OBJ_TYPE_PUBKEY" to "OBJ_TYPE_GPG_PUBKEY" to differentiate between x509 certificate based appended signature and GPG certificate based PGP signature.Signed-off-by Alastair D'Silva <[email protected]>Signed-off-by Daniel Axtens <[email protected]>Signed-off-by Sudhakar Kuppusamy <[email protected]>Reviewed-by Daniel Kiper <[email protected]>
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 4/22 grub-install: Support embedding x509 certificates
In reply to Sudhakar Kuppusamy via Grub-develTo support verification of appended signatures, we need a way to embed the necessary public keys. Existing appended signature schemes in the Linux kernel use X.509 certificates, so allow certificates to be embedded in the GRUB core image in the same way as PGP keys.
--- include/grub/kernel.h | 1 + include/grub/util/install.h | 3 +++ util/grub-install-common.c | 19 +++++++++++++++++- util/grub-mkimage.c | 12 +++++++++++- util/mkimage.c | 39 ++++++++++++++++++++++++++++++++++++- 5 files changed, 71 insertions(+), 3 deletions(-)
include/grub/kernel.h +1 -0
@@ -29,6 +29,7 @@ enumOBJ_TYPE_CONFIG ,OBJ_TYPE_PREFIX ,OBJ_TYPE_GPG_PUBKEY , +OBJ_TYPE_X509_PUBKEY ,OBJ_TYPE_DTB ,OBJ_TYPE_DISABLE_SHIM_LOCK ,OBJ_TYPE_DISABLE_CLI
include/grub/util/install.h +3 -0
@@ -69,6 +69,8 @@ N_("disable shim_lock verifier"), 0 }, \ {"disable-cli" ,GRUB_INSTALL_OPTIONS_DISABLE_CLI ,0 ,0 , \ N_("disabled command line interface access"), 0 }, \ + { "x509key", 'x', N_("FILE"), 0, \ + N_("embed FILE as an x509 certificate for appended signature checking"), 0}, \ { "appended-signature-size", GRUB_INSTALL_OPTIONS_APPENDED_SIGNATURE_SIZE, \ "SIZE", 0, N_("Add a note segment reserving SIZE bytes for an appended signature"), 1}, \ { "verbose", 'v', 0, 0, \
@@ -193,6 +195,7 @@ grub_install_generate_image (const char *dir, const char *prefix, const char *outname, char *mods[], char *memdisk_path, char **pubkey_paths, size_t npubkeys, + char **x509key_paths, size_t nx509keys, char *config_path, const struct grub_install_image_target_desc *image_target, int note, size_t appsig_size,
util/grub-install-common.c +18 -1
@@ -463,6 +463,8 @@ handle_install_list (struct install_list *il, const char *val,static char **pubkeys;static size_t npubkeys; +static char **x509keys; +static size_t nx509keys;static char *sbat;static int disable_shim_lock;static grub_compression_t compression;
@@ -511,6 +513,10 @@ grub_install_parse (int key, char *arg)case GRUB_INSTALL_OPTIONS_DISABLE_CLI : disable_cli =1 ;return 1 ; +case 'x' : + x509keys =xrealloc (x509keys,sizeof (x509keys[0 ]) * (nx509keys +1 )); + x509keys[nx509keys++] =xstrdup (arg); +return 1 ;case GRUB_INSTALL_OPTIONS_VERBOSITY : verbosity++;
@@ -648,6 +654,9 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,for (pk = pubkeys; pk < pubkeys + npubkeys; pk++) slen +=sizeof (" --pubkey ''" ) +grub_strlen (*pk); +for (pk = x509keys; pk < x509keys + nx509keys; pk++) + slen +=sizeof (" --x509key ''" ) +grub_strlen (*pk); +for (md = modules.entries; *md; md++) slen +=sizeof (" ''" ) +grub_strlen (*md);
@@ -688,6 +697,14 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, *p++ ='\'' ; } +for (pk = x509keys; pk < x509keys + nx509keys; pk++) + { + p =grub_stpcpy (p,"--x509key '" ); + p =grub_stpcpy (p, *pk); + *p++ ='\'' ; + *p++ =' ' ; + } +for (md = modules.entries; *md; md++) { *p++ =' ' ;
@@ -714,7 +731,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,grub_install_generate_image (dir, prefix, fp, outname, modules.entries, memdisk_path, - pubkeys, npubkeys, config_path, tgt, + pubkeys, npubkeys, x509keys, nx509keys, config_path, tgt, note, appsig_size, compression, dtb, sbat, disable_shim_lock, disable_cli);while (dc--)
util/grub-mkimage.c +11 -1
@@ -76,6 +76,7 @@ static struct argp_option options[] = { {"config", 'c', N_("FILE"), 0, N_("embed FILE as an early config"), 0},/* TRANSLATORS: "embed" is a verb (command description). "*/ {"pubkey", 'k', N_("FILE"), 0, N_("embed FILE as public key for PGP signature checking"), 0}, + {"x509key", 'x', N_("FILE"), 0, N_("embed FILE as an x509 certificate for appended signature checking"), 0},/* TRANSLATORS: NOTE is a name of segment. */ {"note", 'n', 0, 0, N_("add NOTE segment for CHRP IEEE1275"), 0}, {"output", 'o', N_("FILE"), 0, N_("output a generated image to FILE [default=stdout]"), 0},
@@ -125,6 +126,8 @@ struct argumentschar *dtb;char **pubkeys;size_t npubkeys; +char **x509keys; +size_t nx509keys;char *font;char *config;char *sbat;
@@ -215,6 +218,12 @@ argp_parser (int key, char *arg, struct argp_state *state) arguments->pubkeys[arguments->npubkeys++] =xstrdup (arg);break ; +case 'x' : + arguments->x509keys =xrealloc (arguments->x509keys, +sizeof (arguments->x509keys[0 ]) * (arguments->nx509keys +1 )); + arguments->x509keys[arguments->nx509keys++] =xstrdup (arg); +break ; +case 'c' :if (arguments->config)free (arguments->config);
@@ -345,7 +354,8 @@ main (int argc, char *argv[]) grub_install_generate_image (arguments.dir, arguments.prefix, fp, arguments.output, arguments.modules, arguments.memdisk, arguments.pubkeys, - arguments.npubkeys, arguments.config, + arguments.npubkeys, arguments.x509keys, + arguments.nx509keys, arguments.config, arguments.image_target, arguments.note, arguments.appsig_size, arguments.comp, arguments.dtb,
util/mkimage.c +38 -1
@@ -883,7 +883,7 @@ void grub_install_generate_image (const char *dir, const char *prefix, FILE *out, const char *outname, char *mods[], char *memdisk_path, char **pubkey_paths, - size_t npubkeys, char *config_path, + size_t npubkeys, char **x509key_paths, size_t nx509keys, char *config_path, const struct grub_install_image_target_desc *image_target, int note, size_t appsig_size, grub_compression_t comp, const char *dtb_path, const char *sbat_path, int disable_shim_lock,
@@ -929,6 +929,24 @@ grub_install_generate_image (const char *dir, const char *prefix, } } +if (nx509keys !=0 && image_target->id !=IMAGE_PPC ) +grub_util_error (_ ("x509 public key can be support only to appended signature" +" with powerpc-ieee1275 images" )); + + { +size_t i; + +for (i =0 ; i < nx509keys; i++) + { +size_t curs; + + curs =ALIGN_ADDR (grub_util_get_image_size (x509key_paths[i])); +grub_util_info ("the size of x509 public key %u is 0x%" GRUB_HOST_PRIxLONG_LONG, + (unsigned ) i, (unsigned long long ) curs); + total_module_size += curs +sizeof (struct grub_module_header ); + } + } +if (memdisk_path) { memdisk_size =ALIGN_UP (grub_util_get_image_size (memdisk_path),512 );
@@ -1065,6 +1083,25 @@ grub_install_generate_image (const char *dir, const char *prefix, } } + { +size_t i; + +for (i =0 ; i < nx509keys; i++) + { +size_t curs; +struct grub_module_header *header; + + curs =grub_util_get_image_size (x509key_paths[i]); + header = (struct grub_module_header *) (kernel_img + offset); + header->type =grub_host_to_target32 (OBJ_TYPE_X509_PUBKEY ); + header->size =grub_host_to_target32 (curs +sizeof (*header)); + + offset +=sizeof (*header); +grub_util_load_image (x509key_paths[i], kernel_img + offset); + offset +=ALIGN_ADDR (curs); + } + } +if (memdisk_path) {struct grub_module_header *header;
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 5/22 appended signatures: Import GNUTLS's ASN.1 description files
In reply to Sudhakar Kuppusamy via Grub-develIn order to parse PKCS#7 messages and X.509 certificates with libtasn1, we need some information about how they are encoded.
We get these from GNUTLS, which has the benefit that they support the features we need and are well tested.
The GNUTLS files are from:
- https://github.com/gnutls/gnutls/blob/master/lib/gnutls.asn
- https://github.com/gnutls/gnutls/blob/master/lib/pkix.asn
The GNUTLS license is LGPLv2.1+, which is GPLv3 compatible, allowing us to import it without issue.
--- .../commands/appendedsig/gnutls_asn1_tab.c | 148 ++++++ .../commands/appendedsig/pkix_asn1_tab.c | 485 ++++++++++++++++++ 2 files changed, 633 insertions(+) create mode 100644 grub-core/commands/appendedsig/gnutls_asn1_tab.c create mode 100644 grub-core/commands/appendedsig/pkix_asn1_tab.c
grub-core/commands/appendedsig/gnutls_asn1_tab.c new file +148 -0
@@ -0,0 +1,148 @@ +#include <grub/mm.h> +#include <libtasn1.h> + +/* +* Imported from gnutls.asn. +* https://github.com/gnutls/gnutls/blob/master/lib/gnutls.asn +*/ +const asn1_static_node grub_gnutls_asn1_tab[] = { + {"GNUTLS" ,536872976 ,NULL }, + {NULL ,1073741836 ,NULL }, + {"RSAPublicKey" ,1610612741 ,NULL }, + {"modulus" ,1073741827 ,NULL }, + {"publicExponent" ,3 ,NULL }, + {"RSAPrivateKey" ,1610612741 ,NULL }, + {"version" ,1073741827 ,NULL }, + {"modulus" ,1073741827 ,NULL }, + {"publicExponent" ,1073741827 ,NULL }, + {"privateExponent" ,1073741827 ,NULL }, + {"prime1" ,1073741827 ,NULL }, + {"prime2" ,1073741827 ,NULL }, + {"exponent1" ,1073741827 ,NULL }, + {"exponent2" ,1073741827 ,NULL }, + {"coefficient" ,1073741827 ,NULL }, + {"otherPrimeInfos" ,16386 ,"OtherPrimeInfos" }, + {"ProvableSeed" ,1610612741 ,NULL }, + {"algorithm" ,1073741836 ,NULL }, + {"seed" ,7 ,NULL }, + {"OtherPrimeInfos" ,1612709899 ,NULL }, + {"MAX" ,1074266122 ,"1" }, + {NULL ,2 ,"OtherPrimeInfo" }, + {"OtherPrimeInfo" ,1610612741 ,NULL }, + {"prime" ,1073741827 ,NULL }, + {"exponent" ,1073741827 ,NULL }, + {"coefficient" ,3 ,NULL }, + {"AlgorithmIdentifier" ,1610612741 ,NULL }, + {"algorithm" ,1073741836 ,NULL }, + {"parameters" ,541081613 ,NULL }, + {"algorithm" ,1 ,NULL }, + {"DigestInfo" ,1610612741 ,NULL }, + {"digestAlgorithm" ,1073741826 ,"DigestAlgorithmIdentifier" }, + {"digest" ,7 ,NULL }, + {"DigestAlgorithmIdentifier" ,1073741826 ,"AlgorithmIdentifier" }, + {"DSAPublicKey" ,1073741827 ,NULL }, + {"DSAParameters" ,1610612741 ,NULL }, + {"p" ,1073741827 ,NULL }, + {"q" ,1073741827 ,NULL }, + {"g" ,3 ,NULL }, + {"DSASignatureValue" ,1610612741 ,NULL }, + {"r" ,1073741827 ,NULL }, + {"s" ,3 ,NULL }, + {"DSAPrivateKey" ,1610612741 ,NULL }, + {"version" ,1073741827 ,NULL }, + {"p" ,1073741827 ,NULL }, + {"q" ,1073741827 ,NULL }, + {"g" ,1073741827 ,NULL }, + {"Y" ,1073741827 ,NULL }, + {"priv" ,3 ,NULL }, + {"DHParameter" ,1610612741 ,NULL }, + {"prime" ,1073741827 ,NULL }, + {"base" ,1073741827 ,NULL }, + {"privateValueLength" ,16387 ,NULL }, + {"pkcs-11-ec-Parameters" ,1610612754 ,NULL }, + {"oId" ,1073741836 ,NULL }, + {"curveName" ,31 ,NULL }, + {"ECParameters" ,1610612754 ,NULL }, + {"namedCurve" ,12 ,NULL }, + {"ECPrivateKey" ,1610612741 ,NULL }, + {"Version" ,1073741827 ,NULL }, + {"privateKey" ,1073741831 ,NULL }, + {"parameters" ,1610637314 ,"ECParameters" }, + {NULL ,2056 ,"0" }, + {"publicKey" ,536895494 ,NULL }, + {NULL ,2056 ,"1" }, + {"PrincipalName" ,1610612741 ,NULL }, + {"name-type" ,1610620931 ,NULL }, + {NULL ,2056 ,"0" }, + {"name-string" ,536879115 ,NULL }, + {NULL ,1073743880 ,"1" }, + {NULL ,27 ,NULL }, + {"KRB5PrincipalName" ,1610612741 ,NULL }, + {"realm" ,1610620955 ,NULL }, + {NULL ,2056 ,"0" }, + {"principalName" ,536879106 ,"PrincipalName" }, + {NULL ,2056 ,"1" }, + {"RSAPSSParameters" ,1610612741 ,NULL }, + {"hashAlgorithm" ,1610637314 ,"AlgorithmIdentifier" }, + {NULL ,2056 ,"0" }, + {"maskGenAlgorithm" ,1610637314 ,"AlgorithmIdentifier" }, + {NULL ,2056 ,"1" }, + {"saltLength" ,1610653699 ,NULL }, + {NULL ,1073741833 ,"20" }, + {NULL ,2056 ,"2" }, + {"trailerField" ,536911875 ,NULL }, + {NULL ,1073741833 ,"1" }, + {NULL ,2056 ,"3" }, + {"RSAOAEPParameters" ,1610612741 ,NULL }, + {"hashAlgorithm" ,1610637314 ,"AlgorithmIdentifier" }, + {NULL ,2056 ,"0" }, + {"maskGenAlgorithm" ,1610637314 ,"AlgorithmIdentifier" }, + {NULL ,2056 ,"1" }, + {"pSourceFunc" ,536895490 ,"AlgorithmIdentifier" }, + {NULL ,2056 ,"2" }, + {"GOSTParameters" ,1610612741 ,NULL }, + {"publicKeyParamSet" ,1073741836 ,NULL }, + {"digestParamSet" ,16396 ,NULL }, + {"GOSTParametersOld" ,1610612741 ,NULL }, + {"publicKeyParamSet" ,1073741836 ,NULL }, + {"digestParamSet" ,1073741836 ,NULL }, + {"encryptionParamSet" ,16396 ,NULL }, + {"GOSTPrivateKey" ,1073741831 ,NULL }, + {"GOSTPrivateKeyOld" ,1073741827 ,NULL }, + {"IssuerSignTool" ,1610612741 ,NULL }, + {"signTool" ,1073741858 ,NULL }, + {"cATool" ,1073741858 ,NULL }, + {"signToolCert" ,1073741858 ,NULL }, + {"cAToolCert" ,34 ,NULL }, + {"Gost28147-89-EncryptedKey" ,1610612741 ,NULL }, + {"encryptedKey" ,1073741831 ,NULL }, + {"maskKey" ,1610637319 ,NULL }, + {NULL ,4104 ,"0" }, + {"macKey" ,7 ,NULL }, + {"SubjectPublicKeyInfo" ,1610612741 ,NULL }, + {"algorithm" ,1073741826 ,"AlgorithmIdentifier" }, + {"subjectPublicKey" ,6 ,NULL }, + {"GostR3410-TransportParameters" ,1610612741 ,NULL }, + {"encryptionParamSet" ,1073741836 ,NULL }, + {"ephemeralPublicKey" ,1610637314 ,"SubjectPublicKeyInfo" }, + {NULL ,4104 ,"0" }, + {"ukm" ,7 ,NULL }, + {"GostR3410-KeyTransport" ,1610612741 ,NULL }, + {"sessionEncryptedKey" ,1073741826 ,"Gost28147-89-EncryptedKey" }, + {"transportParameters" ,536895490 ,"GostR3410-TransportParameters" }, + {NULL ,4104 ,"0" }, + {"TPMKey" ,1610612741 ,NULL }, + {"type" ,1073741836 ,NULL }, + {"emptyAuth" ,1610637316 ,NULL }, + {NULL ,2056 ,"0" }, + {"parent" ,1073741827 ,NULL }, + {"pubkey" ,1073741831 ,NULL }, + {"privkey" ,7 ,NULL }, + {"MLDSAPrivateKey" ,536870917 ,NULL }, + {"version" ,1073741827 ,NULL }, + {"privateKeyAlgorithm" ,1073741826 ,"AlgorithmIdentifier" }, + {"privateKey" ,1073741831 ,NULL }, + {"publicKey" ,536895495 ,NULL }, + {NULL ,2056 ,"1" }, + {NULL ,0 ,NULL } +};
grub-core/commands/appendedsig/pkix_asn1_tab.c new file +485 -0
485 lines not on this page · raw message
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 6/22 appended signatures: Parse ASN1 node
In reply to Sudhakar Kuppusamy via Grub-develThis code allows us to parse ASN1 node and allocating memory to store it. It will work for anything where the size libtasn1 returns is right:
- Integers
- Octet strings
- DER encoding of other structures
It will _not_ work for things where libtasn1 size requires adjustment:
- Strings that require an extra NULL byte at the end
- Bit strings because libtasn1 returns the length in bits, not bytes.
If the function returns a non-NULL value, the caller must free it.
--- grub-core/commands/appendedsig/appendedsig.h | 43 +++++++++ grub-core/commands/appendedsig/asn1util.c | 97 ++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 grub-core/commands/appendedsig/appendedsig.h create mode 100644 grub-core/commands/appendedsig/asn1util.c
grub-core/commands/appendedsig/appendedsig.h new file +43 -0
@@ -0,0 +1,43 @@ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2020, 2022 Free Software Foundation, Inc. +* Copyright (C) 2020, 2022, 2025 IBM Corporation +* +* GRUB is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* GRUB is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with GRUB. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <libtasn1.h> + +extern asn1_node grub_gnutls_gnutls_asn; +extern asn1_node grub_gnutls_pkix_asn; + +/* Do libtasn1 init. */ +extern int +grub_asn1_init (void ); + +/* +* Read a value from an ASN1 node, allocating memory to store it. +* It will work for anything where the size libtasn1 returns is right: +* - Integers +* - Octet strings +* - DER encoding of other structures +* It will _not_ work for things where libtasn1 size requires adjustment: +* - Strings that require an extra null byte at the end +* - Bit strings because libtasn1 returns the length in bits, not bytes. +* +* If the function returns a non-NULL value, the caller must free it. +*/ +extern void * +grub_asn1_allocate_and_read (asn1_node node,const char *name,const char *friendly_name, +grub_int32_t *content_size);
grub-core/commands/appendedsig/asn1util.c new file +97 -0
97 lines not on this page · raw message
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 7/22 appended signatures: Parse PKCS#7 signed data
In reply to Sudhakar Kuppusamy via Grub-develThis code allows us to parse:
- PKCS#7 signed data messages. Only a single signer info is supported, which is all that the Linux sign-file utility supports creating out-of-the-box. Only RSA, SHA-256 and SHA-512 are supported. Any certificate embedded in the PKCS#7 message will be ignored.
--- grub-core/commands/appendedsig/appendedsig.h | 38 ++ grub-core/commands/appendedsig/pkcs7.c | 452 +++++++++++++++++++ 2 files changed, 490 insertions(+) create mode 100644 grub-core/commands/appendedsig/pkcs7.c
grub-core/commands/appendedsig/appendedsig.h +38 -0
@@ -17,11 +17,49 @@* along with GRUB. If not, see <http://www.gnu.org/licenses/>. */ +#include <grub/crypto.h> #include <libtasn1.h> extern asn1_node grub_gnutls_gnutls_asn;extern asn1_node grub_gnutls_pkix_asn; +#define GRUB_MAX_OID_LEN 32 + +/* A PKCS#7 signed data signer info. */ +struct pkcs7_signer +{ +const gcry_md_spec_t *hash; +gcry_mpi_t sig_mpi; +}; +typedef struct pkcs7_signer grub_pkcs7_signer_t ; + +/* +* A PKCS#7 signed data message. +* We make no attempt to match intelligently, so we don't save any info about +* the signer. +*/ +struct pkcs7_data +{ +grub_int32_t signer_count; +grub_pkcs7_signer_t *signers; +}; +typedef struct pkcs7_data grub_pkcs7_data_t ; + +/* +* Parse a PKCS#7 message, which must be a signed data message. +* The message must be in 'sigbuf' and of size 'data_size'. The result is +* placed in 'msg', which must already be allocated. +*/ +extern grub_err_t +grub_pkcs7_data_parse (const void *sigbuf,grub_size_t data_size,grub_pkcs7_data_t *msg); + +/* +* Release all the storage associated with the PKCS#7 message. +* If the caller dynamically allocated the message, it must free it. +*/ +extern void +grub_pkcs7_data_release (grub_pkcs7_data_t *msg); +/* Do libtasn1 init. */ extern int grub_asn1_init (void );
grub-core/commands/appendedsig/pkcs7.c new file +452 -0
452 lines not on this page · raw message
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 8/22 appended signatures: Parse X.509 certificates
In reply to Sudhakar Kuppusamy via Grub-develThis code allows us to parse:
- X.509 certificates: at least enough to verify the signatures on the PKCS#7 messages. We expect that the certificates embedded in GRUB will be leaf certificates, not CA certificates. The parser enforces this.
- X.509 certificates support the Extended Key Usage extension and handle it by verifying that the certificate has a Code Signing usage.
--- grub-core/commands/appendedsig/appendedsig.h | 53 + grub-core/commands/appendedsig/x509.c | 979 +++++++++++++++++++ include/grub/crypto.h | 1 + 3 files changed, 1033 insertions(+) create mode 100644 grub-core/commands/appendedsig/x509.c
grub-core/commands/appendedsig/appendedsig.h +53 -0
@@ -25,6 +25,44 @@ extern asn1_node grub_gnutls_pkix_asn;#define GRUB_MAX_OID_LEN 32 +/* RSA public key. */ +#define GRUB_MAX_MPI 2 +#define GRUB_RSA_PK_MODULUS 0 +#define GRUB_RSA_PK_EXPONENT 1 + +/* Certificate fingerprint. */ +#define GRUB_MAX_FINGERPRINT 3 +#define GRUB_FINGERPRINT_SHA256 0 +#define GRUB_FINGERPRINT_SHA384 1 +#define GRUB_FINGERPRINT_SHA512 2 + +/* Max size of hash data. */ +#define GRUB_MAX_HASH_LEN 64 + +/* +* One or more x509 certificates. +* We do limited parsing: +* extracting only the version, serial, issuer, subject, RSA public key +* and key size. +* Also, hold the sha256, sha384, and sha512 fingerprint of the certificate. +*/ +struct x509_certificate +{ +struct x509_certificate *next; +grub_uint8_t version; +grub_uint8_t *serial; +grub_size_t serial_len; +char *issuer; +grub_size_t issuer_len; +char *subject; +grub_size_t subject_len; +/* We only support RSA public keys. This encodes [modulus, publicExponent]. */ +gcry_mpi_t mpis[GRUB_MAX_MPI ]; +grub_int32_t modulus_size; +grub_uint8_t fingerprint[GRUB_MAX_FINGERPRINT ][GRUB_MAX_HASH_LEN ]; +}; +typedef struct x509_certificate grub_x509_cert_t ; +/* A PKCS#7 signed data signer info. */ struct pkcs7_signer {
@@ -45,6 +83,21 @@ struct pkcs7_data };typedef struct pkcs7_data grub_pkcs7_data_t ; +/* +* Import a DER-encoded certificate at 'data', of size 'size'. +* Place the results into 'results', which must be already allocated. +*/ +extern grub_err_t +grub_x509_cert_parse (const void *data,grub_size_t size,grub_x509_cert_t *results); + +/* +* Release all the storage associated with the x509 certificate. +* If the caller dynamically allocated the certificate, it must free it. +* The caller is also responsible for maintenance of the linked list. +*/ +extern void +grub_x509_cert_release (grub_x509_cert_t *cert); +/* * Parse a PKCS#7 message, which must be a signed data message. * The message must be in 'sigbuf' and of size 'data_size'. The result is
grub-core/commands/appendedsig/x509.c new file +979 -0
979 lines not on this page · raw message
include/grub/crypto.h +1 -0
@@ -518,6 +518,7 @@ grub_crypto_hmac_buffer (const struct gcry_md_spec *md,extern gcry_md_spec_t _gcry_digest_spec_md5;extern gcry_md_spec_t _gcry_digest_spec_sha1;extern gcry_md_spec_t _gcry_digest_spec_sha256; +extern gcry_md_spec_t _gcry_digest_spec_sha384;extern gcry_md_spec_t _gcry_digest_spec_sha512;extern gcry_md_spec_t _gcry_digest_spec_crc32;extern gcry_cipher_spec_t _gcry_cipher_spec_aes;
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 9/22 powerpc_ieee1275: Enter lockdown based on /ibm, secure-boot
In reply to Sudhakar Kuppusamy via Grub-develRead secure boot mode from 'ibm,secure-boot' property and if the secure boot mode is set to 2 (enforce), enter lockdown. Else it is considered as disabled. There are three secure boot modes. They are
0 - disabled
No signature verification is performed. This is the default.
1 - audit
Signature verification is performed and if signature verification fails, post the errors and allow the boot to continue.
2 - enforce
Lockdown the GRUB. Signature verification is performed and If signature verification fails, post the errors and stop the boot.
Now, only support disabled and enforce.
--- docs/grub.texi | 2 +- grub-core/Makefile.core.def | 1 + grub-core/kern/ieee1275/init.c | 54 ++++++++++++++++++++++++++++++++++ include/grub/lockdown.h | 3 +- 4 files changed, 58 insertions(+), 2 deletions(-)
docs/grub.texi +1 -1
@@ -9144,7 +9144,7 @@ platforms. @section Lockdown when booting on a secure setup The GRUB can be locked down when booted on a secure boot environment, for example -if the UEFI secure boot is enabled. On a locked down configuration, the GRUB will +if the UEFI or Power secure boot is enabled. On a locked down configuration, the GRUB will be restricted and some operations/commands cannot be executed. This also includes limiting which filesystems are supported to those thought to be more robust and widely used within GRUB.
grub-core/Makefile.core.def +1 -0
@@ -333,6 +333,7 @@ kernel = { powerpc_ieee1275 = kern/powerpc/cache.S; powerpc_ieee1275 = kern/powerpc/dl.c; powerpc_ieee1275 = kern/powerpc/compiler-rt.S; + powerpc_ieee1275 = kern/lockdown.c; sparc64_ieee1275 = kern/sparc64/cache.S; sparc64_ieee1275 = kern/sparc64/dl.c;
grub-core/kern/ieee1275/init.c +54 -0
73 lines not on this page · raw message
include/grub/lockdown.h +2 -1
@@ -24,7 +24,8 @@#define GRUB_LOCKDOWN_DISABLED 0#define GRUB_LOCKDOWN_ENABLED 1 -#ifdef GRUB_MACHINE_EFI +#if defined(GRUB_MACHINE_EFI ) || \ + (defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275 ))extern void EXPORT_FUNC (grub_lockdown ) (void ); extern int
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 10/22 appended signatures: Support verifying appended signatures
In reply to Sudhakar Kuppusamy via Grub-develBuilding on the parsers and the ability to embed X.509 certificates, as well as the existing gcrypt functionality, add a module for verifying appended signatures.
This includes a signature verifier that requires that the Linux kernel and GRUB modules have appended signatures for verification.
Signature verification must be enabled by setting check_appended_signatures. If secure boot is enabled with enforce mode when the appendedsig module is loaded, signature verification will be enabled, and trusted keys will be extracted from the GRUB ELF Note and stored in the db and locked automatically.
--- grub-core/Makefile.core.def | 15 + grub-core/commands/appendedsig/appendedsig.c | 587 +++++++++++++++++++ include/grub/err.h | 3 +- include/grub/file.h | 2 + 4 files changed, 606 insertions(+), 1 deletion(-) create mode 100644 grub-core/commands/appendedsig/appendedsig.c
grub-core/Makefile.core.def +15 -0
@@ -997,6 +997,21 @@ module = { cppflags = '$(CPPFLAGS_GCRY)'; }; +module = { + name = appendedsig; + common = commands/appendedsig/appendedsig.c; + common = commands/appendedsig/x509.c; + common = commands/appendedsig/pkcs7.c; + common = commands/appendedsig/asn1util.c; + common = commands/appendedsig/gnutls_asn1_tab.c; + common = commands/appendedsig/pkix_asn1_tab.c; + enable = emu; + enable = powerpc_ieee1275; + cflags = '$(CFLAGS_GCRY) -Wno-redundant-decls'; + cppflags = '$(CPPFLAGS_GCRY) -I$(srcdir)/lib/libtasn1-grub'; + depends = crypto, gcry_rsa, gcry_sha256, gcry_sha512, mpi, asn1; +}; + module = { name = hdparm; common = commands/hdparm.c;
grub-core/commands/appendedsig/appendedsig.c new file +587 -0
587 lines not on this page · raw message
include/grub/err.h +2 -1
@@ -75,7 +75,8 @@ typedef enumGRUB_ERR_BAD_SIGNATURE ,GRUB_ERR_BAD_FIRMWARE ,GRUB_ERR_STILL_REFERENCED , - GRUB_ERR_RECURSION_DEPTH +GRUB_ERR_RECURSION_DEPTH , + GRUB_ERR_EXISTS } grub_err_t;
include/grub/file.h +2 -0
@@ -80,6 +80,8 @@ enum grub_file_typeGRUB_FILE_TYPE_PUBLIC_KEY ,/* File holding public key to add to trused keys. */ GRUB_FILE_TYPE_PUBLIC_KEY_TRUST , +/* File holding x509 certificiate to add to trusted keys. */ +GRUB_FILE_TYPE_CERTIFICATE_TRUST ,/* File of which we intend to print a blocklist to the user. */ GRUB_FILE_TYPE_PRINT_BLOCKLIST,/* File we intend to use for test loading or testing speed. */
Signature · 1 line
2.39.5 (Apple Git-154)
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v11 10/22] appended signatures: Support verifying appended signatures
Quoted 13 lines · Sudhakar Kuppusamy
Building on the parsers and the ability to embed X.509 certificates, as well as the existing gcrypt functionality, add a module for verifying appended signatures.
This includes a signature verifier that requires that the Linux kernel and GRUB modules have appended signatures for verification.
Signature verification must be enabled by setting
check_appended_signatures. If secure boot is enabled with enforce mode when the appendedsig module is loaded, signature verification will be enabled, and trusted keys will be extracted from the GRUB ELF Note and stored in the db and locked automatically.
Quoted 3 lines
Signed-off-by Daniel Axtens <[email protected]>Signed-off-by Sudhakar Kuppusamy <[email protected]>Reviewed-by Daniel Kiper <[email protected]>
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 11/22 powerpc_ieee1275: Read the db and dbx secure boot variables
In reply to Sudhakar Kuppusamy via Grub-develEnhancing the infrastructure to enable the Platform Keystore (PKS) feature, which provides access to the SB_VERSION, db, and dbx secure boot variables from PKS.
If PKS is enabled, it will read secure boot variables such as db and dbx from PKS and extract EFI Signature List (ESL) from it. The ESLs would be saved in the Platform Keystore buffer, and the appendedsig module would read it later to extract the certificate's details from ESL.
In the following scenarios, static key management mode will be activated:
1. When Secure Boot is enabled with static key management mode
2. When SB_VERSION is unavailable but Secure Boot is enabled
3. When PKS support is unavailable but Secure Boot is enabled
Note:-
SB_VERSION: Key Management Mode
1 - Enable dynamic key management mode. Read the db and dbx variables from PKS,
and use them for signature verification.
0 - Enable static key management mode. Read keys from the GRUB ELF Note and
use it for signature verification.
--- grub-core/Makefile.am | 2 + grub-core/Makefile.core.def | 2 + grub-core/kern/ieee1275/ieee1275.c | 1 - grub-core/kern/ieee1275/init.c | 4 + grub-core/kern/powerpc/ieee1275/ieee1275.c | 137 +++++++ .../kern/powerpc/ieee1275/platform_keystore.c | 347 ++++++++++++++++++ include/grub/ieee1275/ieee1275.h | 3 + include/grub/powerpc/ieee1275/ieee1275.h | 18 + .../grub/powerpc/ieee1275/platform_keystore.h | 126 +++++++ 9 files changed, 639 insertions(+), 1 deletion(-) create mode 100644 grub-core/kern/powerpc/ieee1275/ieee1275.c create mode 100644 grub-core/kern/powerpc/ieee1275/platform_keystore.c create mode 100644 include/grub/powerpc/ieee1275/platform_keystore.h
grub-core/Makefile.am +2 -0
@@ -246,6 +246,8 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/alloc.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/powerpc/ieee1275/ieee1275.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/powerpc/ieee1275/platform_keystore.h endif if COND_sparc64_ieee1275
grub-core/Makefile.core.def +2 -0
@@ -334,6 +334,8 @@ kernel = { powerpc_ieee1275 = kern/powerpc/dl.c; powerpc_ieee1275 = kern/powerpc/compiler-rt.S; powerpc_ieee1275 = kern/lockdown.c; + powerpc_ieee1275 = kern/powerpc/ieee1275/ieee1275.c; + powerpc_ieee1275 = kern/powerpc/ieee1275/platform_keystore.c; sparc64_ieee1275 = kern/sparc64/cache.S; sparc64_ieee1275 = kern/sparc64/dl.c;
grub-core/kern/ieee1275/ieee1275.c +0 -1
@@ -23,7 +23,6 @@#define IEEE1275_PHANDLE_INVALID ((grub_ieee1275_cell_t) -1)#define IEEE1275_IHANDLE_INVALID ((grub_ieee1275_cell_t) 0) -#define IEEE1275_CELL_INVALID ((grub_ieee1275_cell_t) -1)
grub-core/kern/ieee1275/init.c +4 -0
@@ -51,6 +51,8 @@#endif #if defined(__powerpc__)#include <grub/lockdown.h> +#include <grub/powerpc/ieee1275/ieee1275.h> +#include <grub/powerpc/ieee1275/platform_keystore.h> #endif #ifdef __powerpc__
@@ -1043,6 +1045,8 @@ grub_ieee1275_get_secure_boot (void) }else grub_dprintf ("ieee1275" ,"Secure Boot Disabled\n" ); + +grub_pks_keystore_init (); }#endif /* __powerpc__ */ grub_addr_t grub_modbase;
grub-core/kern/powerpc/ieee1275/ieee1275.c new file +137 -0
137 lines not on this page · raw message
grub-core/kern/powerpc/ieee1275/platform_keystore.c new file +347 -0
347 lines not on this page · raw message
include/grub/ieee1275/ieee1275.h +3 -0
@@ -24,6 +24,9 @@#include <grub/types.h> #include <grub/machine/ieee1275.h> +#define IEEE1275_CELL_INVALID ((grub_ieee1275_cell_t) -1) +#define IEEE1275_CELL_NOT_FOUND ((grub_int32_t) -7) +#define GRUB_IEEE1275_CELL_FALSE ((grub_ieee1275_cell_t) 0)#define GRUB_IEEE1275_CELL_TRUE ((grub_ieee1275_cell_t) -1)
include/grub/powerpc/ieee1275/ieee1275.h +18 -0
@@ -28,4 +28,22 @@ typedef grub_uint32_t grub_ieee1275_cell_t;#define PRIxGRUB_IEEE1275_CELL_T PRIxGRUB_UINT32_T#define PRIuGRUB_IEEE1275_CELL_T PRIuGRUB_UINT32_T +#ifdef __powerpc__ +extern grub_int32_t +grub_ieee1275_test (const char *name); + +extern grub_int32_t +grub_ieee1275_pks_max_object_size (grub_uint32_t *result); + +extern grub_int32_t +grub_ieee1275_pks_read_object (const grub_uint32_t consumer,const char *label, +const grub_uint32_t label_len,const grub_uint32_t buffer_len, +grub_uint8_t *buffer,grub_uint32_t *data_len, +grub_uint32_t *policies); + +extern grub_int32_t +grub_ieee1275_pks_read_sbvar (const grub_uint32_t sbvar_flags,const grub_uint32_t sbvar_type, +const grub_uint32_t buffer_len,grub_uint8_t *buffer, +grub_size_t *data_len); +#endif /* __powerpc__ */ #endif /* ! GRUB_IEEE1275_MACHINE_HEADER */
include/grub/powerpc/ieee1275/platform_keystore.h new file +126 -0
126 lines not on this page · raw message
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 12/22 appended signatures: Introducing key management environment variable
In reply to Sudhakar Kuppusamy via Grub-develIntroducing the appended signature key management environment variable. It is automatically set to either "static" or "dynamic" based on the Platform KeyStore.
"static": Enforce static key management signature verification.
This is the default. When the GRUB is locked down, user cannot change the value by setting the appendedsig_key_mgmt variable back to "dynamic".
"dynamic": Enforce dynamic key management signature verification.
When the GRUB is locked down, user cannot change the value by setting the appendedsig_key_mgmt variable back to "static".
--- grub-core/commands/appendedsig/appendedsig.c | 75 ++++++++++++++++++++ 1 file changed, 75 insertions(+)
grub-core/commands/appendedsig/appendedsig.c +75 -0
@@ -33,6 +33,7 @@#include <libtasn1.h> #include <grub/env.h> #include <grub/lockdown.h> +#include <grub/powerpc/ieee1275/platform_keystore.h> #include "appendedsig.h"
@@ -94,6 +95,16 @@ static sb_database_t db = {.certs = NULL, .cert_entries = 0};*/ static bool check_sigs = false; +/* +* append_key_mgmt: Key Management Modes +* False: Static key management (use built-in Keys). This is default. +* True: Dynamic key management (use Platform KeySotre). +*/ +static bool append_key_mgmt = false; + +/* Platform KeyStore db and dbx. */ +static grub_pks_t *pks_keystore; +static grub_ssize_t pseudo_read (struct grub_file *file,char *buf,grub_size_t len) {
@@ -475,6 +486,46 @@ grub_env_write_sec (struct grub_env_var *var __attribute__ ((unused)), const chareturn ret; } +static const char * +grub_env_read_key_mgmt (struct grub_env_var *var __attribute__ ((unused)), +const char *val __attribute__ ((unused))) +{ +if (append_key_mgmt == true) +return "dynamic" ; + +return "static" ; +} + +static char * +grub_env_write_key_mgmt (struct grub_env_var *var __attribute__ ((unused)),const char *val) +{ +char *ret; + +/* +* Do not allow the value to be changed if signature verification is +* (check_sigs is set to enforce) enabled and GRUB is locked down. +*/ +if (check_sigs == true &&grub_is_lockdown () ==GRUB_LOCKDOWN_ENABLED ) + { + ret =grub_strdup (grub_env_read_key_mgmt (NULL ,NULL )); +if (ret ==NULL ) +grub_error (GRUB_ERR_OUT_OF_MEMORY ,"out of memory" ); + +return ret; + } + +if ((*val =='1' ) || (*val =='d' )) + append_key_mgmt = true; +else if ((*val =='0' ) || (*val =='s' )) + append_key_mgmt = false; + + ret =grub_strdup (grub_env_read_key_mgmt (NULL ,NULL )); +if (ret ==NULL ) +grub_error (GRUB_ERR_OUT_OF_MEMORY ,"out of memory" ); + +return ret; +} +static grub_err_t appendedsig_init (grub_file_t io __attribute__ ((unused)),enum grub_file_type type,void **context __attribute__ ((unused)),enum grub_verify_flags *flags)
@@ -546,6 +597,11 @@ GRUB_MOD_INIT (appendedsig)if (grub_is_lockdown () ==GRUB_LOCKDOWN_ENABLED ) check_sigs = true; +/* If PKS keystore is available, use dynamic key management. */ + pks_keystore =grub_pks_get_keystore (); +if (pks_keystore !=NULL ) + append_key_mgmt = true; +/* * This is appended signature verification environment variable. * It is automatically set to either "no" or "enforce" based on the
@@ -560,6 +616,23 @@ GRUB_MOD_INIT (appendedsig)grub_register_variable_hook ("check_appended_signatures" , grub_env_read_sec, grub_env_write_sec);grub_env_export ("check_appended_signatures" ); +/* +* This is appended signature key management environment variable. +* It is automatically set to either "static" or "dynamic" based on the +* Platform KeyStore. +* +* "static": Enforce static key management signature verification. +* This is the default. When the GRUB is locked down, +* user cannot change the value by setting the +* appendedsig_key_mgmt variable back to "dynamic". +* +* "dynamic": Enforce dynamic key management signature verification. +* When the GRUB is locked down, user cannot change the value +* by setting the appendedsig_key_mgmt variable back to "static". +*/ +grub_register_variable_hook ("appendedsig_key_mgmt" , grub_env_read_key_mgmt, grub_env_write_key_mgmt); +grub_env_export ("appendedsig_key_mgmt" ); + rc =grub_asn1_init ();if (rc !=ASN1_SUCCESS )grub_fatal ("error initing ASN.1 data structures: %d: %s\n" , rc,asn1_strerror (rc));
@@ -583,5 +656,7 @@ GRUB_MOD_FINI (appendedsig)free_db_list ();grub_register_variable_hook ("check_appended_signatures" ,NULL ,NULL );grub_env_unset ("check_appended_signatures" ); +grub_register_variable_hook ("appendedsig_key_mgmt" ,NULL ,NULL ); +grub_env_unset ("appendedsig_key_mgmt" );grub_verifier_unregister (&grub_appendedsig_verifier); }
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 13/22 appended signatures: Create db and dbx lists
In reply to Sudhakar Kuppusamy via Grub-develIf secure boot is enabled with static key management mode, the trusted certificates will be extracted from the GRUB ELF Note and added to db list.
If secure boot is enabled with dynamic key management mode, the trusted certificates and certificate/binary hash will be extracted from the PKS and added to db list. The distrusted certificates, certificate/binary hash are read from the PKS and added to dbx list. Both dbx and db lists are introduced by a subsequent patch.
Note:-
If the certificate or the certificate hash exists in the dbx list, then do not add that certificate/certificate hash to the db list.
--- grub-core/commands/appendedsig/appendedsig.c | 398 ++++++++++++++++++- include/grub/efi/pks.h | 112 ++++++ include/grub/types.h | 4 + 3 files changed, 497 insertions(+), 17 deletions(-) create mode 100644 include/grub/efi/pks.h
grub-core/commands/appendedsig/appendedsig.c +381 -17
@@ -34,6 +34,7 @@#include <grub/env.h> #include <grub/lockdown.h> #include <grub/powerpc/ieee1275/platform_keystore.h> +#include <grub/efi/pks.h> #include "appendedsig.h"
@@ -46,6 +47,11 @@ GRUB_MOD_LICENSE ("GPLv3+");#define SIG_MAGIC "~Module signature appended~\n"#define SIG_MAGIC_SIZE ((sizeof(SIG_MAGIC) - 1)) +/* SHA256, SHA384 and SHA512 hash sizes. */ +#define SHA256_HASH_LEN 32 +#define SHA384_HASH_LEN 48 +#define SHA512_HASH_LEN 64 +/* * This structure is extracted from scripts/sign-file.c in the linux kernel * source. It was licensed as LGPLv2.1+, which is GPLv3+ compatible.
@@ -79,11 +85,22 @@ struct sb_database {grub_x509_cert_t *certs;/* Certificates. */ grub_uint32_t cert_entries;/* Number of certificates. */ +grub_uint8_t **hashes;/* Certificate/binary hashes. */ +grub_size_t *hash_sizes;/* Size of certificate/binary hashes. */ +grub_uint32_t hash_entries;/* Number of certificate/binary hashes. */ +bool is_db;/* Flag to indicate the db/dbx list. */ };typedef struct sb_database sb_database_t ;/* The db list is used to validate appended signatures. */ -static sb_database_t db = {.certs =NULL , .cert_entries =0 }; +static sb_database_t db = {.certs =NULL , .cert_entries =0 , .hashes =NULL , + .hash_sizes =NULL , .hash_entries =0 , .is_db = true}; +/* +* The dbx list is used to ensure that the distrusted certificates or GRUB modules/ +* kernel binaries are rejected during appended signatures/hashes validation. +*/ +static sb_database_t dbx = {.certs =NULL , .cert_entries =0 , .hashes =NULL , + .hash_sizes =NULL , .hash_entries =0 , .is_db = false};/* * Signature verification flag (check_sigs).
@@ -118,6 +135,172 @@ static struct grub_fs pseudo_fs = { .fs_read = pseudo_read }; +/* +* GUID can be used to determine the hashing function and +* generate the hash using determined hashing function. +*/ +static grub_err_t +get_hash (const grub_packed_guid_t *guid,const grub_uint8_t *data,const grub_size_t data_size, +grub_uint8_t *hash,grub_size_t *hash_size) +{ +gcry_md_spec_t *hash_func =NULL ; + +if (guid ==NULL ) +return grub_error (GRUB_ERR_OUT_OF_RANGE ,"GUID is not available" ); + +if (grub_memcmp (guid, &GRUB_PKS_CERT_SHA256_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 || +grub_memcmp (guid, &GRUB_PKS_CERT_X509_SHA256_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 ) + hash_func = &_gcry_digest_spec_sha256; +else if (grub_memcmp (guid, &GRUB_PKS_CERT_SHA384_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 || +grub_memcmp (guid, &GRUB_PKS_CERT_X509_SHA384_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 ) + hash_func = &_gcry_digest_spec_sha384; +else if (grub_memcmp (guid, &GRUB_PKS_CERT_SHA512_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 || +grub_memcmp (guid, &GRUB_PKS_CERT_X509_SHA512_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 ) + hash_func = &_gcry_digest_spec_sha512; +else +return grub_error (GRUB_ERR_OUT_OF_RANGE ,"unsupported GUID hash" ); + +grub_crypto_hash (hash_func, hash, data, data_size); + *hash_size = hash_func->mdlen; + +return GRUB_ERR_NONE ; +} + +static grub_err_t +generate_cert_hash (const grub_size_t cert_hash_size,const grub_uint8_t *data, +const grub_size_t data_size,grub_uint8_t *hash,grub_size_t *hash_size) +{ +grub_packed_guid_t guid = {0 }; + +/* support SHA256, SHA384 and SHA512 for certificate hash */ +if (cert_hash_size ==SHA256_HASH_LEN ) +grub_memcpy (&guid, &GRUB_PKS_CERT_X509_SHA256_GUID ,GRUB_PACKED_GUID_SIZE ); +else if (cert_hash_size ==SHA384_HASH_LEN ) +grub_memcpy (&guid, &GRUB_PKS_CERT_X509_SHA384_GUID ,GRUB_PACKED_GUID_SIZE ); +else if (cert_hash_size ==SHA512_HASH_LEN ) +grub_memcpy (&guid, &GRUB_PKS_CERT_X509_SHA512_GUID ,GRUB_PACKED_GUID_SIZE ); +else + { +grub_dprintf ("appendedsig" ,"unsupported hash type (%" PRIuGRUB_SIZE") and " +"skipped\n" , cert_hash_size); +return GRUB_ERR_UNKNOWN_COMMAND ; + } + +return get_hash (&guid, data, data_size, hash, hash_size); +} + +/* Check the hash presence in the db/dbx list. */ +static bool +check_hash_presence (grub_uint8_t *const hash,const grub_size_t hash_size, +const sb_database_t *sb_database) +{ +grub_uint32_t i; + +for (i =0 ; i < sb_database->hash_entries; i++) + { +if (sb_database->hashes[i] ==NULL ) +continue ; + +if (hash_size == sb_database->hash_sizes[i] && +grub_memcmp (sb_database->hashes[i], hash, hash_size) ==0 ) +return true; + } + +return false; +} + +/* Add the certificate/binary hash into the db/dbx list. */ +static grub_err_t +add_hash (grub_uint8_t *const data,const grub_size_t data_size,sb_database_t *sb_database) +{ +grub_uint8_t **hashes; +grub_size_t *hash_sizes; + +if (data ==NULL || data_size ==0 ) +return grub_error (GRUB_ERR_OUT_OF_RANGE ,"certificate/binary-hash data or size is not available" ); + +if (sb_database->is_db == true) + { +if (check_hash_presence (data, data_size, &dbx) == true) + { +grub_dprintf ("appendedsig" , +"cannot add a hash (%02x%02x%02x%02x), as it is present in the dbx list\n" , + data[0 ], data[1 ], data[2 ], data[3 ]); +return GRUB_ERR_ACCESS_DENIED ; + } + } + +if (check_hash_presence (data, data_size, sb_database) == true) + { +grub_dprintf ("appendedsig" , +"cannot add a hash (%02x%02x%02x%02x), as it is present in the %s list\n" , + data[0 ], data[1 ], data[2 ], data[3 ], ((sb_database->is_db == true) ?"db" :"dbx" )); +return GRUB_ERR_EXISTS ; + } + + hashes =grub_realloc (sb_database->hashes,sizeof (grub_uint8_t *) * (sb_database->hash_entries +1 )); +if (hashes ==NULL ) +return grub_error (GRUB_ERR_OUT_OF_MEMORY ,"out of memory" ); + + hash_sizes =grub_realloc (sb_database->hash_sizes,sizeof (grub_size_t) * (sb_database->hash_entries +1 )); +if (hash_sizes ==NULL ) + { +/* +* Allocated memory will be freed by +* free_db_list/free_dbx_list. +*/ + hashes[sb_database->hash_entries] =NULL ; + sb_database->hashes = hashes; + sb_database->hash_entries++; + +return grub_error (GRUB_ERR_OUT_OF_MEMORY ,"out of memory" ); + } + + hashes[sb_database->hash_entries] =grub_malloc (data_size); +if (hashes[sb_database->hash_entries] ==NULL ) +return grub_error (GRUB_ERR_OUT_OF_MEMORY ,"out of memory" ); + +grub_dprintf ("appendedsig" , +"added the hash %02x%02x%02x%02x...\n with size of %" PRIuGRUB_SIZE" to the %s list\n" , + data[0 ], data[1 ], data[2 ], data[3 ], data_size, + ((sb_database->is_db == true) ?"db" :"dbx" )); + +grub_memcpy (hashes[sb_database->hash_entries], data, data_size); + hash_sizes[sb_database->hash_entries] = data_size; + sb_database->hash_sizes = hash_sizes; + sb_database->hashes = hashes; + sb_database->hash_entries++; + +return GRUB_ERR_NONE ; +} + +static bool +is_hash (const grub_packed_guid_t *guid) +{ +/* GUID type of the binary hash. */ +if (grub_memcmp (guid, &GRUB_PKS_CERT_SHA256_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 || +grub_memcmp (guid, &GRUB_PKS_CERT_SHA384_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 || +grub_memcmp (guid, &GRUB_PKS_CERT_SHA512_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 ) +return true; + +/* GUID type of the certificate hash. */ +if (grub_memcmp (guid, &GRUB_PKS_CERT_X509_SHA256_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 || +grub_memcmp (guid, &GRUB_PKS_CERT_X509_SHA384_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 || +grub_memcmp (guid, &GRUB_PKS_CERT_X509_SHA512_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 ) +return true; + +return false; +} + +static bool +is_x509 (const grub_packed_guid_t *guid) +{ +if (grub_memcmp (guid, &GRUB_PKS_CERT_X509_GUID ,GRUB_PACKED_GUID_SIZE ) ==0 ) +return true; + +return false; +} +static bool is_cert_match (const grub_x509_cert_t *cert1,const grub_x509_cert_t *cert2) {
@@ -136,7 +319,33 @@ is_cert_match (const grub_x509_cert_t *cert1, const grub_x509_cert_t *cert2)return false; } -/* Check the certificate presence in the db list. */ +/* Check the certificate hash presence in the dbx list. */ +static bool +is_cert_hash_present_in_dbx (const grub_uint8_t *data,const grub_size_t data_size) +{ +grub_err_t rc; +grub_uint32_t i; +grub_size_t cert_hash_size =0 ; +grub_uint8_t cert_hash[GRUB_MAX_HASH_LEN ] = {0 }; + +for (i =0 ; i < dbx.hash_entries; i++) + { +if (dbx.hashes[i] ==NULL ) +continue ; + + rc =generate_cert_hash (dbx.hash_sizes[i], data, data_size, cert_hash, &cert_hash_size); +if (rc !=GRUB_ERR_NONE ) +continue ; + +if (cert_hash_size == dbx.hash_sizes[i] && +grub_memcmp (dbx.hashes[i], cert_hash, cert_hash_size) ==0 ) +return true; + } + +return false; +} + +/* Check the certificate presence in the db/dbx list. */ static bool check_cert_presence (const grub_x509_cert_t *cert_in,const sb_database_t *sb_database) {
@@ -149,7 +358,10 @@ check_cert_presence (const grub_x509_cert_t *cert_in, const sb_database_t *sb_dareturn false; } -/* Add the certificate into the db list */ +/* +* Add the certificate into the db list if it is not present in the dbx and db list +* when is_db is true. Add the certificate into the dbx list when is_db is false. +*/ static grub_err_t add_certificate (const grub_uint8_t *data,const grub_size_t data_size,sb_database_t *sb_database)
@@ -167,30 +379,54 @@ add_certificate (const grub_uint8_t *data, const grub_size_t data_size, rc =grub_x509_cert_parse (data, data_size, cert);if (rc !=GRUB_ERR_NONE ) { -grub_dprintf ("appendedsig" ,"cannot add a certificate CN='%s' to the db list\n" , - cert->subject); +grub_dprintf ("appendedsig" ,"cannot add a certificate CN='%s' to the %s list\n" , + cert->subject, ((sb_database->is_db == true) ?"db" :"dbx" ));grub_free (cert);return rc; } +/* +* Only checks the certificate against dbx if is_db is true when +* dynamic key management is enabled +*/ +if (append_key_mgmt == true) + { +if (sb_database->is_db == true) + { +if (is_cert_hash_present_in_dbx (data, data_size) == true || +check_cert_presence (cert, &dbx) == true) + { +grub_dprintf ("appendedsig" , +"cannot add a certificate CN='%s', as it is present in the dbx list" , + cert->subject); + rc =GRUB_ERR_ACCESS_DENIED ; + goto fail; + } + } + } +if (check_cert_presence (cert, sb_database) == true) {grub_dprintf ("appendedsig" , -"cannot add a certificate CN='%s', as it is present in the db list" , - cert->subject); -grub_x509_cert_release (cert); -grub_free (cert); - -return GRUB_ERR_EXISTS ; +"cannot add a certificate CN='%s', as it is present in the %s list" , + cert->subject, ((sb_database->is_db == true) ?"db" :"dbx" )); + rc =GRUB_ERR_EXISTS ; + goto fail; } -grub_dprintf ("appendedsig" ,"added a certificate CN='%s' to the db list\n" , - cert->subject); +grub_dprintf ("appendedsig" ,"added a certificate CN='%s' to the %s list\n" , + cert->subject, ((sb_database->is_db == true) ?"db" :"dbx" )); cert->next = sb_database->certs; sb_database->certs = cert; sb_database->cert_entries++; +return rc; + + fail: +grub_x509_cert_release (cert); +grub_free (cert); +return rc; }
@@ -388,6 +624,68 @@ grub_verify_appended_signature (const grub_uint8_t *buf, grub_size_t bufsize)return err; } +/* Add the X.509 certificates/binary hash to the db list from PKS. */ +static grub_err_t +load_pks2db (void ) +{ +grub_err_t rc; +grub_uint32_t i; + +for (i =0 ; i < pks_keystore->db_entries; i++) + { +if (is_hash (&pks_keystore->db[i].guid) == true) + { + rc =add_hash (pks_keystore->db[i].data, + pks_keystore->db[i].data_size, &db); +if (rc ==GRUB_ERR_OUT_OF_MEMORY ) +return rc; + } +else if (is_x509 (&pks_keystore->db[i].guid) == true) + { + rc =add_certificate (pks_keystore->db[i].data, + pks_keystore->db[i].data_size, &db); +if (rc ==GRUB_ERR_OUT_OF_MEMORY ) +return rc; + } +else +grub_dprintf ("appendedsig" ,"unsupported signature data type and " +"skipped (%u)\n" , i +1 ); + } + +return GRUB_ERR_NONE ; +} + +/* Add the certificates and certificate/binary hash to the dbx list from PKS. */ +static grub_err_t +load_pks2dbx (void ) +{ +grub_err_t rc; +grub_uint32_t i; + +for (i =0 ; i < pks_keystore->dbx_entries; i++) + { +if (is_x509 (&pks_keystore->dbx[i].guid) == true) + { + rc =add_certificate (pks_keystore->dbx[i].data, + pks_keystore->dbx[i].data_size, &dbx); +if (rc ==GRUB_ERR_OUT_OF_MEMORY ) +return rc; + } +else if (is_hash (&pks_keystore->dbx[i].guid) == true) + { + rc =add_hash (pks_keystore->dbx[i].data, + pks_keystore->dbx[i].data_size, &dbx); +if (rc !=GRUB_ERR_NONE ) +return rc; + } +else +grub_dprintf ("appendedsig" ,"unsupported signature data type and " +"skipped (%u)\n" , i +1 ); + } + +return GRUB_ERR_NONE ; +} +/* * Extract the X.509 certificates from the ELF Note header, * parse it, and add it to the db list.
@@ -428,11 +726,36 @@ load_elf2db (void) } } +/* +* Extract trusted and distrusted keys from PKS and store them in +* the db and dbx list. +*/ +static void +create_dbs_from_pks (void ) +{ +grub_err_t err; + + err =load_pks2dbx (); +if (err !=GRUB_ERR_NONE ) +grub_printf ("warning: dbx list might not be fully populated\n" ); + + err =load_pks2db (); +if (err !=GRUB_ERR_NONE ) +grub_printf ("warning: db list might not be fully populated\n" ); + +grub_pks_tmp_free (); +grub_dprintf ("appendedsig" ,"the db list now has %u keys\n" +"the dbx list now has %u keys\n" , + db.hash_entries + db.cert_entries, + dbx.hash_entries + dbx.cert_entries); +} +/* Free db list memory */ static void free_db_list (void ) {grub_x509_cert_t *cert; +grub_uint32_t i;while (db.certs !=NULL ) {
@@ -442,9 +765,37 @@ free_db_list (void)grub_free (cert); } +for (i =0 ; i < db.hash_entries; i++) +grub_free (db.hashes[i]); + +grub_free (db.hashes); +grub_free (db.hash_sizes);grub_memset (&db,0 ,sizeof (sb_database_t)); } +/* Free dbx list memory */ +static void +free_dbx_list (void ) +{ +grub_x509_cert_t *cert; +grub_uint32_t i; + +while (dbx.certs !=NULL ) + { + cert = dbx.certs; + dbx.certs = dbx.certs->next; +grub_x509_cert_release (cert); +grub_free (cert); + } + +for (i =0 ; i < dbx.hash_entries; i++) +grub_free (dbx.hashes[i]); + +grub_free (dbx.hashes); +grub_free (dbx.hash_sizes); +grub_memset (&dbx,0 ,sizeof (sb_database_t)); +} +static const char *grub_env_read_sec (struct grub_env_var *var __attribute__ ((unused)),const char *val __attribute__ ((unused)))
@@ -637,10 +988,22 @@ GRUB_MOD_INIT (appendedsig)if (rc !=ASN1_SUCCESS )grub_fatal ("error initing ASN.1 data structures: %d: %s\n" , rc,asn1_strerror (rc)); -/* Extract trusted keys from ELF Note and store them in the db. */ -load_elf2db (); -grub_dprintf ("appendedsig" ,"the db list now has %u static keys\n" , - db.cert_entries); +/* +* If signature verification is enabled with the dynamic key management, +* Extract trusted and distrusted keys from PKS and store them in the db and dbx list. +*/ +if (append_key_mgmt == true) +create_dbs_from_pks (); +/* +* If signature verification is enabled with the static key management, +* extract trusted keys from ELF Note and store them in the db list. +*/ +else + { +load_elf2db (); +grub_dprintf ("appendedsig" ,"the db list now has %u static keys\n" , + db.cert_entries); + }grub_verifier_register (&grub_appendedsig_verifier);grub_dl_set_persistent (mod);
@@ -654,6 +1017,7 @@ GRUB_MOD_FINI (appendedsig)*/ free_db_list (); +free_dbx_list ();grub_register_variable_hook ("check_appended_signatures" ,NULL ,NULL );grub_env_unset ("check_appended_signatures" );grub_register_variable_hook ("appendedsig_key_mgmt" ,NULL ,NULL );
include/grub/efi/pks.h new file +112 -0
112 lines not on this page · raw message
include/grub/types.h +4 -0
@@ -379,6 +379,8 @@ struct grub_guid } __attribute__ ((aligned(4)));typedef struct grub_guid grub_guid_t ; +#define GRUB_GUID_SIZE (sizeof (grub_guid_t)) +struct grub_packed_guid {grub_uint32_t data1;
@@ -388,4 +390,6 @@ struct grub_packed_guid } GRUB_PACKED;typedef struct grub_packed_guid grub_packed_guid_t ; +#define GRUB_PACKED_GUID_SIZE (sizeof (grub_packed_guid_t)) +#endif /* ! GRUB_TYPES_HEADER */
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 16/22 powerpc_ieee1275: Introduce use_static_keys flag
In reply to Sudhakar Kuppusamy via Grub-develIntroduce the use_static_keys flag to indicate that static keys are to be used rather than keys from the PKS storage's db variable. This flag is set if secure boot is enabled with PKS when the db variable is not present or empty in the PKS storage.
The appendedsig module would use this flag to extract the static keys from the GRUB ELF Note and stored in the db list.
--- .../kern/powerpc/ieee1275/platform_keystore.c | 25 +++++++++++++++++-- .../grub/powerpc/ieee1275/platform_keystore.h | 1 + 2 files changed, 24 insertions(+), 2 deletions(-)
grub-core/kern/powerpc/ieee1275/platform_keystore.c +23 -2
@@ -50,9 +50,19 @@static grub_uint32_t pks_max_object_size =0 ; -/* Platform KeyStore db and dbx. */ +/* +* Platform KeyStore db and dbx, use_static_keys falg to +* indicate use of static keys. +* +* use_static_keys: +* False: Does not enforce the use of the static key as a default key from +the GRUB ELF Note. This is default. +* True: Enforce the use of the static key as a default key from the +* GRUB ELF Note if db variable is not available in PKS when use_keystore +* is set to true +*/ static grub_pks_t pks_keystore = { .db =NULL , .dbx =NULL , .db_entries =0 , - .dbx_entries =0 }; + .dbx_entries =0 , .use_static_keys = false};/* * pks_use_keystore: Key Management Modes * False: Static key management (use built-in Keys). This is default.
@@ -332,6 +342,17 @@ grub_pks_keystore_init (void)/* Read db from PKS. */ rc =read_sbvar_from_pks (0 ,PKS_SBVAR_DB , &pks_keystore.db, &pks_keystore.db_entries); +if (rc ==GRUB_ERR_FILE_NOT_FOUND || rc ==GRUB_ERR_BAD_NUMBER ) + { + rc =GRUB_ERR_NONE ; +/* +* This flag is set to true because secure boot is enabled with PKS, +* and the db variable is not present or empty in the PKS storage. +* It enforces the use of static keys from the GRUB ELF Note. +*/ + pks_keystore.use_static_keys = true; + } +if (rc ==GRUB_ERR_NONE ) {/* Read dbx from PKS. */
include/grub/powerpc/ieee1275/platform_keystore.h +1 -0
@@ -95,6 +95,7 @@ struct grub_pksgrub_pks_sd_t *dbx;/* Forbidden signature database. */ grub_uint32_t db_entries;/* Size of signature database. */ grub_uint32_t dbx_entries;/* Size of forbidden signature database. */ +bool use_static_keys;/* Flag to indicate use of static keys. */ }GRUB_PACKED ;typedef struct grub_pks grub_pks_t ;
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 14/22 appended signatures: Using db and dbx lists for signature verification
In reply to Sudhakar Kuppusamy via Grub-develSignature verification: verify the kernel against lists of hashes that are either in dbx or db list. If it is not in the dbx list then the trusted keys from the db list are used to verify the signature.
--- grub-core/commands/appendedsig/appendedsig.c | 94 +++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-)
grub-core/commands/appendedsig/appendedsig.c +93 -1
@@ -522,6 +522,83 @@ extract_appended_signature (const grub_uint8_t *buf, grub_size_t bufsize,return grub_pkcs7_data_parse (signed_data, appendedsig_pkcs7_size, &sig->pkcs7); } +static grub_err_t +get_binary_hash (const grub_size_t binary_hash_size,const grub_uint8_t *data, +const grub_size_t data_size,grub_uint8_t *hash,grub_size_t *hash_size) +{ +grub_packed_guid_t guid = {0 }; + +/* support SHA256, SHA384 and SHA512 for binary hash */ +if (binary_hash_size ==SHA256_HASH_LEN ) +grub_memcpy (&guid, &GRUB_PKS_CERT_SHA256_GUID ,GRUB_PACKED_GUID_SIZE ); +else if (binary_hash_size ==SHA384_HASH_LEN ) +grub_memcpy (&guid, &GRUB_PKS_CERT_SHA384_GUID ,GRUB_PACKED_GUID_SIZE ); +else if (binary_hash_size ==SHA512_HASH_LEN ) +grub_memcpy (&guid, &GRUB_PKS_CERT_SHA512_GUID ,GRUB_PACKED_GUID_SIZE ); +else + { +grub_dprintf ("appendedsig" ,"unsupported hash type (%" PRIuGRUB_SIZE") and " +"skipped\n" , binary_hash_size); +return GRUB_ERR_UNKNOWN_COMMAND ; + } + +return get_hash (&guid, data, data_size, hash, hash_size); +} + +/* +* Verify binary hash against the db and dbx list. +* The following errors can occur: +* - GRUB_ERR_BAD_SIGNATURE: indicates that the hash is in dbx list. +* - GRUB_ERR_EOF: the hash could not be found in the db and dbx list. +* - GRUB_ERR_NONE: the hash is found in db list. +*/ +static grub_err_t +verify_binary_hash (const grub_uint8_t *data,const grub_size_t data_size) +{ +grub_err_t rc =GRUB_ERR_NONE ; +grub_uint32_t i; +grub_size_t hash_size =0 ; +grub_uint8_t hash[GRUB_MAX_HASH_LEN ] = {0 }; + +for (i =0 ; i < dbx.hash_entries; i++) + { +if (dbx.hashes[i] ==NULL ) +continue ; + + rc =get_binary_hash (dbx.hash_sizes[i], data, data_size, hash, &hash_size); +if (rc !=GRUB_ERR_NONE ) +continue ; + +if (hash_size == dbx.hash_sizes[i] && +grub_memcmp (dbx.hashes[i], hash, hash_size) ==0 ) + { +grub_dprintf ("appendedsig" ,"the hash (%02x%02x%02x%02x) is present in the dbx list\n" , + hash[0 ], hash[1 ], hash[2 ], hash[3 ]); +return GRUB_ERR_BAD_SIGNATURE ; + } + } + +for (i =0 ; i < db.hash_entries; i++) + { +if (db.hashes[i] ==NULL ) +continue ; + + rc =get_binary_hash (db.hash_sizes[i], data, data_size, hash, &hash_size); +if (rc !=GRUB_ERR_NONE ) +continue ; + +if (hash_size == db.hash_sizes[i] && +grub_memcmp (db.hashes[i], hash, hash_size) ==0 ) + { +grub_dprintf ("appendedsig" ,"verified with a trusted hash (%02x%02x%02x%02x)\n" , + hash[0 ], hash[1 ], hash[2 ], hash[3 ]); +return GRUB_ERR_NONE ; + } + } + +return GRUB_ERR_EOF ; +} +/* * Given a hash value 'hval', of hash specification 'hash', prepare * the S-expressions (sexp) and perform the signature verification.
@@ -566,7 +643,7 @@ grub_verify_appended_signature (const grub_uint8_t *buf, grub_size_t bufsize)grub_pkcs7_signer_t *si;grub_int32_t i; -if (!db.cert_entries) +if (!db.cert_entries && !db.hash_entries)return grub_error (GRUB_ERR_BAD_SIGNATURE ,"no trusted keys to verify against" ); err =extract_appended_signature (buf, bufsize, &sig);
@@ -575,6 +652,21 @@ grub_verify_appended_signature (const grub_uint8_t *buf, grub_size_t bufsize) datasize = bufsize - sig.signature_len; +/* +* If signature verification is enabled with dynamic key management mode, +* Verify binary hash against the db and dbx list. +*/ +if (append_key_mgmt == true) + { + err =verify_binary_hash (buf, datasize); +if (err ==GRUB_ERR_BAD_SIGNATURE ) + { +grub_pkcs7_data_release (&sig.pkcs7); +return grub_error (err, +"failed to verify the binary hash against a trusted binary hash" ); + } + } +/* Verify signature using trusted keys from db list. */ for (i =0 ; i < sig.pkcs7.signer_count; i++) {
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 15/22 appended signatures: GRUB commands to manage the certificates
In reply to Sudhakar Kuppusamy via Grub-develIntroducing the following GRUB commands to manage the certificates.
1. append_list_db:
Show the list of trusted certificates from the db list
2. append_add_db_cert:
Add the trusted certificate to the db list
3. append_add_dbx_cert:
Add the distrusted certificate to the dbx list
4. append_verify:
Verify the signed file using db list
Note that if signature verification (check_appended_signature) is set to enforce, the append_add_db_cert and append_add_dbx_cert commands only accept the file ‘X509_certificate’ that is signed with an appended signature.
--- grub-core/commands/appendedsig/appendedsig.c | 319 +++++++++++++++++++ 1 file changed, 319 insertions(+)
grub-core/commands/appendedsig/appendedsig.c +319 -0
@@ -122,6 +122,9 @@ static bool append_key_mgmt = false;/* Platform KeyStore db and dbx. */ static grub_pks_t *pks_keystore; +/* Appended signature size. */ +static grub_size_t append_sig_len =0 ; +static grub_ssize_t pseudo_read (struct grub_file *file,char *buf,grub_size_t len) {
@@ -135,6 +138,64 @@ static struct grub_fs pseudo_fs = { .fs_read = pseudo_read }; +/* +* We cannot use hexdump() to display hash data because it is typically +* displayed in hexadecimal format, along with an ASCII representation of +* the same data. +* Example: sha256 hash data +* 00000000 52 b5 90 49 64 de 22 d7 4e 5f 4f b4 1b 51 9c 34 |R..Id.".N_O..Q.4| +* 00000010 b1 96 21 7c 91 78 a5 0d 20 8c e9 5c 22 54 53 f7 |..!|.x.. ..\"TS.| +* +* An appended signature only required to display the hexadecimal of the hash data +* by separating each byte with ":". So, we introduced a new method hexdump_colon +* to display it. +* Example: Sha256 hash data +* 52:b5:90:49:64:de:22:d7:4e:5f:4f:b4:1b:51:9c:34: +* b1:96:21:7c:91:78:a5:0d:20:8c:e9:5c:22:54:53:f7 +*/ +static void +hexdump_colon (const grub_uint8_t *data,const grub_size_t length) +{ +grub_size_t i, count =0 ; + +for (i =0 ; i < length -1 ; i++) + { +grub_printf ("%02x:" , data[i]); + count++; +if (count ==16 ) + { +grub_printf ("\n " ); + count =0 ; + } + } + +grub_printf ("%02x\n" , data[i]); +} + +static void +print_certificate (const grub_x509_cert_t *cert,const grub_uint32_t cert_num) +{ +grub_uint32_t i; + +grub_printf ("\nCertificate: %u\n" , cert_num); +grub_printf (" Data:\n" ); +grub_printf (" Version: %u (0x%u)\n" , cert->version +1 , cert->version); +grub_printf (" Serial Number:\n " ); + +for (i =0 ; i < cert->serial_len -1 ; i++) +grub_printf ("%02x:" , cert->serial[i]); + +grub_printf ("%02x\n" , cert->serial[cert->serial_len -1 ]); +grub_printf (" Issuer: %s\n" , cert->issuer); +grub_printf (" Subject: %s\n" , cert->subject); +grub_printf (" Subject Public Key Info:\n" ); +grub_printf (" Public Key Algorithm: rsaEncryption\n" ); +grub_printf (" RSA Public-Key: (%d bit)\n" , cert->modulus_size); +grub_printf (" Fingerprint: sha256\n " ); +hexdump_colon (&cert->fingerprint[GRUB_FINGERPRINT_SHA256 ][0 ], +grub_strlen ((char *) cert->fingerprint[GRUB_FINGERPRINT_SHA256 ])); +} +/* * GUID can be used to determine the hashing function and * generate the hash using determined hashing function.
@@ -430,6 +491,61 @@ add_certificate (const grub_uint8_t *data, const grub_size_t data_size,return rc; } +static void +_remove_cert_from_db (const grub_x509_cert_t *cert) +{ +grub_uint32_t i =1 ; +grub_x509_cert_t *curr_cert, *prev_cert; + +for (curr_cert = prev_cert = db.certs; curr_cert !=NULL ; curr_cert = curr_cert->next, i++) + { +if (is_cert_match (curr_cert, cert) == true) + { +if (i ==1 )/* Match with first certificate in the db list. */ + db.certs = curr_cert->next; +else + prev_cert->next = curr_cert->next; + +grub_dprintf ("appendedsig" , +"removed distrusted certificate with CN: %s from the db list\n" , + curr_cert->subject); + curr_cert->next =NULL ; +grub_x509_cert_release (curr_cert); +grub_free (curr_cert); +break ; + } +else + prev_cert = curr_cert; + } +} + +static grub_err_t +remove_cert_from_db (const grub_uint8_t *data,const grub_size_t data_size) +{ +grub_err_t rc; +grub_x509_cert_t *cert; + +if (data ==NULL || data_size ==0 ) +return grub_error (GRUB_ERR_OUT_OF_RANGE ,"certificate data or size is not available" ); + + cert =grub_zalloc (sizeof (grub_x509_cert_t)); +if (cert ==NULL ) +return grub_error (GRUB_ERR_OUT_OF_MEMORY ,"out of memory" ); + + rc =grub_x509_cert_parse (data, data_size, cert); +if (rc !=GRUB_ERR_NONE ) + { +grub_dprintf ("appendedsig" ,"cannot remove an invalid certificate from the db list\n" ); +grub_free (cert); +return rc; + } + +/* Remove certificate from the db list. */ +_remove_cert_from_db (cert); + +return rc; +} +static grub_err_t file_read_whole (grub_file_t file,grub_uint8_t **buf,grub_size_t *len) {
@@ -650,6 +766,7 @@ grub_verify_appended_signature (const grub_uint8_t *buf, grub_size_t bufsize)if (err !=GRUB_ERR_NONE )return err; + append_sig_len = sig.signature_len; datasize = bufsize - sig.signature_len;/*
@@ -716,6 +833,193 @@ grub_verify_appended_signature (const grub_uint8_t *buf, grub_size_t bufsize)return err; } +static grub_err_t +grub_cmd_verify_signature (grub_command_t cmd __attribute__ ((unused)),int argc,char **args) +{ +grub_file_t signed_file; +grub_err_t err; +grub_uint8_t *signed_data =NULL ; +grub_size_t signed_data_size =0 ; + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a signed file is expected\nExample:\n\tappend_verify <SIGNED FILE>\n" ); + +if (!grub_strlen (args[0 ])) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing signed file" ); + +grub_dprintf ("appendedsig" ,"verifying %s\n" , args[0 ]); + + signed_file =grub_file_open (args[0 ],GRUB_FILE_TYPE_VERIFY_SIGNATURE ); +if (signed_file ==NULL ) +return grub_error (GRUB_ERR_FILE_NOT_FOUND ,"could not open %s file" , args[0 ]); + + err =file_read_whole (signed_file, &signed_data, &signed_data_size); +if (err ==GRUB_ERR_NONE ) + err =grub_verify_appended_signature (signed_data, signed_data_size); + +grub_file_close (signed_file); +grub_free (signed_data); + +return err; +} + +/* +* Checks the trusted certificate against dbx list if dynamic key management is enabled. +* And add it to the db list if it is not already present. +* Note:- When signature verification is enabled, this command only accepts the +* trusted certificate that is signed with an appended signature. +* The signature is verified by the appendedsig module. If verification succeeds, +* the certificate is added to the db list. Otherwise, an error is posted and +* the certificate is not added. +* When signature verification is disabled, it accepts the trusted certificate without +* an appended signature and add it to the db list. +* +* Also, note that the adding of the trusted certificate using this command does +* not persist across reboots. +*/ +static grub_err_t +grub_cmd_db_cert (grub_command_t cmd __attribute__ ((unused)),int argc,char **args) +{ +grub_err_t err; +grub_file_t cert_file; +grub_uint8_t *cert_data =NULL ; +grub_size_t cert_data_size =0 ; + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a trusted X.509 certificate file is expected in DER format\n" +"Example:\n\tappend_add_db_cert <X509_CERTIFICATE>\n" ); + +if (!grub_strlen (args[0 ])) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing trusted X.509 certificate file" ); + + cert_file =grub_file_open (args[0 ], +GRUB_FILE_TYPE_CERTIFICATE_TRUST |GRUB_FILE_TYPE_NO_DECOMPRESS ); +if (cert_file ==NULL ) +return grub_error (GRUB_ERR_BAD_FILE_TYPE ,"could not open %s file" , args[0 ]); + + err =file_read_whole (cert_file, &cert_data, &cert_data_size); +grub_file_close (cert_file); +if (err !=GRUB_ERR_NONE ) +return err; + +/* +* If signature verification is enabled, +* obtain the actual certificate size by subtracting the appended +* signature size from the certificate size because +* the certificate has an appended signature, and this actual certificate size is +* used to get the X.509 certificate. +*/ +if (check_sigs == true) + cert_data_size -= append_sig_len; + + err =add_certificate (cert_data, cert_data_size, &db); +grub_free (cert_data); +if (err !=GRUB_ERR_NONE ) +return err; + +return GRUB_ERR_NONE ; +} + +/* +* Remove the distrusted certificate from the db list if it is already present. +* And add it to the dbx list if not present when dynamic key management is +* enabled. +* Note:- When signature verification is enabled, this command only accepts the +* distrusted certificate that is signed with an appended signature. +* The signature is verified by the appended sig module. If verification succeeds, +* the certificate is removed from the db list. Otherwise, an error is posted and +* the certificate is not removed. +* When signature verification is disabled, it accepts the distrusted certificate +* without an appended signature and removes it from the db list. +* +* Also, note that the removal of the distrusted certificate using this command +* does not persist across reboots. +*/ +static grub_err_t +grub_cmd_dbx_cert (grub_command_t cmd __attribute__ ((unused)),int argc,char **args) +{ +grub_err_t err; +grub_file_t cert_file; +grub_uint8_t *cert_data =NULL ; +grub_size_t cert_data_size =0 ; + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a distrusted X.509 certificate file is expected in DER format\n" +"Example:\n\tappend_add_dbx_cert <X509_CERTIFICATE>\n" ); + +if (!grub_strlen (args[0 ])) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing distrusted X.509 certificate file" ); + + cert_file =grub_file_open (args[0 ], +GRUB_FILE_TYPE_CERTIFICATE_TRUST |GRUB_FILE_TYPE_NO_DECOMPRESS ); +if (cert_file ==NULL ) +return grub_error (GRUB_ERR_BAD_FILE_TYPE ,"could not open %s file" , args[0 ]); + + err =file_read_whole (cert_file, &cert_data, &cert_data_size); +grub_file_close (cert_file); +if (err !=GRUB_ERR_NONE ) +return err; + +/* +* If signature verification is enabled, +* obtain the actual certificate size by subtracting the appended +* signature size from the certificate size because +* the certificate has an appended signature, and this actual certificate size is +* used to get the X.509 certificate. +*/ +if (check_sigs == true) + cert_data_size -= append_sig_len; + +/* Remove distrusted certificate from the db list if present. */ + err =remove_cert_from_db (cert_data, cert_data_size); +if (err !=GRUB_ERR_NONE ) + { +grub_free (cert_data); +return err; + } + +/* Only add the certificate to the dbx list if dynamic key management is enabled. */ +if (append_key_mgmt == true) + { + err =add_certificate (cert_data, cert_data_size, &dbx); +if (err !=GRUB_ERR_NONE ) +return err; + } + +grub_free (cert_data); + +return GRUB_ERR_NONE ; +} + +static grub_err_t +grub_cmd_list_db (grub_command_t cmd __attribute__ ((unused)),int argc __attribute__ ((unused)), +char **args __attribute__ ((unused))) +{ +struct x509_certificate *cert; +grub_uint32_t i, cert_num =1 ; + +for (cert = db.certs; cert !=NULL ; cert = cert->next, cert_num++) +print_certificate (cert, cert_num); + +if (append_key_mgmt == false) +return GRUB_ERR_NONE ; + +for (i =0 ; i < db.hash_entries; i++) + { +if (db.hashes[i] !=NULL ) + { +grub_printf ("\nBinary hash: %u\n" , i +1 ); +grub_printf (" Hash: sha%" PRIuGRUB_SIZE"\n " , db.hash_sizes[i] *8 ); +hexdump_colon (db.hashes[i], db.hash_sizes[i]); + } + } + +return GRUB_ERR_NONE ; +} +/* Add the X.509 certificates/binary hash to the db list from PKS. */ static grub_err_t load_pks2db (void )
@@ -1029,6 +1333,8 @@ struct grub_file_verifier grub_appendedsig_verifier = { .write = appendedsig_write, }; +static grub_command_t cmd_verify, cmd_list_db, cmd_dbx_cert, cmd_db_cert; +GRUB_MOD_INIT (appendedsig) {grub_int32_t rc;
@@ -1097,6 +1403,15 @@ GRUB_MOD_INIT (appendedsig) db.cert_entries); } + cmd_verify =grub_register_command ("append_verify" , grub_cmd_verify_signature,N_ ("<SIGNED_FILE>" ), +N_ ("Verify SIGNED_FILE against the trusted X.509 certificates in the db list" )); + cmd_list_db =grub_register_command ("append_list_db" , grub_cmd_list_db,0 , +N_ ("Show the list of trusted X.509 certificates from the db list" )); + cmd_db_cert =grub_register_command ("append_add_db_cert" , grub_cmd_db_cert,N_ ("<X509_CERTIFICATE>" ), +N_ ("Add trusted X509_CERTIFICATE to the db list" )); + cmd_dbx_cert =grub_register_command ("append_add_dbx_cert" , grub_cmd_dbx_cert,N_ ("<X509_CERTIFICATE>" ), +N_ ("Add distrusted X509_CERTIFICATE to the dbx list" )); +grub_verifier_register (&grub_appendedsig_verifier);grub_dl_set_persistent (mod); }
@@ -1115,4 +1430,8 @@ GRUB_MOD_FINI (appendedsig)grub_register_variable_hook ("appendedsig_key_mgmt" ,NULL ,NULL );grub_env_unset ("appendedsig_key_mgmt" );grub_verifier_unregister (&grub_appendedsig_verifier); +grub_unregister_command (cmd_verify); +grub_unregister_command (cmd_list_db); +grub_unregister_command (cmd_db_cert); +grub_unregister_command (cmd_dbx_cert); }
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v11 15/22] appended signatures: GRUB commands to manage the certificates
Quoted 11 lines · Sudhakar Kuppusamy
Introducing the following GRUB commands to manage the certificates.
1.
append_list_db:
Show the list of trusted certificates from the db list
2.append_add_db_cert:
Add the trusted certificate to the db list
3.append_add_dbx_cert:
Add the distrusted certificate to the dbx list
4.append_verify:
Verify the signed file using db list
Quoted 8 lines
Note that if signature verification (
check_appended_signature) is set to enforce,
theappend_add_db_certandappend_add_dbx_certcommands only accept the file ‘X509_certificate’ that is signed with an appended signature.Signed-off-by Daniel Axtens <[email protected]>Signed-off-by Sudhakar Kuppusamy <[email protected]>Reviewed-by Daniel Kiper <[email protected]>
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v11 15/22] appended signatures: GRUB commands to manage the certificates
In reply to Sudhakar KuppusamyQuoted 391 lines · Sudhakar Kuppusamy
Introducing the following GRUB commands to manage the certificates.
1.
append_list_db:
Show the list of trusted certificates from the db list
2.append_add_db_cert:
Add the trusted certificate to the db list
3.append_add_dbx_cert:
Add the distrusted certificate to the dbx list
4.append_verify:
Verify the signed file using db listNote that if signature verification (
check_appended_signature) is set to enforce, theappend_add_db_certandappend_add_dbx_certcommands only accept the file ‘X509_certificate’ that is signed with an appended signature.Signed-off-by Daniel Axtens <[email protected]>Signed-off-by Sudhakar Kuppusamy <[email protected]>Reviewed-by Daniel Kiper <[email protected]>--- grub-core/commands/appendedsig/appendedsig.c | 319 +++++++++++++++++++ 1 file changed, 319 insertions(+)grub-core/commands/appendedsig/appendedsig.c +315
-0@@ -122,6 +122,9 @@ static bool append_key_mgmt = false;/* Platform KeyStore db and dbx. */ static grub_pks_t *pks_keystore; +/* Appended signature size. */ +static grub_size_t append_sig_len =0 ; +static grub_ssize_t pseudo_read (struct grub_file *file,char *buf,grub_size_t len) {@@ -135,6 +138,64 @@ static struct grub_fs pseudo_fs = { .fs_read = pseudo_read }; +/* +* We cannot use hexdump() to display hash data because it is typically +* displayed in hexadecimal format, along with an ASCII representation of +* the same data. +* Example: sha256 hash data +* 00000000 52 b5 90 49 64 de 22 d7 4e 5f 4f b4 1b 51 9c 34 |R..Id.".N_O..Q.4| +* 00000010 b1 96 21 7c 91 78 a5 0d 20 8c e9 5c 22 54 53 f7 |..!|.x.. ..\"TS.| +* +* An appended signature only required to display the hexadecimal of the hash data +* by separating each byte with ":". So, we introduced a new method hexdump_colon +* to display it. +* Example: Sha256 hash data +* 52:b5:90:49:64:de:22:d7:4e:5f:4f:b4:1b:51:9c:34: +* b1:96:21:7c:91:78:a5:0d:20:8c:e9:5c:22:54:53:f7 +*/ +static void +hexdump_colon (const grub_uint8_t *data,const grub_size_t length) +{ +grub_size_t i, count =0 ; + +for (i =0 ; i < length -1 ; i++) + { +grub_printf ("%02x:" , data[i]); + count++; +if (count ==16 ) + { +grub_printf ("\n " ); + count =0 ; + } + } + +grub_printf ("%02x\n" , data[i]); +} + +static void +print_certificate (const grub_x509_cert_t *cert,const grub_uint32_t cert_num) +{ +grub_uint32_t i; + +grub_printf ("\nCertificate: %u\n" , cert_num); +grub_printf (" Data:\n" ); +grub_printf (" Version: %u (0x%u)\n" , cert->version +1 , cert->version); +grub_printf (" Serial Number:\n " ); + +for (i =0 ; i < cert->serial_len -1 ; i++) +grub_printf ("%02x:" , cert->serial[i]); + +grub_printf ("%02x\n" , cert->serial[cert->serial_len -1 ]); +grub_printf (" Issuer: %s\n" , cert->issuer); +grub_printf (" Subject: %s\n" , cert->subject); +grub_printf (" Subject Public Key Info:\n" ); +grub_printf (" Public Key Algorithm: rsaEncryption\n" ); +grub_printf (" RSA Public-Key: (%d bit)\n" , cert->modulus_size); +grub_printf (" Fingerprint: sha256\n " ); +hexdump_colon (&cert->fingerprint[GRUB_FINGERPRINT_SHA256 ][0 ], +grub_strlen ((char *) cert->fingerprint[GRUB_FINGERPRINT_SHA256 ])); +} +/* * GUID can be used to determine the hashing function and * generate the hash using determined hashing function. @@ -430,6 +491,61 @@ add_certificate (const grub_uint8_t *data, const grub_size_t data_size,return rc; } +static void +_remove_cert_from_db (const grub_x509_cert_t *cert) +{ +grub_uint32_t i =1 ; +grub_x509_cert_t *curr_cert, *prev_cert; + +for (curr_cert = prev_cert = db.certs; curr_cert !=NULL ; curr_cert = curr_cert->next, i++) + { +if (is_cert_match (curr_cert, cert) == true) + { +if (i ==1 )/* Match with first certificate in the db list. */ + db.certs = curr_cert->next; +else + prev_cert->next = curr_cert->next; + +grub_dprintf ("appendedsig" , +"removed distrusted certificate with CN: %s from the db list\n" , + curr_cert->subject); + curr_cert->next =NULL ; +grub_x509_cert_release (curr_cert); +grub_free (curr_cert); +break ; + } +else + prev_cert = curr_cert; + } +} + +static grub_err_t +remove_cert_from_db (const grub_uint8_t *data,const grub_size_t data_size) +{ +grub_err_t rc; +grub_x509_cert_t *cert; + +if (data ==NULL || data_size ==0 ) +return grub_error (GRUB_ERR_OUT_OF_RANGE ,"certificate data or size is not available" ); + + cert =grub_zalloc (sizeof (grub_x509_cert_t)); +if (cert ==NULL ) +return grub_error (GRUB_ERR_OUT_OF_MEMORY ,"out of memory" ); + + rc =grub_x509_cert_parse (data, data_size, cert); +if (rc !=GRUB_ERR_NONE ) + { +grub_dprintf ("appendedsig" ,"cannot remove an invalid certificate from the db list\n" ); +grub_free (cert); +return rc; + } + +/* Remove certificate from the db list. */ +_remove_cert_from_db (cert); + +return rc; +} +static grub_err_t file_read_whole (grub_file_t file,grub_uint8_t **buf,grub_size_t *len) {@@ -650,6 +766,7 @@ grub_verify_appended_signature (const grub_uint8_t *buf, grub_size_t bufsize)if (err !=GRUB_ERR_NONE )return err; + append_sig_len = sig.signature_len; datasize = bufsize - sig.signature_len;/* @@ -716,6 +833,193 @@ grub_verify_appended_signature (const grub_uint8_t *buf, grub_size_t bufsize)return err; } +static grub_err_t +grub_cmd_verify_signature (grub_command_t cmd __attribute__ ((unused)),int argc,char **args) +{ +grub_file_t signed_file; +grub_err_t err; +grub_uint8_t *signed_data =NULL ; +grub_size_t signed_data_size =0 ; + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a signed file is expected\nExample:\n\tappend_verify <SIGNED FILE>\n" ); + +if (!grub_strlen (args[0 ])) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing signed file" ); + +grub_dprintf ("appendedsig" ,"verifying %s\n" , args[0 ]); + + signed_file =grub_file_open (args[0 ],GRUB_FILE_TYPE_VERIFY_SIGNATURE ); +if (signed_file ==NULL ) +return grub_error (GRUB_ERR_FILE_NOT_FOUND ,"could not open %s file" , args[0 ]); + + err =file_read_whole (signed_file, &signed_data, &signed_data_size); +if (err ==GRUB_ERR_NONE ) + err =grub_verify_appended_signature (signed_data, signed_data_size); + +grub_file_close (signed_file); +grub_free (signed_data); + +return err; +} + +/* +* Checks the trusted certificate against dbx list if dynamic key management is enabled. +* And add it to the db list if it is not already present. +* Note:- When signature verification is enabled, this command only accepts the +* trusted certificate that is signed with an appended signature. +* The signature is verified by the appendedsig module. If verification succeeds, +* the certificate is added to the db list. Otherwise, an error is posted and +* the certificate is not added. +* When signature verification is disabled, it accepts the trusted certificate without +* an appended signature and add it to the db list. +* +* Also, note that the adding of the trusted certificate using this command does +* not persist across reboots. +*/ +static grub_err_t +grub_cmd_db_cert (grub_command_t cmd __attribute__ ((unused)),int argc,char **args) +{ +grub_err_t err; +grub_file_t cert_file; +grub_uint8_t *cert_data =NULL ; +grub_size_t cert_data_size =0 ; + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a trusted X.509 certificate file is expected in DER format\n" +"Example:\n\tappend_add_db_cert <X509_CERTIFICATE>\n" ); + +if (!grub_strlen (args[0 ])) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing trusted X.509 certificate file" ); + + cert_file =grub_file_open (args[0 ], +GRUB_FILE_TYPE_CERTIFICATE_TRUST |GRUB_FILE_TYPE_NO_DECOMPRESS ); +if (cert_file ==NULL ) +return grub_error (GRUB_ERR_BAD_FILE_TYPE ,"could not open %s file" , args[0 ]); + + err =file_read_whole (cert_file, &cert_data, &cert_data_size); +grub_file_close (cert_file); +if (err !=GRUB_ERR_NONE ) +return err; + +/* +* If signature verification is enabled, +* obtain the actual certificate size by subtracting the appended +* signature size from the certificate size because +* the certificate has an appended signature, and this actual certificate size is +* used to get the X.509 certificate. +*/ +if (check_sigs == true) + cert_data_size -= append_sig_len; + + err =add_certificate (cert_data, cert_data_size, &db); +grub_free (cert_data); +if (err !=GRUB_ERR_NONE ) +return err; + +return GRUB_ERR_NONE ; +} + +/* +* Remove the distrusted certificate from the db list if it is already present. +* And add it to the dbx list if not present when dynamic key management is +* enabled. +* Note:- When signature verification is enabled, this command only accepts the +* distrusted certificate that is signed with an appended signature. +* The signature is verified by the appended sig module. If verification succeeds, +* the certificate is removed from the db list. Otherwise, an error is posted and +* the certificate is not removed. +* When signature verification is disabled, it accepts the distrusted certificate +* without an appended signature and removes it from the db list. +* +* Also, note that the removal of the distrusted certificate using this command +* does not persist across reboots. +*/ +static grub_err_t +grub_cmd_dbx_cert (grub_command_t cmd __attribute__ ((unused)),int argc,char **args) +{ +grub_err_t err; +grub_file_t cert_file; +grub_uint8_t *cert_data =NULL ; +grub_size_t cert_data_size =0 ; + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a distrusted X.509 certificate file is expected in DER format\n" +"Example:\n\tappend_add_dbx_cert <X509_CERTIFICATE>\n" ); + +if (!grub_strlen (args[0 ])) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing distrusted X.509 certificate file" ); + + cert_file =grub_file_open (args[0 ], +GRUB_FILE_TYPE_CERTIFICATE_TRUST |GRUB_FILE_TYPE_NO_DECOMPRESS ); +if (cert_file ==NULL ) +return grub_error (GRUB_ERR_BAD_FILE_TYPE ,"could not open %s file" , args[0 ]); + + err =file_read_whole (cert_file, &cert_data, &cert_data_size); +grub_file_close (cert_file); +if (err !=GRUB_ERR_NONE ) +return err; + +/* +* If signature verification is enabled, +* obtain the actual certificate size by subtracting the appended +* signature size from the certificate size because +* the certificate has an appended signature, and this actual certificate size is +* used to get the X.509 certificate. +*/ +if (check_sigs == true) + cert_data_size -= append_sig_len; + +/* Remove distrusted certificate from the db list if present. */ + err =remove_cert_from_db (cert_data, cert_data_size); +if (err !=GRUB_ERR_NONE ) + { +grub_free (cert_data); +return err; + } + +/* Only add the certificate to the dbx list if dynamic key management is enabled. */ +if (append_key_mgmt == true) + { + err =add_certificate (cert_data, cert_data_size, &dbx); +if (err !=GRUB_ERR_NONE ) +return err; + } + +grub_free (cert_data); + +return GRUB_ERR_NONE ; +} + +static grub_err_t +grub_cmd_list_db (grub_command_t cmd __attribute__ ((unused)),int argc __attribute__ ((unused)), +char **args __attribute__ ((unused))) +{ +struct x509_certificate *cert; +grub_uint32_t i, cert_num =1 ; + +for (cert = db.certs; cert !=NULL ; cert = cert->next, cert_num++) +print_certificate (cert, cert_num); + +if (append_key_mgmt == false) +return GRUB_ERR_NONE ; + +for (i =0 ; i < db.hash_entries; i++) + { +if (db.hashes[i] !=NULL ) + { +grub_printf ("\nBinary hash: %u\n" , i +1 ); +grub_printf (" Hash: sha%" PRIuGRUB_SIZE"\n " , db.hash_sizes[i] *8 ); +hexdump_colon (db.hashes[i], db.hash_sizes[i]); + } + } + +return GRUB_ERR_NONE ; +} +/* Add the X.509 certificates/binary hash to the db list from PKS. */ static grub_err_t load_pks2db (void )@@ -1029,6 +1333,8 @@ struct grub_file_verifier grub_appendedsig_verifier = { .write = appendedsig_write, }; +static grub_command_t cmd_verify, cmd_list_db, cmd_dbx_cert, cmd_db_cert; +GRUB_MOD_INIT (appendedsig) {grub_int32_t rc;@@ -1097,6 +1403,15 @@ GRUB_MOD_INIT (appendedsig) db.cert_entries); } + cmd_verify =grub_register_command ("append_verify" , grub_cmd_verify_signature,N_ ("<SIGNED_FILE>" ), +N_ ("Verify SIGNED_FILE against the trusted X.509 certificates in the db list" )); + cmd_list_db =grub_register_command ("append_list_db" , grub_cmd_list_db,0 , +N_ ("Show the list of trusted X.509 certificates from the db list" )); + cmd_db_cert =grub_register_command ("append_add_db_cert" , grub_cmd_db_cert,N_ ("<X509_CERTIFICATE>" ), +N_ ("Add trusted X509_CERTIFICATE to the db list" )); + cmd_dbx_cert =grub_register_command ("append_add_dbx_cert" , grub_cmd_dbx_cert,N_ ("<X509_CERTIFICATE>" ), +N_ ("Add distrusted X509_CERTIFICATE to the dbx list" )); +grub_verifier_register (&grub_appendedsig_verifier);grub_dl_set_persistent (mod); }
grub-core/commands/appendedsig/appendedsig.c GRUB_MOD_FINI (appendedsig) · line 1437
Quoted 8 lines
grub-core/commands/appendedsig/appendedsig.c +4
-0@@ -1115,4 +1430,8 @@ GRUB_MOD_FINI (appendedsig)grub_register_variable_hook ("appendedsig_key_mgmt" ,NULL ,NULL );grub_env_unset ("appendedsig_key_mgmt" );grub_verifier_unregister (&grub_appendedsig_verifier); +grub_unregister_command (cmd_verify); +grub_unregister_command (cmd_list_db); +grub_unregister_command (cmd_db_cert); +grub_unregister_command (cmd_dbx_cert); }
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 21/22 docs/grub: Document signing GRUB with an appended signature
In reply to Sudhakar Kuppusamy via Grub-develSigning GRUB for firmware that verifies an appended signature is a bit fiddly. I don't want people to have to figure it out from scratch so document it here.
--- docs/grub.texi | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)
docs/grub.texi +102 -0
@@ -9611,6 +9611,108 @@ image works under UEFI secure boot and can maintain the secure-boot chain. It will also be necessary to enroll the public key used into a relevant firmware key database. +@section Signing GRUB with an appended signature +The @file{core.elf} itself can be signed with a Linux kernel module-style +appended signature (@pxref{Using appended signatures}). +To support IEEE1275 platforms where the boot image is often loaded directly +from a disk partition rather than from a file system, the @file{core.elf} +can specify the size and location of the appended signature with an ELF +Note added by @command{grub-install} or @command{grub-mkimage}. +An image can be signed this way using the @command{sign-file} command from +the Linux kernel: + +@itemize +@item Signing a GRUB image using a single signer key. The grub.key is your +private key used for GRUB signing, grub.der is a corresponding public key +(certificate) used for GRUB signature verification, and the kernel.der is +your public key (certificate) used for kernel signature verification. +@example +@group +# Determine the size of the appended signature. It depends on the +# signing key and the hash algorithm. +# +# Signing the /dev/null with an appended signature. + +sign-file SHA256 grub.key grub.der /dev/null ./empty.sig + +# Get the size of the signature. + +EMPTY_SIG_SIZE=`stat -c '%s' ./empty.sig` + +# Remove the empty file signature. + +rm ./empty.sig + +# Build a GRUB image with $EMPTY_SIG_SIZE reserved for the signature. + +grub-mkimage -O powerpc-ieee1275 -o core.elf.unsigned -x kernel.der \ + -p /grub --appended-signature-size $EMPTY_SIG_SIZE \ + --modules="appendedsig ..." ... + +# Signing a GRUB image with an appended signature. + +sign-file SHA256 grub.key grub.der core.elf.unsigned core.elf.signed + +@end group +@end example +@item Signing a GRUB image using more than one signer key. The grub1.key and +grub2.key are private keys used for GRUB signing, grub1.der and grub2.der +are corresponding public keys (certificates) used for GRUB signature verification. +The kernel1.der and kernel2.der are your public keys (certificates) used for +kernel signature verification. +@example +@group +# Generate a raw signature for /dev/null signing using OpenSSL. + +openssl cms -sign -binary -nocerts -in /dev/null -signer \ + grub1.der -inkey grub1.key -signer grub2.der -inkey grub2.key \ + -out ./empty.p7s -outform DER -noattr -md sha256 + +# Signing the /dev/null with an appended signature. + +sign-file -s ./empty.p7s sha256 /dev/null /dev/null ./empty.signed + +# Get the size of the signature. + +EMPTY_SIG_SIZE=`stat -c '%s' ./empty.signed` + +# Remove the empty file signatures. + +rm ./empty.signed ./empty.p7s + +# Build a GRUB image with $EMPTY_SIG_SIZE reserved for the signature. + +grub-mkimage -O powerpc-ieee1275 -o core.elf.unsigned -x kernel1.der \ + kernel2.der -p /grub --appended-signature-size $EMPTY_SIG_SIZE \ + --modules="appendedsig ..." ... + +# Generate a raw signature for GRUB image signing using OpenSSL. + +openssl cms -sign -binary -nocerts -in core.elf.unsigned -signer \ + grub1.der -inkey grub1.key -signer grub2.der -inkey grub2.key \ + -out core.p7s -outform DER -noattr -md sha256 + +# Signing a GRUB image with an appended signature. + +sign-file -s core.p7s sha256 /dev/null core.elf.unsigned core.elf.signed + +@end group +@end example +@item Don't forget to install the signed image as required +(e.g. on powerpc-ieee1275, to the PReP partition). +@example +@group +# Install signed GRUB image to the PReP partition on powerpc-ieee1275 + +dd if=core.elf.signed of=/dev/sda1 + +@end group +@end example +@end itemize + +As with UEFI secure boot, it is necessary to build-in the required modules, +or sign them if they are not part of the GRUB image. + @node Platform limitations @chapter Platform limitations
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 17/22 appended signatures: Read default db keys from the ELF Note
In reply to Sudhakar Kuppusamy via Grub-develIf secure boot is enabled with dynamic key management mode and the use_static_keys flag is set, then read the static keys as a db default keys from the GRUB ELF Note and add them into the db list.
--- grub-core/commands/appendedsig/appendedsig.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
grub-core/commands/appendedsig/appendedsig.c +13 -3
@@ -1135,9 +1135,19 @@ create_dbs_from_pks (void)if (err !=GRUB_ERR_NONE )grub_printf ("warning: dbx list might not be fully populated\n" ); - err =load_pks2db (); -if (err !=GRUB_ERR_NONE ) -grub_printf ("warning: db list might not be fully populated\n" ); +/* +* The static keys from the GRUB ELF Note are populated in the db list +* if use_static_keys falg is set to true when secure boot is enabled +* with dynamic key management. +*/ +if (pks_keystore->use_static_keys == true) +load_elf2db (); +else + { + err =load_pks2db (); +if (err !=GRUB_ERR_NONE ) +grub_printf ("warning: db list might not be fully populated\n" ); + }grub_pks_tmp_free (); grub_dprintf ("appendedsig", "the db list now has %u keys\n"
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 18/22 appended signatures: GRUB commands to manage the hashes
In reply to Sudhakar Kuppusamy via Grub-develIntroducing the following GRUB commands to manage certificate/binary hashes.
1. append_list_dbx:
Show the list of distrusted certificates and binary/certificate hashes from the dbx list.
2. append_add_db_hash:
Add the trusted binary hash to the db list.
3. append_add_dbx_hash:
Add the distrusted certificate/binary hash to the dbx list.
Note that if signature verification (check_appended_signature) is set to enforce, the append_add_db_hash and append_add_dbx_hash commands only accept the file ‘hash_file’ that is signed with an appended signature.
--- grub-core/commands/appendedsig/appendedsig.c | 276 +++++++++++++++++++ include/grub/file.h | 2 + 2 files changed, 278 insertions(+)
grub-core/commands/appendedsig/appendedsig.c +276 -0
@@ -52,6 +52,9 @@ GRUB_MOD_LICENSE ("GPLv3+");#define SHA384_HASH_LEN 48#define SHA512_HASH_LEN 64 +#define OPTION_BINARY_HASH 0 +#define OPTION_CERT_HASH 1 +/* * This structure is extracted from scripts/sign-file.c in the linux kernel * source. It was licensed as LGPLv2.1+, which is GPLv3+ compatible.
@@ -125,6 +128,13 @@ static grub_pks_t *pks_keystore;/* Appended signature size. */ static grub_size_t append_sig_len =0 ; +static const struct grub_arg_option options[] = +{ + {"binary-hash" ,'b' ,0 ,N_ ("hash file of the binary." ),0 ,ARG_TYPE_PATHNAME }, + {"cert-hash" ,'c' ,1 ,N_ ("hash file of the certificate." ),0 ,ARG_TYPE_PATHNAME }, + {0 ,0 ,0 ,0 ,0 ,0 } +}; +static grub_ssize_t pseudo_read (struct grub_file *file,char *buf,grub_size_t len) {
@@ -546,6 +556,69 @@ remove_cert_from_db (const grub_uint8_t *data, const grub_size_t data_size)return rc; } +static bool +cert_fingerprint_match (const grub_uint8_t *hash_data,const grub_size_t hash_data_size, +const grub_x509_cert_t *cert) +{ +grub_int32_t type; + +if (hash_data_size ==SHA256_HASH_LEN ) + type =GRUB_FINGERPRINT_SHA256 ; +else if (hash_data_size ==SHA384_HASH_LEN ) + type =GRUB_FINGERPRINT_SHA384 ; +else if (hash_data_size ==SHA512_HASH_LEN ) + type =GRUB_FINGERPRINT_SHA512 ; +else + { +grub_dprintf ("appendedsig" ,"unsupported fingerprint hash type " +"(%" PRIuGRUB_SIZE") \n" , hash_data_size); +return false; + } + +if (grub_memcmp (cert->fingerprint[type], hash_data, hash_data_size) ==0 ) +return true; + +return false; +} + +static void +remove_hash_from_db (const grub_uint8_t *hash_data,const grub_size_t hash_data_size, +const bool bin_hash) +{ +grub_uint32_t i; +grub_x509_cert_t *cert; + +if (bin_hash == true) + { +for (i =0 ; i < db.hash_entries; i++) + { +if (db.hashes[i] ==NULL ) +continue ; + +if (grub_memcmp (db.hashes[i], hash_data, hash_data_size) ==0 ) + { +grub_dprintf ("appendedsig" ,"removed distrusted hash %02x%02x%02x%02x.. from the db list\n" , + db.hashes[i][0 ], db.hashes[i][1 ], db.hashes[i][2 ], db.hashes[i][3 ]); +grub_free (db.hashes[i]); + db.hashes[i] =NULL ; + db.hash_sizes[i] =0 ; +break ; + } + } + } +else + { +for (cert = db.certs; cert !=NULL ; cert = cert->next) + { +if (cert_fingerprint_match (hash_data, hash_data_size, cert) == true) + { +_remove_cert_from_db (cert); +break ; + } + } + } +} +static grub_err_t file_read_whole (grub_file_t file,grub_uint8_t **buf,grub_size_t *len) {
@@ -1020,6 +1093,194 @@ grub_cmd_list_db (grub_command_t cmd __attribute__ ((unused)), int argc __attribreturn GRUB_ERR_NONE ; } +static grub_err_t +grub_cmd_list_dbx (grub_command_t cmd __attribute__((unused)), +int argc __attribute__((unused)),char **args __attribute__((unused))) +{ +struct x509_certificate *cert; +grub_uint32_t i, cert_num =1 ; + +if (append_key_mgmt == false) +return grub_error (GRUB_ERR_ACCESS_DENIED , +"append_list_dbx command is unsupported in static key mode" ); + +for (cert = dbx.certs; cert !=NULL ; cert = cert->next, cert_num++) +print_certificate (cert, cert_num); + +for (i =0 ; i < dbx.hash_entries; i++) + { +if (dbx.hashes[i] !=NULL ) + { +grub_printf ("\nCertificate/Binary hash: %u\n" , i +1 ); +grub_printf (" Hash: sha%" PRIuGRUB_SIZE"\n " , dbx.hash_sizes[i] *8 ); +hexdump_colon (dbx.hashes[i], dbx.hash_sizes[i]); + } + } + +return GRUB_ERR_NONE ; +} + +/* +* Remove the trusted binary hash from the dbx list if present. +* And add them to the db list if it is not already present. +* Note:- When signature verification is enabled, this command only accepts +* the binary hash file that is signed with an appended signature. +* The signature is verified by the appendedsig module. If verification succeeds, +* the binary hash is added to the db list. Otherwise, an error is posted and +* the binary hash is not added. +* When signature verification is disabled, it accepts the binary hash file without +* an appended signature and adds it to the db list. +* +* Also, note that the adding of the trusted binary hash using this command does +* not persist across reboots. +*/ +static grub_err_t +grub_cmd_db_hash (grub_command_t cmd __attribute__((unused)),int argc,char **args) +{ +grub_err_t rc; +grub_file_t hash_file; +grub_uint8_t *hash_data =NULL ; +grub_size_t hash_data_size =0 ; + +if (append_key_mgmt == false) +return grub_error (GRUB_ERR_ACCESS_DENIED , +"append_add_db_hash command is unsupported in static key mode" ); + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a trusted binary hash file is expected in Binary format (.bin)\n" +"Example:\n\tappend_add_db_hash <BINARY HASH FILE>\n" ); + +if (!grub_strlen (args[0 ])) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing trusted binary hash file" ); + + hash_file =grub_file_open (args[0 ],GRUB_FILE_TYPE_HASH_TRUST |GRUB_FILE_TYPE_NO_DECOMPRESS ); +if (hash_file ==NULL ) +return grub_error (GRUB_ERR_FILE_NOT_FOUND ,"unable to open %s file" , args[0 ]); + + rc =file_read_whole (hash_file, &hash_data, &hash_data_size); +grub_file_close (hash_file); +if (rc !=GRUB_ERR_NONE ) +return rc; + +/* +* If signature verification is enabled, +* obtain the actual hash data size by subtracting the appended +* signature size from the hash data size because +* the hash has an appended signature, and this actual hash data size is +* used to get the hash data. +*/ +if (check_sigs == true) + hash_data_size -= append_sig_len; + +grub_dprintf ("appendedsig" , +"adding a trusted binary hash %02x%02x%02x%02x...\n with size of %" PRIuGRUB_SIZE"\n" , + hash_data[0 ], hash_data[1 ], hash_data[2 ], hash_data[3 ], hash_data_size); + +/* Only accept SHA256, SHA384 and SHA512 binary hash */ +if (hash_data_size !=SHA256_HASH_LEN && hash_data_size !=SHA384_HASH_LEN && + hash_data_size !=SHA512_HASH_LEN ) + { +grub_free (hash_data); +return grub_error (GRUB_ERR_BAD_SIGNATURE ,"unacceptable trusted binary hash type" ); + } + + rc =add_hash (hash_data, hash_data_size, &db); + +grub_free (hash_data); + +return rc; +} + +/* +* Remove the distrusted binary/certificate hash from the db list if present. +* And add them to the dbx list if it is not already present. +* Note:- When signature verification is enabled, this command only accepts +* the binary/certificate hash file that is signed with an appended signature. +* The signature is verified by the appendedsig module. If verification succeeds, +* the binary/certificate hash is added to the dbx list. Otherwise, an error is posted and +* the binary/certificate hash is not added. +* When signature verification is disabled, it accepts the binary/certificate hash file without +* an appended signature and adds it to the dbx list. +* +* Also, note that the adding of the distrusted binary/certificate hash using this command does +* not persist across reboots. +*/ +static grub_err_t +grub_cmd_dbx_hash (grub_extcmd_context_t ctxt,int argc __attribute__ ((unused)), +char **args __attribute__ ((unused))) +{ +grub_err_t rc; +grub_file_t hash_file; +grub_uint8_t *hash_data =NULL ; +grub_size_t hash_data_size =0 ; +char *file_path; + +if (append_key_mgmt == false) +return grub_error (GRUB_ERR_ACCESS_DENIED , +"append_add_dbx_hash command is unsupported in static key mode" ); + +if (!ctxt->state[OPTION_BINARY_HASH ].set && !ctxt->state[OPTION_CERT_HASH ].set) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a distrusted certificate/binary hash file is expected in Binary format (.bin)\n" +"Example:\n\tappend_add_dbx_hash [option] <FILE>\n" +"option:\n[-b|--binary-hash] FILE [BINARY HASH FILE]\n" +"[-c|--cert-hash] FILE [CERTFICATE HASH FILE]\n" ); + +if (ctxt->state[OPTION_BINARY_HASH ].arg ==NULL && ctxt->state[OPTION_CERT_HASH ].arg ==NULL ) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing distrusted certificate/binary hash file" ); + +if (ctxt->state[OPTION_BINARY_HASH ].arg !=NULL ) + file_path = ctxt->state[OPTION_BINARY_HASH ].arg; +else + file_path = ctxt->state[OPTION_CERT_HASH ].arg; + + hash_file =grub_file_open (file_path,GRUB_FILE_TYPE_HASH_TRUST |GRUB_FILE_TYPE_NO_DECOMPRESS ); +if (hash_file ==NULL ) +return grub_error (GRUB_ERR_FILE_NOT_FOUND ,"unable to open %s file" , file_path); + + rc =file_read_whole (hash_file, &hash_data, &hash_data_size); +grub_file_close (hash_file); +if (rc !=GRUB_ERR_NONE ) +return rc; + +/* +* If signature verification is enabled, +* obtain the actual hash data size by subtracting the appended +* signature size from the hash data size because +* the hash has an appended signature, and this actual hash data size is +* used to get the hash data. +*/ +if (check_sigs == true) + hash_data_size -= append_sig_len; + +grub_dprintf ("appendedsig" , +"adding a distrusted certificate/binary hash %02x%02x%02x%02x...\n" +" with size of %" PRIuGRUB_SIZE"\n" , hash_data[0 ], hash_data[1 ], + hash_data[2 ], hash_data[3 ], hash_data_size); + +if (ctxt->state[OPTION_BINARY_HASH ].set || ctxt->state[OPTION_CERT_HASH ].set) + { +/* Only accept SHA256, SHA384 and SHA512 certificate/binary hash */ +if (hash_data_size !=SHA256_HASH_LEN && hash_data_size !=SHA384_HASH_LEN && + hash_data_size !=SHA512_HASH_LEN ) + { +grub_free (hash_data); +return grub_error (GRUB_ERR_BAD_SIGNATURE , +"unacceptable distrusted certificate/binary hash type" ); + } + } + +/* Remove distrusted binary hash/certificate from the db list if present. */ +remove_hash_from_db (hash_data, hash_data_size, + ((ctxt->state[OPTION_BINARY_HASH ].set) ? true : false)); + rc =add_hash (hash_data, hash_data_size, &dbx); + +grub_free (hash_data); + +return rc; +} +/* Add the X.509 certificates/binary hash to the db list from PKS. */ static grub_err_t load_pks2db (void )
@@ -1344,6 +1605,8 @@ struct grub_file_verifier grub_appendedsig_verifier = { };static grub_command_t cmd_verify, cmd_list_db, cmd_dbx_cert, cmd_db_cert; +static grub_command_t cmd_list_dbx, cmd_db_hash; +static grub_extcmd_t cmd_dbx_hash;GRUB_MOD_INIT (appendedsig) {
@@ -1422,6 +1685,16 @@ GRUB_MOD_INIT (appendedsig) cmd_dbx_cert =grub_register_command ("append_add_dbx_cert" , grub_cmd_dbx_cert,N_ ("<X509_CERTIFICATE>" ),N_ ("Add distrusted X509_CERTIFICATE to the dbx list" )); + cmd_list_dbx =grub_register_command ("append_list_dbx" , grub_cmd_list_dbx,0 , +N_ ("Show the list of distrusted certificates and" +" certificate/binary hashes from the dbx list" )); + cmd_db_hash =grub_register_command ("append_add_db_hash" , grub_cmd_db_hash,N_ ("BINARY HASH FILE" ), +N_ ("Add trusted BINARY HASH to the db list." )); + cmd_dbx_hash =grub_register_extcmd ("append_add_dbx_hash" , grub_cmd_dbx_hash,0 , +N_ ("[-b|--binary-hash] FILE [BINARY HASH FILE]\n" +"[-c|--cert-hash] FILE [CERTFICATE HASH FILE]" ), +N_ ("Add distrusted CERTFICATE/BINARY HASH to the dbx list." ), options); +grub_verifier_register (&grub_appendedsig_verifier);grub_dl_set_persistent (mod); }
@@ -1444,4 +1717,7 @@ GRUB_MOD_FINI (appendedsig)grub_unregister_command (cmd_list_db);grub_unregister_command (cmd_db_cert);grub_unregister_command (cmd_dbx_cert); +grub_unregister_command (cmd_list_dbx); +grub_unregister_command (cmd_db_hash); +grub_unregister_extcmd (cmd_dbx_hash); }
include/grub/file.h +2 -0
@@ -115,6 +115,8 @@ enum grub_file_typeGRUB_FILE_TYPE_HASHLIST ,/* File hashed by hashsum. */ GRUB_FILE_TYPE_TO_HASH , +/* File holding certificiate/binary hash to add to db/dbx. */ +GRUB_FILE_TYPE_HASH_TRUST ,/* Keyboard layout. */ GRUB_FILE_TYPE_KEYBOARD_LAYOUT,/* Picture file. */
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v11 18/22] appended signatures: GRUB commands to manage the hashes
Quoted 353 lines · Sudhakar Kuppusamy
Introducing the following GRUB commands to manage certificate/binary hashes.
1.
append_list_dbx:
Show the list of distrusted certificates and binary/certificate hashes from the dbx list.
2.append_add_db_hash:
Add the trusted binary hash to the db list.
3.append_add_dbx_hash:
Add the distrusted certificate/binary hash to the dbx list.Note that if signature verification (
check_appended_signature) is set to enforce, theappend_add_db_hashandappend_add_dbx_hashcommands only accept the file ‘hash_file’ that is signed with an appended signature.Signed-off-by Sudhakar Kuppusamy <[email protected]>--- grub-core/commands/appendedsig/appendedsig.c | 276 +++++++++++++++++++ include/grub/file.h | 2 + 2 files changed, 278 insertions(+)grub-core/commands/appendedsig/appendedsig.c +276
-0@@ -52,6 +52,9 @@ GRUB_MOD_LICENSE ("GPLv3+");#define SHA384_HASH_LEN 48#define SHA512_HASH_LEN 64 +#define OPTION_BINARY_HASH 0 +#define OPTION_CERT_HASH 1 +/* * This structure is extracted from scripts/sign-file.c in the linux kernel * source. It was licensed as LGPLv2.1+, which is GPLv3+ compatible. @@ -125,6 +128,13 @@ static grub_pks_t *pks_keystore;/* Appended signature size. */ static grub_size_t append_sig_len =0 ; +static const struct grub_arg_option options[] = +{ + {"binary-hash" ,'b' ,0 ,N_ ("hash file of the binary." ),0 ,ARG_TYPE_PATHNAME }, + {"cert-hash" ,'c' ,1 ,N_ ("hash file of the certificate." ),0 ,ARG_TYPE_PATHNAME }, + {0 ,0 ,0 ,0 ,0 ,0 } +}; +static grub_ssize_t pseudo_read (struct grub_file *file,char *buf,grub_size_t len) {@@ -546,6 +556,69 @@ remove_cert_from_db (const grub_uint8_t *data, const grub_size_t data_size)return rc; } +static bool +cert_fingerprint_match (const grub_uint8_t *hash_data,const grub_size_t hash_data_size, +const grub_x509_cert_t *cert) +{ +grub_int32_t type; + +if (hash_data_size ==SHA256_HASH_LEN ) + type =GRUB_FINGERPRINT_SHA256 ; +else if (hash_data_size ==SHA384_HASH_LEN ) + type =GRUB_FINGERPRINT_SHA384 ; +else if (hash_data_size ==SHA512_HASH_LEN ) + type =GRUB_FINGERPRINT_SHA512 ; +else + { +grub_dprintf ("appendedsig" ,"unsupported fingerprint hash type " +"(%" PRIuGRUB_SIZE") \n" , hash_data_size); +return false; + } + +if (grub_memcmp (cert->fingerprint[type], hash_data, hash_data_size) ==0 ) +return true; + +return false; +} + +static void +remove_hash_from_db (const grub_uint8_t *hash_data,const grub_size_t hash_data_size, +const bool bin_hash) +{ +grub_uint32_t i; +grub_x509_cert_t *cert; + +if (bin_hash == true) + { +for (i =0 ; i < db.hash_entries; i++) + { +if (db.hashes[i] ==NULL ) +continue ; + +if (grub_memcmp (db.hashes[i], hash_data, hash_data_size) ==0 ) + { +grub_dprintf ("appendedsig" ,"removed distrusted hash %02x%02x%02x%02x.. from the db list\n" , + db.hashes[i][0 ], db.hashes[i][1 ], db.hashes[i][2 ], db.hashes[i][3 ]); +grub_free (db.hashes[i]); + db.hashes[i] =NULL ; + db.hash_sizes[i] =0 ; +break ; + } + } + } +else + { +for (cert = db.certs; cert !=NULL ; cert = cert->next) + { +if (cert_fingerprint_match (hash_data, hash_data_size, cert) == true) + { +_remove_cert_from_db (cert); +break ; + } + } + } +} +static grub_err_t file_read_whole (grub_file_t file,grub_uint8_t **buf,grub_size_t *len) {@@ -1020,6 +1093,194 @@ grub_cmd_list_db (grub_command_t cmd __attribute__ ((unused)), int argc __attribreturn GRUB_ERR_NONE ; } +static grub_err_t +grub_cmd_list_dbx (grub_command_t cmd __attribute__((unused)), +int argc __attribute__((unused)),char **args __attribute__((unused))) +{ +struct x509_certificate *cert; +grub_uint32_t i, cert_num =1 ; + +if (append_key_mgmt == false) +return grub_error (GRUB_ERR_ACCESS_DENIED , +"append_list_dbx command is unsupported in static key mode" ); + +for (cert = dbx.certs; cert !=NULL ; cert = cert->next, cert_num++) +print_certificate (cert, cert_num); + +for (i =0 ; i < dbx.hash_entries; i++) + { +if (dbx.hashes[i] !=NULL ) + { +grub_printf ("\nCertificate/Binary hash: %u\n" , i +1 ); +grub_printf (" Hash: sha%" PRIuGRUB_SIZE"\n " , dbx.hash_sizes[i] *8 ); +hexdump_colon (dbx.hashes[i], dbx.hash_sizes[i]); + } + } + +return GRUB_ERR_NONE ; +} + +/* +* Remove the trusted binary hash from the dbx list if present. +* And add them to the db list if it is not already present. +* Note:- When signature verification is enabled, this command only accepts +* the binary hash file that is signed with an appended signature. +* The signature is verified by the appendedsig module. If verification succeeds, +* the binary hash is added to the db list. Otherwise, an error is posted and +* the binary hash is not added. +* When signature verification is disabled, it accepts the binary hash file without +* an appended signature and adds it to the db list. +* +* Also, note that the adding of the trusted binary hash using this command does +* not persist across reboots. +*/ +static grub_err_t +grub_cmd_db_hash (grub_command_t cmd __attribute__((unused)),int argc,char **args) +{ +grub_err_t rc; +grub_file_t hash_file; +grub_uint8_t *hash_data =NULL ; +grub_size_t hash_data_size =0 ; + +if (append_key_mgmt == false) +return grub_error (GRUB_ERR_ACCESS_DENIED , +"append_add_db_hash command is unsupported in static key mode" ); + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a trusted binary hash file is expected in Binary format (.bin)\n" +"Example:\n\tappend_add_db_hash <BINARY HASH FILE>\n" ); + +if (!grub_strlen (args[0 ])) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing trusted binary hash file" ); + + hash_file =grub_file_open (args[0 ],GRUB_FILE_TYPE_HASH_TRUST |GRUB_FILE_TYPE_NO_DECOMPRESS ); +if (hash_file ==NULL ) +return grub_error (GRUB_ERR_FILE_NOT_FOUND ,"unable to open %s file" , args[0 ]); + + rc =file_read_whole (hash_file, &hash_data, &hash_data_size); +grub_file_close (hash_file); +if (rc !=GRUB_ERR_NONE ) +return rc; + +/* +* If signature verification is enabled, +* obtain the actual hash data size by subtracting the appended +* signature size from the hash data size because +* the hash has an appended signature, and this actual hash data size is +* used to get the hash data. +*/ +if (check_sigs == true) + hash_data_size -= append_sig_len; + +grub_dprintf ("appendedsig" , +"adding a trusted binary hash %02x%02x%02x%02x...\n with size of %" PRIuGRUB_SIZE"\n" , + hash_data[0 ], hash_data[1 ], hash_data[2 ], hash_data[3 ], hash_data_size); + +/* Only accept SHA256, SHA384 and SHA512 binary hash */ +if (hash_data_size !=SHA256_HASH_LEN && hash_data_size !=SHA384_HASH_LEN && + hash_data_size !=SHA512_HASH_LEN ) + { +grub_free (hash_data); +return grub_error (GRUB_ERR_BAD_SIGNATURE ,"unacceptable trusted binary hash type" ); + } + + rc =add_hash (hash_data, hash_data_size, &db); + +grub_free (hash_data); + +return rc; +} + +/* +* Remove the distrusted binary/certificate hash from the db list if present. +* And add them to the dbx list if it is not already present. +* Note:- When signature verification is enabled, this command only accepts +* the binary/certificate hash file that is signed with an appended signature. +* The signature is verified by the appendedsig module. If verification succeeds, +* the binary/certificate hash is added to the dbx list. Otherwise, an error is posted and +* the binary/certificate hash is not added. +* When signature verification is disabled, it accepts the binary/certificate hash file without +* an appended signature and adds it to the dbx list. +* +* Also, note that the adding of the distrusted binary/certificate hash using this command does +* not persist across reboots. +*/ +static grub_err_t +grub_cmd_dbx_hash (grub_extcmd_context_t ctxt,int argc __attribute__ ((unused)), +char **args __attribute__ ((unused))) +{ +grub_err_t rc; +grub_file_t hash_file; +grub_uint8_t *hash_data =NULL ; +grub_size_t hash_data_size =0 ; +char *file_path; + +if (append_key_mgmt == false) +return grub_error (GRUB_ERR_ACCESS_DENIED , +"append_add_dbx_hash command is unsupported in static key mode" ); + +if (!ctxt->state[OPTION_BINARY_HASH ].set && !ctxt->state[OPTION_CERT_HASH ].set) +return grub_error (GRUB_ERR_BAD_ARGUMENT , +"a distrusted certificate/binary hash file is expected in Binary format (.bin)\n" +"Example:\n\tappend_add_dbx_hash [option] <FILE>\n" +"option:\n[-b|--binary-hash] FILE [BINARY HASH FILE]\n" +"[-c|--cert-hash] FILE [CERTFICATE HASH FILE]\n" ); + +if (ctxt->state[OPTION_BINARY_HASH ].arg ==NULL && ctxt->state[OPTION_CERT_HASH ].arg ==NULL ) +return grub_error (GRUB_ERR_BAD_FILENAME ,"missing distrusted certificate/binary hash file" ); + +if (ctxt->state[OPTION_BINARY_HASH ].arg !=NULL ) + file_path = ctxt->state[OPTION_BINARY_HASH ].arg; +else + file_path = ctxt->state[OPTION_CERT_HASH ].arg; + + hash_file =grub_file_open (file_path,GRUB_FILE_TYPE_HASH_TRUST |GRUB_FILE_TYPE_NO_DECOMPRESS ); +if (hash_file ==NULL ) +return grub_error (GRUB_ERR_FILE_NOT_FOUND ,"unable to open %s file" , file_path); + + rc =file_read_whole (hash_file, &hash_data, &hash_data_size); +grub_file_close (hash_file); +if (rc !=GRUB_ERR_NONE ) +return rc; + +/* +* If signature verification is enabled, +* obtain the actual hash data size by subtracting the appended +* signature size from the hash data size because +* the hash has an appended signature, and this actual hash data size is +* used to get the hash data. +*/ +if (check_sigs == true) + hash_data_size -= append_sig_len; + +grub_dprintf ("appendedsig" , +"adding a distrusted certificate/binary hash %02x%02x%02x%02x...\n" +" with size of %" PRIuGRUB_SIZE"\n" , hash_data[0 ], hash_data[1 ], + hash_data[2 ], hash_data[3 ], hash_data_size); + +if (ctxt->state[OPTION_BINARY_HASH ].set || ctxt->state[OPTION_CERT_HASH ].set) + { +/* Only accept SHA256, SHA384 and SHA512 certificate/binary hash */ +if (hash_data_size !=SHA256_HASH_LEN && hash_data_size !=SHA384_HASH_LEN && + hash_data_size !=SHA512_HASH_LEN ) + { +grub_free (hash_data); +return grub_error (GRUB_ERR_BAD_SIGNATURE , +"unacceptable distrusted certificate/binary hash type" ); + } + } + +/* Remove distrusted binary hash/certificate from the db list if present. */ +remove_hash_from_db (hash_data, hash_data_size, + ((ctxt->state[OPTION_BINARY_HASH ].set) ? true : false)); + rc =add_hash (hash_data, hash_data_size, &dbx); + +grub_free (hash_data); + +return rc; +} +/* Add the X.509 certificates/binary hash to the db list from PKS. */ static grub_err_t load_pks2db (void )@@ -1344,6 +1605,8 @@ struct grub_file_verifier grub_appendedsig_verifier = { };static grub_command_t cmd_verify, cmd_list_db, cmd_dbx_cert, cmd_db_cert; +static grub_command_t cmd_list_dbx, cmd_db_hash; +static grub_extcmd_t cmd_dbx_hash;GRUB_MOD_INIT (appendedsig) {@@ -1422,6 +1685,16 @@ GRUB_MOD_INIT (appendedsig) cmd_dbx_cert =grub_register_command ("append_add_dbx_cert" , grub_cmd_dbx_cert,N_ ("<X509_CERTIFICATE>" ),N_ ("Add distrusted X509_CERTIFICATE to the dbx list" )); + cmd_list_dbx =grub_register_command ("append_list_dbx" , grub_cmd_list_dbx,0 , +N_ ("Show the list of distrusted certificates and" +" certificate/binary hashes from the dbx list" )); + cmd_db_hash =grub_register_command ("append_add_db_hash" , grub_cmd_db_hash,N_ ("BINARY HASH FILE" ), +N_ ("Add trusted BINARY HASH to the db list." )); + cmd_dbx_hash =grub_register_extcmd ("append_add_dbx_hash" , grub_cmd_dbx_hash,0 , +N_ ("[-b|--binary-hash] FILE [BINARY HASH FILE]\n" +"[-c|--cert-hash] FILE [CERTFICATE HASH FILE]" ), +N_ ("Add distrusted CERTFICATE/BINARY HASH to the dbx list." ), options); +grub_verifier_register (&grub_appendedsig_verifier);grub_dl_set_persistent (mod); }@@ -1444,4 +1717,7 @@ GRUB_MOD_FINI (appendedsig)grub_unregister_command (cmd_list_db);grub_unregister_command (cmd_db_cert);grub_unregister_command (cmd_dbx_cert); +grub_unregister_command (cmd_list_dbx); +grub_unregister_command (cmd_db_hash); +grub_unregister_extcmd (cmd_dbx_hash); }include/grub/file.h +0
-0
include/grub/file.h enum grub_file_type · line 122
Quoted 8 lines
include/grub/file.h +2
-0@@ -115,6 +115,8 @@ enum grub_file_typeGRUB_FILE_TYPE_HASHLIST ,/* File hashed by hashsum. */ GRUB_FILE_TYPE_TO_HASH , +/* File holding certificiate/binary hash to add to db/dbx. */ +GRUB_FILE_TYPE_HASH_TRUST ,/* Keyboard layout. */ GRUB_FILE_TYPE_KEYBOARD_LAYOUT,/* Picture file. */
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 19/22 appended signatures: Verification tests
In reply to Sudhakar Kuppusamy via Grub-develThese tests are run through all_functional_test and test a range of commands and behaviours.
--- grub-core/Makefile.core.def | 8 + grub-core/tests/appended_signature_test.c | 348 ++++++++ grub-core/tests/appended_signatures.h | 975 ++++++++++++++++++++++ grub-core/tests/lib/functional_test.c | 1 + 4 files changed, 1332 insertions(+) create mode 100644 grub-core/tests/appended_signature_test.c create mode 100644 grub-core/tests/appended_signatures.h
grub-core/Makefile.core.def +8 -0
@@ -2231,6 +2231,14 @@ module = { cppflags = '$(CPPFLAGS_GCRY)'; }; +module = { + name = appended_signature_test; + common = tests/appended_signature_test.c; + common = tests/appended_signatures.h; + enable = emu; + enable = powerpc_ieee1275; +}; + module = { name = signature_test; common = tests/signature_test.c;
grub-core/tests/appended_signature_test.c new file +348 -0
348 lines not on this page · raw message
grub-core/tests/appended_signatures.h new file +975 -0
975 lines not on this page · raw message
grub-core/tests/lib/functional_test.c +1 -0
@@ -73,6 +73,7 @@ grub_functional_all_tests (grub_extcmd_context_t ctxt __attribute__ ((unused)),grub_dl_load ("xnu_uuid_test" );grub_dl_load ("pbkdf2_test" );grub_dl_load ("signature_test" ); +grub_dl_load ("appended_signature_test" );grub_dl_load ("sleep_test" );grub_dl_load ("bswap_test" );grub_dl_load ("ctz_test" );
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 20/22 docs/grub: Document signing GRUB under UEFI
In reply to Sudhakar Kuppusamy via Grub-develFrom: Daniel Axtens <[email protected]>
Before adding information about how GRUB is signed with an appended signature scheme, it's worth adding some information about how it can currently be signed for UEFI.
--- docs/grub.texi | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
docs/grub.texi +17 -1
@@ -8907,6 +8907,7 @@ environment variables and commands are listed in the same order. * Measured Boot:: Measuring boot components * Lockdown:: Lockdown when booting on a secure setup * TPM2 key protector:: Managing disk key with TPM2 key protector +* Signing GRUB itself:: Ensuring the integrity of the GRUB core image @end menu @node Authentication and authorisation
@@ -8987,7 +8988,7 @@ commands. GRUB's @file{core.img} can optionally provide enforcement that all files subsequently read from disk are covered by a valid digital signature. -This document does @strong{not} cover how to ensure that your +This section does @strong{not} cover how to ensure that your platform's firmware (e.g., Coreboot) validates @file{core.img}. If environment variable @code{check_signatures}
@@ -9595,6 +9596,21 @@ which increases the risk of password leakage during the process. Moreover, the superuser list must be well maintained, and the password used cannot be synchronized with LUKS key rotation. +@node Signing GRUB itself +@section Signing GRUB itself +To ensure a complete secure-boot chain, there must be a way for the code that +loads GRUB to verify the integrity of the core image. +This is ultimately platform-specific and individual platforms can define their +own mechanisms. However, there are general-purpose mechanisms that can be used +with GRUB. +@section Signing GRUB for UEFI secure boot +On UEFI platforms, @file{core.img} is a PE binary. Therefore, it can be signed +with a tool such as @command{pesign} or @command{sbsign}. Refer to the +suggestions in @pxref{UEFI secure boot and shim} to ensure that the final +image works under UEFI secure boot and can maintain the secure-boot chain. It +will also be necessary to enroll the public key used into a relevant firmware +key database. + @node Platform limitations @chapter Platform limitations
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v11 20/22] docs/grub: Document signing GRUB under UEFI
Quoted 10 lines · Sudhakar Kuppusamy
From: Daniel Axtens <[email protected]>
Before adding information about how GRUB is signed with an appended signature scheme, it's worth adding some information about how it can currently be signed for UEFI.
Signed-off-by Daniel Axtens <[email protected]>Signed-off-by Sudhakar Kuppusamy <[email protected]>Reviewed-by Stefan Berger <[email protected]>Reviewed-by Daniel Kiper <[email protected]>
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v11 22/22 docs/grub: Document appended signature
In reply to Sudhakar Kuppusamy via Grub-develThis explains how appended signatures can be used to form part of a secure boot chain, and documents the commands and variables introduced.
--- docs/grub.texi | 327 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+)
docs/grub.texi +327 -0
@@ -3281,8 +3281,10 @@ GRUB. Others may be used freely in GRUB configuration files. These variables have special meaning to GRUB. @menu +* appendedsig_key_mgmt:: * biosnum:: * blsuki_save_default:: +* check_appended_signatures:: * check_signatures:: * chosen:: * cmdpath::
@@ -3333,6 +3335,19 @@ These variables have special meaning to GRUB. @end menu +@node appendedsig_key_mgmt +@subsection appendedsig_key_mgmt + +This variable controls whether GRUB enforces appended signature validation +using either @code{static} or @code{dynamic} key management. It is automatically +set by GRUB to either @code{static} or @code{dynamic} based on the +@strong{'ibm,secure-boot'} device tree property and Platform KeyStore (PKS). +Also, it can be explicitly set to either @code{static} or @code{dynamic} by +setting the @code{appendedsig_key_mgmt} variable from the GRUB console +when the GRUB is not locked down. + +@xref{Using appended signatures} for more information. + @node biosnum @subsection biosnum
@@ -3353,6 +3368,17 @@ If this variable is set, menu entries generated from BLS config files (@pxref{blscfg}) or UKI files (@pxref{uki}) will be set as the default boot entry when selected. +@node check_appended_signatures +@subsection check_appended_signatures + +This variable controls whether GRUB enforces appended signature validation on +loaded kernel and GRUB module files. It is automatically set by GRUB +to either @code{no} or @code{enforce} based on the @strong{'ibm,secure-boot'} device +tree property. Also, it can be explicitly set to either @code{no} or @code{enforce} by +setting the @code{check_appended_signatures} variable from the GRUB console +when the GRUB is not locked down. + +@xref{Using appended signatures} for more information. @node check_signatures @subsection check_signatures
@@ -6546,6 +6572,13 @@ you forget a command, you can run the command @command{help} @menu * [:: Check file types and compare values * acpi:: Load ACPI tables +* append_add_db_cert:: Add trusted certificate to the db list +* append_add_db_hash:: Add trusted certificate/binary hash to the db list +* append_add_dbx_cert:: Add distrusted certificate to the dbx list +* append_add_dbx_hash:: Add distrusted certificate/binary hash to the dbx list +* append_list_db:: List all trusted certificates from the db list +* append_list_dbx:: List all distrusted certificates and binary/certificate hashes from the dbx list +* append_verify:: Verify appended digital signature using db and dbx lists * authenticate:: Check whether user is in user list * background_color:: Set background color for active terminal * background_image:: Load background image for active terminal
@@ -6669,6 +6702,140 @@ Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). unsigned code. @end deffn +@node append_add_db_cert +@subsection append_add_db_cert + +@deffn Command append_add_db_cert <X509_certificate> +Read X.509 certificate from the file @var{X509_certificate} +and add it to GRUB's internal db list of trusted certificates. +These certificates are used to validate appended signatures when the +environment variable @code{check_appended_signatures} (@pxref{check_appended_signatures}) +is set to @code{enforce} or the @command{append_verify} (@pxref{append_verify}) +command is executed from the GRUB console. + +@xref{Using appended signatures} for more information. +@end deffn + +@node append_add_db_hash +@subsection append_add_db_hash + +@deffn Command append_add_db_hash <hash_file> +Read binary hash from the file @var{hash_file} +and add it to GRUB's internal db list of trusted binary hashes. These +hashes are used to validate the Linux kernel/GRUB module binary hashes when the +environment variable @code{check_appended_signatures} +(@pxref{check_appended_signatures}) is set to @code{enforce} or the +@command{append_verify} (@pxref{append_verify}) command is executed +from the GRUB console. + +Here is an example to generate a SHA-256 hash of a binary file using +OpenSSL in binary format: + +@example + +# The vmlinux (kernel image) file is your binary file, and +# it should be unsigned. +# +# Generate the binary_hash.bin file from the vmlinux file +# using OpenSSL command + +openssl dgst -binary -sha256 -out binary_hash.bin vmlinux + +@end example + +@xref{Using appended signatures} for more information. +@end deffn + +@node append_add_dbx_cert +@subsection append_add_dbx_cert + +@deffn Command append_add_dbx_cert <X509_certificate> +Read X.509 certificate from the file @var{X509_certificate} +and add it to GRUB's internal dbx list of distrusted certificates. +These certificates are used to ensure that the distrusted certificates +are rejected during appended signatures validation when the environment +variable @code{check_appended_signatures} is set to @code{enforce} +(@pxref{check_appended_signatures}) or the @command{append_verify} +(@pxref{append_verify}) command is executed from the GRUB console. +Also, these certificates are used to block adding the distrusted +certificates to the db list in the future. + +@xref{Using appended signatures} for more information. +@end deffn + +@node append_add_dbx_hash +@subsection append_add_dbx_hash + +@deffn Command append_add_dbx_hash [@option{-b}|@option{-c}] <hash_file> +Read binary/certificate hash from the file @var{hash_file} +and add it to GRUB's internal dbx list of distrusted binary/certificate hashes. +These hashes are used to ensure that the distrusted binary hashes/certificates +are rejected during Linux kernel/GRUB module binary hashes and appended signatures validation +when the environment variable @code{check_appended_signatures} (@pxref{check_appended_signatures}) +is set to @code{enforce} or the @command{append_verify} (@pxref{append_verify}) command +is executed from the GRUB console. Also, these hashes are used to block adding the distrusted +binary hashes and certificates to the db list in the future. + +The @option{-b} (@option{--binary-hash}) can be used to specify binary hash file and +@option{-c} (@option{--cert-hash}) can be used to specify certificate hash file. + +Here is an example to generate a hash of a binary and a certificate using +OpenSSL in binary format: + +@example + +# The vmlinux (kernel image) file is your binary file, and +# it should be unsigned. The kernel.der is your certificate file. +# +# Generate the cert_hash.bin file from the kernel.der file + +openssl dgst -binary -sha256 -out cert_hash.bin kernel.der + +# Generate the binary_hash.bin file from the vmlinux file + +openssl dgst -binary -sha256 -out binary_hash.bin vmlinux + +@end example + +@xref{Using appended signatures} for more information. +@end deffn + +@node append_list_db +@subsection append_list_db + +@deffn Command append_list_db +List all X.509 certificates and binary hashes trusted by GRUB for validating +appended signatures. The output is a numbered list of certificates and binary hashes, +showing the certificate's version, serial number, issuer, subject, +public key algorithm, RSA public key size, and certificate fingerprint. + +@xref{Using appended signatures} for more information. +@end deffn + +@node append_list_dbx +@subsection append_list_dbx + +@deffn Command append_list_dbx +List all the distrusted X.509 certificates and binary/certificate hashes. +The output is a numbered list of certificates and binary/certificate hashes, +showing the certificate's version, serial number, issuer, subject, +public key algorithm, RSA public key size, and certificate fingerprint. + +@xref{Using appended signatures} for more information. +@end deffn + +@node append_verify +@subsection append_verify + +@deffn Command append_verify <signed_file> +Verifies an appended signature on @var{signed_file} against the trusted X.509 certificates +and hashes known to GRUB (@pxref{append_list_db},@pxref{append_list_dbx}, @pxref{append_add_db_cert}, +@pxref{append_add_db_hash}, @pxref{append_add_dbx_hash} and @pxref{append_add_dbx_cert}). +Exit code @code{$?} is set to 0 if the signature validates successfully. +If validation fails, it is set to a non-zero value. + +@xref{Using appended signatures} for more information. +@end deffn @node authenticate @subsection authenticate
@@ -7507,6 +7674,13 @@ configurations, but to allow the user to select from among multiple configurations, and to enable ``one-shot'' boot attempts and ``savedefault'' behavior. @xref{Using GPG-style digital signatures}, for more information. + +If the environment variable @code{check_appended_signatures} value is set to +@code{enforce} and GRUB is in locked down mode, the user is not allowed to set +@code{check_appended_signatures} to @code{no} and @code{appendedsig_key_mgmt} +to @code{static} or @code{dynamic} either directly using @command{load_env} +command or via environment block file. @xref{Using appended signatures}, for +more information. @end deffn
@@ -8902,11 +9076,13 @@ environment variables and commands are listed in the same order. @menu * Authentication and authorisation:: Users and access control * Using GPG-style digital signatures:: Booting digitally signed code +* Using appended signatures:: An alternative approach to booting digitally signed code * UEFI secure boot and shim:: Booting digitally signed PE files * Secure Boot Advanced Targeting:: Embedded information for generation number based revocation * Measured Boot:: Measuring boot components * Lockdown:: Lockdown when booting on a secure setup * TPM2 key protector:: Managing disk key with TPM2 key protector +* Signing certificate and hash file:: Certificate and hash file signing * Signing GRUB itself:: Ensuring the integrity of the GRUB core image @end menu
@@ -9067,6 +9243,129 @@ or BIOS) configuration to cause the machine to boot from a different (attacker-controlled) device. GRUB is at best only one link in a secure boot chain. +@node Using appended signatures +@section Using appended signatures in GRUB + +GRUB supports verifying Linux-style 'appended signatures' for Linux on Power LPAR +secure boot. Appended signatures are PKCS#7 messages containing a signature over the +contents of a file, plus some metadata, appended to the end of a file. A file +with an appended signature ends with the magic string: + +@example +~Module signature appended~\n +@end example + +where @code{\n} represents the line feed character, @code{0x0a}. + +Linux on Power LPAR secure boot is controlled by @strong{'ibm,secure-boot'} +device tree property and if this property is set to @code{2} (@samp{enforce}), +GRUB enters lockdown. There are three secure boot modes. They are + +@itemize +@item @samp{0 - disabled}: Secure boot is disabled. This is the default. +@item @samp{1 - audit}: Enforce signature verification by setting + @code{check_appended_signatures} (@pxref{check_appended_signatures}) to + @code{enforce} and do not to lockdown the GRUB. Signature verification + is performed and if signature verification fails, post the errors and + allow the boot to continue. +@item @samp{2 - enforce}: Lockdown the GRUB and enforce signature verification by setting + @code{check_appended_signatures} (@pxref{check_appended_signatures}) to @code{enforce}. +@end itemize + +Note that Linux on Power LPAR only supports @samp{0 - disabled} and @samp{2 - enforce}, +and @samp{1 - audit} is considered as disabled. + +Enforcement of signature verification is controlled by the environment variable +@code{check_appended_signatures} (@pxref{check_appended_signatures}). + +@itemize +@item @samp{no}: No verification is performed. This is the default. +@item @samp{enforce}: Signature verification is performed and if signature verification fails, + post the errors and stop the boot. Signature verification cannot be disabled by setting + the @code{check_appended_signatures} variable back to @samp{no}. +@end itemize + +To enable appended signature verification, load the appendedsig module and an +X.509 certificate for verification. Building the appendedsig module into the +core GRUB image is recommended. + +Key management is controlled by the environment variable @code{appendedsig_key_mgmt} +(@pxref{appendedsig_key_mgmt}). + +@itemize +@item @samp{static}: Enforce static key management signature verification. This is the default. + When the GRUB is locked down, user cannot change the value of the + @code{appendedsig_key_mgmt}. +@item @samp{dynamic}: Enforce dynamic key management signature verification. When the GRUB is + locked down, user cannot change the value of the @code{appendedsig_key_mgmt}. +@end itemize + +In static key management mode, certificates will be built into the core image using +the @code{--x509} parameter to @command{grub-mkimage}. Whether Secure Boot is enabled or not, +it is possible to list the trusted certificates available at boot time using +@command{append_list_db} (@pxref{append_list_db}). The distrusted certificates can be +explicitly removed from the db using @command{append_add_dbx_cert} (@pxref{append_add_dbx_cert}). +The trusted certificates can be explicitly added to the db using +@command{append_add_db_cert} (@pxref{append_add_db_cert}). + +In dynamic key management mode, db and dbx are read from the Platform KeyStore (PKS). If +db is not present or empty in PKS, static keys (built-in keys) are used as the default keys. +Whether Secure Boot is enabled or not, it is possible to list the trusted certificates +and binary hashes available at boot time using @command{append_list_db} (@pxref{append_list_db}) +and list the distrusted certificates and binary/certificate hashes available at boot time +using @command{append_list_dbx} (@pxref{append_list_dbx}). The trusted certificates and +binary hashes can be explicitly added to the db using the @command{append_add_db_cert} +(@pxref{append_add_db_cert}) and @command{append_add_db_hash} (@pxref{append_add_db_hash}). +The distrusted certificates can be explicitly added to the dbx using the +@command{append_add_dbx_cert} (@pxref{append_add_dbx_cert}) and the distrusted +certificate/binary hases can be explicitly added to the dbx using the @command{append_add_dbx_hash} +(@pxref{append_add_dbx_hash}). + +A file can be explicitly verified using @command{append_verify} (@pxref{append_verify}). + +Note that when the environment variable @code{check_appended_signatures} is set to @code{enforce}, +the @command{append_add_db_cert} and @command{append_add_dbx_cert} commands only accept +the file @samp{@var{X509_certificate}} that is signed with an appended signature +(@pxref{Signing certificate and hash file}), and the @command{append_add_db_hash} and +@command{append_add_dbx_hash} commands only accept the file @samp{@var{hash_file}} that is +signed with an appended signature (@pxref{Signing certificate and hash file}). +The signature is verified by appendedsig module. +When the environment variable @code{check_appended_signatures} is set to @code{no}, +these commands accept files without an appended signature. + +Also, note that @samp{@var{X509_certificate}} should be in DER-format and @samp{@var{hash_file}} +should be in binary format. Certificates/hashes of certificates/binaries added through +@command{append_add_db_cert}, @command{append_add_dbx_cert}, @command{append_add_db_hash}, +and @command{append_add_dbx_hash} will not be persisted across boots. + +Only supported signatures generated using the SHA-256 or SHA-512 hash algorithms, +RSA signatures generated using 2048, 3076, or 4096 bit keys, +and binary/certificate hash generated using SHA-256, SHA-384, or SHA-512 algorithms. + +A file can be signed with the @command{sign-file} utility supplied with the +Linux kernel source. For example, if you have @code{signing.key} as the private +key and @code{certificate.der} as the X.509 certificate containing the public key: + +@example +sign-file SHA256 signing.key certificate.der vmlinux vmlinux.signed +@end example + +Once signature verification is turned on, the following file types must carry +appended signatures: + +@enumerate +@item Linux kernels +@item GRUB modules, except those built in to the core image +@item Any new certificate or binary hash files to be trusted +@item Any new certificate/binary hash files to be distrusted +@end enumerate + +When GRUB is locked down (when secure boot mode is @code{enforced}), +signature verification cannot be @strong{disabled} by setting the +@code{check_appended_signatures} (@pxref{check_appended_signatures}) variable +to @code{no} or using the @command{load_env} (@pxref{load_env}) command from +the GRUB console. + @node UEFI secure boot and shim @section UEFI secure boot and shim support
@@ -9596,6 +9895,34 @@ which increases the risk of password leakage during the process. Moreover, the superuser list must be well maintained, and the password used cannot be synchronized with LUKS key rotation. +@node Signing certificate and hash file +@section Signing certificate and hash file +The X.509 certificate (public key) file and hash file (binary/certificate hash file) +can be signed with a Linux kernel module-style appended signature. + +The signer.key is your private key used for signing, signer.der is corresponding +public key (certificate) used for appended signature verification. Note that the +signer.der (certificate) should exist in the db (@pxref{Using appended signatures}). + +@itemize +@item Signing the X.509 certificate file using @file{sign-file}. +The kernel.der is your X.509 certificate file. +@example + +sign-file SHA256 signer.key signer.der kernel.der \ + kernel.der.signed + +@end example +@item Signing the hash file using @file{sign-file}. +The binary_hash.bin is your binary hash file. +@example + +sign-file SHA256 signer.key signer.der binary_hash.bin \ + binary_hash.signed + +@end example +@end itemize + @node Signing GRUB itself @section Signing GRUB itself To ensure a complete secure-boot chain, there must be a way for the code that
Signature · 7 lines
2.39.5 (Apple Git-154) _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel