[PATCH v19 05/33] libtasn1: replace strcat() with _asn1_str_cat()

2024-09-06 Thread Gary Lin via Grub-devel
strcat() is not available in GRUB. This commit replaces strcat() and _asn1_strcat() with the bounds-checking _asn1_str_cat(). Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin --- ...n1-replace-strcat-with-_asn1_str_cat.patch | 70 +++ 1 file changed, 70 insertions(+) create

[PATCH v19 08/33] libtasn1: fix the potential buffer overrun

2024-09-06 Thread Gary Lin via Grub-devel
In _asn1_tag_der(), the first while loop for the long form may end up with a 'k' value with 'ASN1_MAX_TAG_SIZE' and cause the buffer overrun in the second while loop. This commit tweaks the conditional check to avoid producing a too large 'k'. This is a quick fix and may differ from the official u

[PATCH v19 01/33] posix_wrap: tweaks in preparation for libtasn1

2024-09-06 Thread Gary Lin via Grub-devel
From: Daniel Axtens - Define SIZEOF_UNSIGNED_LONG_INT, it's the same as SIZEOF_UNSIGNED_LONG. - Define WORD_BIT, the size in bits of an int. This is a defined in the Single Unix Specification and in gnulib's limits.h. gnulib assumes it's 32 bits on all our platforms, including 64 bit

[PATCH v19 16/33] asn1_test: test module for libtasn1

2024-09-06 Thread Gary Lin via Grub-devel
From: Daniel Axtens Import tests from libtasn1 that use functionality we import. This test module is integrated into functional_test so that the user can run the test in grub shell. This doesn't test the full decoder but that will be exercised in test suites for coming patch sets. Add testcase

[PATCH v19 10/33] asn1_test: rename the main functions to the test names

2024-09-06 Thread Gary Lin via Grub-devel
This commit changes the main functions in the testcases to the test names so that the real 'main' test function can invokes them. Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin --- ...-the-main-functions-to-the-test-name.patch | 128 ++ 1 file changed, 128 insertions(+) c

[PATCH v19 03/33] libtasn1: disable code not needed in grub

2024-09-06 Thread Gary Lin via Grub-devel
We don't expect to be able to write ASN.1, only read it, so we can disable some code. Do that with #if 0/#endif, rather than deletion. This means that the difference between upstream and grub is smaller, which should make updating libtasn1 easier in the future. With these exclusions we also avoid

[PATCH v19 11/33] asn1_test: remove 'verbose' and the unnecessary printf()

2024-09-06 Thread Gary Lin via Grub-devel
This commit removes the 'verbose' variables and the unnecessary printf() to simplify the output. Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin --- ...e-verbose-and-the-unnecessary-printf.patch | 172 ++ 1 file changed, 172 insertions(+) create mode 100644 grub-core/lib/

[PATCH v19 13/33] asn1_test: return either 0 or 1 to reflect the results

2024-09-06 Thread Gary Lin via Grub-devel
Some testcases use exit() to end the test. Since all the asn1 testcases are invoked as functions, this commit replaces exit() with return to reflect the test results, so that the main test function can check the results. Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin --- ...-either-0-or-1

[PATCH v19 07/33] libtasn1: Use grub_divmod64() for division

2024-09-06 Thread Gary Lin via Grub-devel
Replace a 64-bit division with a call to grub_divmod64(), preventing creation of __udivdi3() calls on 32-bit platforms. Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin Reviewed-by: Daniel Kiper --- ...tasn1-Use-grub_divmod64-for-division.patch | 31 +++ 1 file changed, 31

[PATCH v19 04/33] libtasn1: replace strcat() with strcpy() in _asn1_str_cat()

2024-09-06 Thread Gary Lin via Grub-devel
strcat() is not available in GRUB. This commit replaces strcat() with strcpy() in _asn1_str_cat() as the preparation to replace other strcat() with the bounds-checking _asn1_str_cat(). Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin --- ...-strcat-with-strcpy-in-_asn1_str_cat.patch | 32 ++

[PATCH v19 29/33] diskfilter: look up cryptodisk devices first

2024-09-06 Thread Gary Lin via Grub-devel
When using disk auto-unlocking with TPM 2.0, the typical grub.cfg may look like this: tpm2_key_protector_init --tpm2key=(hd0,gpt1)/boot/grub2/sealed.tpm cryptomount -u -P tpm2 search --fs-uuid --set=root Since the disk search order is based on the order of module loading, the attacker cou

[PATCH v19 18/33] key_protector: Add key protectors framework

2024-09-06 Thread Gary Lin via Grub-devel
From: Hernan Gatta A key protector encapsulates functionality to retrieve an unlocking key for a fully-encrypted disk from a specific source. A key protector module registers itself with the key protectors framework when it is loaded and unregisters when unloaded. Additionally, a key protector ma

[PATCH v19 19/33] tss2: Add TPM2 buffer handling functions

2024-09-06 Thread Gary Lin via Grub-devel
As the prepartion to support TPM2 Software Stack (TSS2), this commit implements the TPM2 buffer handling functions to pack data for the TPM2 commands and unpack the data from the response. Cc: Stefan Berger Signed-off-by: Hernan Gatta Signed-off-by: Gary Lin Reviewed-by: Daniel Kiper --- grub

[PATCH v19 17/33] libtasn1: Add the documentation

2024-09-06 Thread Gary Lin via Grub-devel
Document libtasn1 in docs/grub-dev.texi and add the upgrade steps. Also add the patches to make libtasn1 compatible with grub code. Signed-off-by: Gary Lin Reviewed-by: Vladimir Serbinenko Reviewed-by: Daniel Kiper --- docs/grub-dev.texi | 35 +++ 1 file changed

[PATCH v19 21/33] tss2: Add TPM2 Software Stack (TSS2) support

2024-09-06 Thread Gary Lin via Grub-devel
A Trusted Platform Module (TPM) Software Stack (TSS) provides logic to compose and submit TPM commands and parse reponses. A limited number of TPM commands may be accessed via the EFI TCG2 protocol. This protocol exposes functionality that is primarily geared toward TPM usage within the context of

[PATCH v19 25/33] tpm2_key_protector: Support authorized policy

2024-09-06 Thread Gary Lin via Grub-devel
This commit handles the TPM2_PolicyAuthorize command from the key file in TPM 2.0 Key File format. TPM2_PolicyAuthorize is the essential command to support authorized policy which allows the users to sign TPM policies with their own keys. Per TPM 2.0 Key File(*1), CommandPolicy for TPM2_PolicyAuth

[PATCH v19 09/33] asn1_test: include asn1_test.h only

2024-09-06 Thread Gary Lin via Grub-devel
This commit removes all the headers and only uses asn1_test.h. To avoid including int.h from grub-core/lib/libtasn1-grub/lib/, CONST_DOWN is defined in reproducers.c. Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin --- ...7-asn1_test-include-asn1_test.h-only.patch | 163 ++

[PATCH v19 30/33] tpm2_key_protector: Add grub-emu support

2024-09-06 Thread Gary Lin via Grub-devel
As a preparation to test tpm2_key_protector with grub-emu, the new option, --tpm-device, is introduced to specify the TPM device for grub-emu so that grub-emu can share the emulated TPM device with the host. Since grub-emu can directly access the device node on host, it's easy to implement the ess

[PATCH v19 15/33] libtasn1: compile into asn1 module

2024-09-06 Thread Gary Lin via Grub-devel
From: Daniel Axtens Create a wrapper file that specifies the module license. Set up the makefile so it is built. Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin Reviewed-by: Daniel Kiper --- autogen.sh | 19 +++ grub-core/Makefile.core.def

[PATCH v19 20/33] tss2: Add TPM2 types and Marshal/Unmarshal functions

2024-09-06 Thread Gary Lin via Grub-devel
This commit adds the necessary TPM2 types and structs as the preparation for the TPM2 Software Stack (TSS2) support. The Marshal/Unmarshal functions are also added to handle the data structure to be submitted to TPM2 commands and to be received from the response. Cc: Stefan Berger Signed-off-by:

[PATCH v19 12/33] asn1_test: print the error messages with grub_printf()

2024-09-06 Thread Gary Lin via Grub-devel
This commit replaces printf() and fprintf() with grub_printf() to print the error messages for the testcases. Besides, asn1_strerror() is used to convert the result code to strings instead of asn1_perror(). Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin --- ...-the-error-messages-with-gru

[PATCH v19 31/33] tests: Add tpm2_key_protector_test

2024-09-06 Thread Gary Lin via Grub-devel
For the tpm2_key_protector module, the TCG2 command submission function is the only difference between a QEMU instance and grub-emu. To test TPM2 key unsealing with a QEMU instance, it requires an extra OS image to invoke grub-protect to seal the LUKS key, rather than a simple grub-shell rescue CD

[PATCH v19 33/33] docs: Document TPM2 key protector

2024-09-06 Thread Gary Lin via Grub-devel
Update the user manual to address TPM2 key protector including the two related commands, tpm2_key_protector_init and tpm2_key_protector_clear, and the user-space utility: grub-protect. Signed-off-by: Gary Lin --- docs/grub.texi | 507 + 1 file chan

[PATCH v19 06/33] libtasn1: adjust the header paths in libtasn1.h

2024-09-06 Thread Gary Lin via Grub-devel
Since libtasn1.h is the header to be included by users, including the standard POSIX headers in libtasn1.h would force the user to add the CFLAGS/CPPFLAGS for the POSIX headers. This commit adjusts the header paths to use the grub headers instead of the standard POSIX headers, so that users only n

[PATCH v19 24/33] util/grub-protect: Add new tool

2024-09-06 Thread Gary Lin via Grub-devel
From: Hernan Gatta To utilize the key protectors framework, there must be a way to protect full-disk encryption keys in the first place. The grub-protect tool includes support for the TPM2 key protector but other protectors that require setup ahead of time can be supported in the future. For the

[PATCH v19 32/33] cryptodisk: Document the '-P' option

2024-09-06 Thread Gary Lin via Grub-devel
The '-P' option is introduced to support the key protectors framework. This commit adds the new option to the GRUB manual. Signed-off-by: Gary Lin --- docs/grub.texi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi index 2ea6c56d1..3e6f602b

[PATCH v19 26/33] tpm2_key_protector: Implement NV index

2024-09-06 Thread Gary Lin via Grub-devel
From: Patrick Colp Currently with the TPM2 protector, only SRK mode is supported and NV index support is just a stub. Implement the NV index option. Note: This only extends support on the unseal path. grub2_protect has not been updated. tpm2-tools can be used to insert a key into the NV index.

[PATCH v19 27/33] cryptodisk: Fallback to passphrase

2024-09-06 Thread Gary Lin via Grub-devel
From: Patrick Colp If a protector is specified, but it fails to unlock the disk, fall back to asking for the passphrase. Before requesting the passphrase, the error from the key protector(s) has to be cleared, or the later code (e.g., LUKS code) may stop as 'grub_errno' is set. This commit print

[PATCH v19 28/33] cryptodisk: wipe out the cached keys from protectors

2024-09-06 Thread Gary Lin via Grub-devel
An attacker may insert a malicious disk with the same crypto UUID and trick grub2 to mount the fake root. Even though the key from the key protector fails to unlock the fake root, it's not wiped out cleanly so the attacker could dump the memory to retrieve the secret key. To defend such attack, wip

[PATCH v19 23/33] cryptodisk: Support key protectors

2024-09-06 Thread Gary Lin via Grub-devel
From: Hernan Gatta Add a new parameter to cryptomount to support the key protectors framework: -P. The parameter is used to automatically retrieve a key from specified key protectors. The parameter may be repeated to specify any number of key protectors. These are tried in order until one provide

[PATCH v19 14/33] asn1_test: use the grub-specific functions and types

2024-09-06 Thread Gary Lin via Grub-devel
This commit converts functions and types to the grub-specific ones: LONG_MAX -> GRUB_LONG_MAX INT_MAX -> GRUB_INT_MAX UINT_MAX -> GRUB_UINT_MAX size_t -> grub_size_t memcmp() -> grub_memcmp() memcpy() -> grub_memcpy() free() -> grub_free() strcmp() -> grub_strcmp() Signed-off-by: Daniel Axtens S

[PATCH v19 22/33] key_protector: Add TPM2 Key Protector

2024-09-06 Thread Gary Lin via Grub-devel
From: Hernan Gatta The TPM2 key protector is a module that enables the automatic retrieval of a fully-encrypted disk's unlocking key from a TPM 2.0. The theory of operation is such that the module accepts various arguments, most of which are optional and therefore possess reasonable defaults. On

[PATCH] Change "efi" to "EFI" in grub-mkrescue for secure boot

2024-09-06 Thread Askar Safin via Grub-devel
Hi. I propose changing "efi" to "EFI" in grub-mkrescue, because this is needed for secure boot. Please, apply patch below. Here is why. First of all, iso9660 file system is case sensitive from GRUB point of view. I. e. if you have directory named "efi" in iso9660, then GRUB command "ls /EFI" wi

Re: [PATCH] Change "efi" to "EFI" in grub-mkrescue for secure boot

2024-09-06 Thread Thomas Schmitt via Grub-devel
Hi, Askar Safin wrote: > I CC Thomas Schmitt, because my work seems to be related to xorriso. I checked that grub-mkrescue variables efidir_efi and efidir_efi_boot are not leading to arguments of the xorriso run. Insofar this change is transparent from the view of xorriso. I can confirm that ma

Re: [PATCH] Change "efi" to "EFI" in grub-mkrescue for secure boot

2024-09-06 Thread Pascal Hambourg
On 06/09/2024 at 15:15, Askar Safin wrote: While testing this script I noticed this: if I boot from disk (i. e. using "-drive" Qemu option), then "grub.cfg" is read from ESP, i. e. FAT. But if I boot from CD (i. e. using "-cdrom" Qemu option), then "grub.cfg" is read from main .iso partition, i.