GIT repo for v16: https://github.com/lcp/grub2/tree/tpm2-unlock-v16
This patch series is based on "Automatic TPM Disk Unlock"(*1) posted by Hernan Gatta to introduce the key protector framework and TPM2 stack to GRUB2, and this could be a useful feature for the systems to implement full disk encryption. To support TPM 2.0 Key File format(*2), patch 1~5,7 are grabbed from Daniel Axtens's "appended signature secure boot support" (*3) to import libtasn1 into grub2. Besides, the libtasn1 version is upgraded to 4.19.0 instead of 4.16.0 in the original patch. Patch 6 fixes a potential buffer overrun in libtasn1. (https://gitlab.com/gnutls/libtasn1/-/issues/49) Patch 8 adds the document for libtasn1 and the steps to upgrade the library. Patch 9~13 are Hernan Gatta's patches with the follow-up fixes and improvements: - Converting 8 spaces into 1 tab - Merging the minor build fix from Michael Chang - Replacing "lu" with "PRIuGRUB_SIZE" for grub_dprintf - Adding "enable = efi" to the tpm2 module in grub-core/Makefile.core.def - Rebasing "cryptodisk: Support key protectors" to the git master - Removing the measurement on the sealed key - Based on the patch from Olaf Kirch <o...@suse.com> - Adjusting the input parameters of TPM2_EvictControl to match the order in "TCG TPM2 Part3 Commands" - Declaring the input arguments of TPM2 functions as const - Resending TPM2 commands on TPM_RC_RETRY - Adding checks for the parameters of TPM2 commands - Packing the missing authorization command for TPM2_PCR_Read - Tweaking the TPM2 command functions to allow some parameters to be NULL so that we don't have to declare empty variables - Only enabling grub-protect for "efi" since the TPM2 stack currently relies on the EFI TCG2 protocol to send TPM2 commands - Using grub_cpu_to_be*() in the TPM2 stack instead of grub_swap_bytes*() which may cause problems in big-indian machines - Changing the short name of "--protector" of "cryptomount" from "-k" to "-P" to avoid the conflict with "--key-file" - Supporting TPM 2.0 Key File Format besides the raw sealed key - Adding the external libtasn1 dependency to grub-protect to write the TPM 2.0 Key files - Extending the TPM2 TSS stack to support authorized policy Patch 14 implements the authorized policy support. Patch 15 implements the missing NV index mode. (Thanks to Patrick Colp) Patch 16 improves the 'cryptomount' command to fall back to the passphrase mode when the key protector fails to unlock the encrypted partition. (Another patch from Patrick Colp) Patch 17 and 18 fix the potential security issues spotted by Fabian Vogt. Patch 19 and 20 implement the TPM key unsealing testcases. To utilize the TPM2 key protector to unlock the encrypted partition (sdb1), here are the sample steps: 1. Add an extra random key for LUKS (luks-key) $ dd if=/dev/urandom of=luks-key bs=1 count=32 $ sudo cryptsetup luksAddKey /dev/sdb1 luks-key --pbkdf=pbkdf2 2. Seal the key $ sudo grub-protect --action=add \ --protector=tpm2 \ --tpm2key \ --tpm2-keyfile=luks-key \ --tpm2-outfile=/boot/efi/boot/grub2/sealed.tpm 3. Unseal the key with the proper commands in grub.cfg: tpm2_key_protector_init --tpm2key=(hd0,gpt1)/boot/grub2/sealed.tpm cryptomount -u <SDB1_UUID> -P tpm2 (*1) https://lists.gnu.org/archive/html/grub-devel/2022-02/msg00006.html (*2) https://www.hansenpartnership.com/draft-bottomley-tpm2-keys.html (*3) https://lists.gnu.org/archive/html/grub-devel/2021-06/msg00044.html v16: - Rebasing patch 6, 12, and 16 to fix the conflicts with the latest master branch - Changes in cryptodisk: - Disallowing that both OPTION_KEYFILE and OPTION_PROTECTOR are set since the key data for "--key-file" would be overwritten by the key protectors - Resetting the cargs key data when the key from a key protector doesn't work for the disk to ensure the passphrase prompt will be triggered later - Adding the comment to address why grub_errno is only cleared for cargs->key_len == 0 v15: - https://lists.gnu.org/archive/html/grub-devel/2024-05/msg00059.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v15 - Changes in tpm2_test - Quoting the variables which contain file paths - Correcting the exit code for several commands - Writing the verification text directly into the LUKS device - Amending the waiting loop for swtpm - Replacing exit with return in tpm2_seal_unseal() and tpm2_seal_unseal_nv() - Collecting the parameters for the SRK mode testcases in an array and invoking tpm2_seal_unseal() with a for loop - Moving the tpm2-tools commands for the NV index mode to a separate function - Using tpm2_evictcontrol to remove the object from the NV index to match the key sealing commands - Printing the test results - Printing error messages to stderr v14: - https://lists.gnu.org/archive/html/grub-devel/2024-05/msg00011.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v14 - Addressing the libtasn1 patches more in the document - Various improvements in tpm2_test - Verifying the test inside the LUKS device - Improving the return status checks and the waiting loop for swtpm - Fixing the portability issues - Making all variables braced - Renaming grub-emu-opts to --emu-opts (grub-shell) v13: - https://lists.gnu.org/archive/html/grub-devel/2024-04/msg00155.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v13 - Fixing typos and a few multi-line comments - Improving the conditional checks for the arguments of tpm2_key_protector_init - Updating to the latest TPM 2.0 Key File format - Adding the new optional fields: description and rsaParent - Handling "rsaParent == TRUE" when unsealing the tpm2key - Setting "rsaParent" to "TRUE" when sealing the key with RSA SRK - Removing non-standard SRKs: RSA3072, RSA4096, ECC_NIST_P384, ECC_NIST_P521, and ECC_SM2_P256 - Adding more error messages to grub-protect - Improving the error checking for the swtpm chardev instance - Exiting the tpm2_test script if grub-protect failed to seal the key v12: - https://lists.gnu.org/archive/html/grub-devel/2024-04/msg00108.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v12 - Fixing typos and indentation - Removing the unused TPM commands: TPM2_HashSequenceStart, TPM2_SequenceUpdate, and TPM2_SequenceComplete, - Following the TCG EK templates to set the parameters of SRK - Removing ECC_BN_P256 and ECC_BN_P638 from the SRK algorithm list since those two algorithms are not mentioned in the TCG EK templates - Updating the help messages of the tpm2 module and grub-protect - Removing the unnecessary NULL checks - Adding the manpage for grub-protect - Replacing grub_crypto_hash() with TPM2_Hash() in grub-protect to support SHA384 PCR banks - Using 'swtpm chardev' to start swtpm instead of 'swtpm_cuse' since some distros may not build swtpm with cuse - Adding a new testcase without specifying the SRK type to test the default SRK settings - Amending tpm2_test to remove the duplicate error checking code - Silencing the tpm2-tools commands in tpm2_test - Fixing the exit trap of tpm2_test to removing the working directory on success v11: - https://lists.gnu.org/archive/html/grub-devel/2024-04/msg00052.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v11 - Adding the missing default: handlers in grub-core/tpm2/mu.c - Updating the help messages and commit messages to reflect the change of the default SRK algorithm (RSA2048 -> ECC_NIST_P256) - Adding the testcase for the NV index mode v10: - https://lists.gnu.org/archive/html/grub-devel/2024-04/msg00019.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v10 - Fixing the coverity issues: CID 435775, CID 435771, CID 435770, CID 435769, CID 435767, CID 435761 https://lists.gnu.org/archive/html/grub-devel/2024-02/txtKIuUb5lf3O.txt - Fixing the potential memory leak (CID 435775) - Removing the unnecessary grub_protect_get_grub_drive_for_file() from util/grub-protect.c (CID 435771) - Using the grub_tpm2_mu_TPM2B_*_Unmarshal functions to unmarshal the TPM2B structs instead of a generic grub_tpm2_mu_TPM2B_Unmarshal (CID 435770) - Fixing Null pointer dereference (CID 435769) - Adding bound checks to grub_tpm2_mu_TPML_DIGEST_Unmarshal() (CID 435767) - Improving the check for the return value of ftell() (CID 435761) - Adding a quick fix for CID 435762 - Removing the empty ending line in tests/asn1_test.in - Fixing docs/grub-dev.texi and updating the libtasn1 patches in grub-core/lib/libtasn1-patches/ - Merging all the TPM2 TSS stack patches into one to reduce the total patch number - Switching the default asymmetric algorithm from RSA2048 to TPM_ECC_NIST_P256 for the faster key generation - Adding the fallback SRK templates to try a few more SRK types in case grub2 failed to associate the sealed key with the SRK in the persistent handle or the default SRK - Improving the test script to add tests for the persistent handle and the fallback SRKs v9: - https://lists.gnu.org/archive/html/grub-devel/2024-02/msg00007.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v9 - Introducing c-ctype.h to posix_wrap and implementing strncat - Adding the descriptive comments to the disabled code in libtasn1 - Replacing strcat with the bound-checked _asn1_str_cat in libtasn1 and including c-ctype.h directly - Integrating the asn1 testcases into "functional_test" - Updating the libtasn1 patches mentioned in the documentation - Moving the key protector to a module - Amending configure.ac to enable/disable grub-protect - Fixing an timeout issue in the tpm2_test script by feeding the config through stdin v8: - https://lists.gnu.org/archive/html/grub-devel/2024-01/msg00013.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v8 - Introducing TPM device support to grub-emu and adding the TPM key unsealing testcase v7: - https://lists.gnu.org/archive/html/grub-devel/2023-11/msg00127.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v7 - Stopping reading SRK from the well-known persistent handle (TPM2_SRK_HANDLE, i.e. 0x81000001) by default since the persistent handle may be created by other OS and causes unsealing failure due to SRK mismatching - The user now has to specify the persistent handle with "--srk" explicitly. - Utilizing grub_error() to print more error messages - Unifying the format of the error messages from TPM2 commands v6: - https://lists.gnu.org/archive/html/grub-devel/2023-10/msg00026.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v6 - Supporting more SRK types than RSA2048 and ECC_NIST_P256 - Documenting SHA512 as the supported PCR bank type in the tpm2 protector - Removing the redundant error message for grub_tpm2_protector_srk_get() since it may overwrite the real error message. - Updating the supported SRK types and PCR bank types in grub-protect - Removing the unused type: TPM2_ECC_CURVE v5: - https://lists.gnu.org/archive/html/grub-devel/2023-08/msg00113.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v5 - Rebasing to the latest git HEAD and improving the commit messages - Implementing authorized poilcy support - Implementing NV index mode - Improving the 'cryptomount' command to fall back to the passphrase mode when the key protector fails to unlock the encrypted partition - Fixing the potential security issues v4: - https://lists.gnu.org/archive/html/grub-devel/2023-04/msg00104.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v4 - Improving the error condition checks in cryptodisk.c - Moving the code to unseal with the standalone policy sequence below the code for authpolicy sequence - The standalone policy sequence was mistakenly prepended to to the authpolicy sequence with grub_list_push() while it should be appended. - Pushing the error messages from the authpolicy sequence into the grub_error stack so that we can list all errors from the sequence - Improving the error messages in the TPM2 protector - Amending the calculation of the max string lengths of 'Policy', 'CommandCode' and 'CommandPolicy' - Skipping the error path in grub_tpm2key_get_authpolicy_seq() on success to avoid freeing the authpolicy sequence v3: - https://lists.gnu.org/archive/html/grub-devel/2023-04/msg00055.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v3 - Adding the document for libtasn1 - Improving the error condition checks ex: "if (!ptr)" ==> "if (ptr == NULL)" "if (err)" ==> "if (err != GRUB_ERR_NONE)" "if (rc)" ==> "if (rc != TPM_RC_SUCCESS)" - Supporting the "TPMPolicy" and "TPMAuthPolicy" sequence in the TPM 2.0 key File - Refactoring the key recover function to support "TPMPolicy" and "TPMAuthPolicy" sequence - Using TPMS_PCR_SELECTION_SelectPCR() to set the PCR bit mask - Also dropping TPM2_PCR_TO_SELECT() and TPM2_PCR_TO_BIT() which are not necessary anymore - Removing the redundant variable, 'crd', from grub_cryptodisk_scan_device_real() - Fixing the spaces/tabs in cryptodisk.c - Fixing the comment format in cryptodisk.h - Adding the defensive check for "cargs->protectors" in grub_cryptodisk_scan_device() - Improving 'grub-protect' for the better support of TPM 2.0 Key File - Adding more comments v2: - https://lists.gnu.org/archive/html/grub-devel/2023-03/msg00094.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock-v2 v1: - https://lists.gnu.org/archive/html/grub-devel/2023-02/msg00130.html - GIT repo: https://github.com/lcp/grub2/tree/tpm2-unlock Daniel Axtens (6): posix_wrap: tweaks in preparation for libtasn1 libtasn1: import libtasn1-4.19.0 libtasn1: disable code not needed in grub libtasn1: changes for grub compatibility libtasn1: compile into asn1 module asn1_test: test module for libtasn1 Gary Lin (7): libtasn1: fix the potential buffer overrun libtasn1: Add the documentation tpm2: Support authorized policy cryptodisk: wipe out the cached keys from protectors diskfilter: look up cryptodisk devices first tpm2: Enable tpm2 module for grub-emu tests: Add tpm2_test Hernan Gatta (5): key_protector: Add key protectors framework tpm2: Add TPM Software Stack (TSS) key_protector: Add TPM2 Key Protector cryptodisk: Support key protectors util/grub-protect: Add new tool Patrick Colp (2): tpm2: Implement NV index cryptodisk: Fallback to passphrase .gitignore | 2 + Makefile.util.def | 37 + configure.ac | 30 + docs/grub-dev.texi | 34 + docs/man/grub-protect.h2m | 4 + grub-core/Makefile.am | 1 + grub-core/Makefile.core.def | 48 + grub-core/disk/cryptodisk.c | 262 +- grub-core/disk/diskfilter.c | 35 +- grub-core/disk/key_protector.c | 78 + grub-core/kern/emu/main.c | 11 +- grub-core/kern/emu/misc.c | 51 + ...asn1-disable-code-not-needed-in-grub.patch | 320 +++ ...tasn1-changes-for-grub-compatibility.patch | 135 + ...sn1-fix-the-potential-buffer-overrun.patch | 35 + grub-core/lib/libtasn1/COPYING | 16 + grub-core/lib/libtasn1/README.md | 98 + grub-core/lib/libtasn1/lib/coding.c | 1433 ++++++++++ grub-core/lib/libtasn1/lib/decoding.c | 2503 +++++++++++++++++ grub-core/lib/libtasn1/lib/element.c | 1109 ++++++++ grub-core/lib/libtasn1/lib/element.h | 42 + grub-core/lib/libtasn1/lib/errors.c | 103 + grub-core/lib/libtasn1/lib/gstr.c | 74 + grub-core/lib/libtasn1/lib/gstr.h | 50 + grub-core/lib/libtasn1/lib/int.h | 220 ++ grub-core/lib/libtasn1/lib/parser_aux.c | 1178 ++++++++ grub-core/lib/libtasn1/lib/parser_aux.h | 172 ++ grub-core/lib/libtasn1/lib/structure.c | 1227 ++++++++ grub-core/lib/libtasn1/lib/structure.h | 46 + grub-core/lib/libtasn1_wrap/wrap.c | 26 + grub-core/lib/posix_wrap/c-ctype.h | 114 + grub-core/lib/posix_wrap/limits.h | 1 + grub-core/lib/posix_wrap/stdlib.h | 8 + grub-core/lib/posix_wrap/string.h | 21 + grub-core/lib/posix_wrap/sys/types.h | 1 + .../tests/asn1/CVE-2018-1000654-1_asn1_tab.h | 32 + .../tests/asn1/CVE-2018-1000654-2_asn1_tab.h | 36 + grub-core/tests/asn1/CVE-2018-1000654.c | 58 + grub-core/tests/asn1/Test_overflow.c | 134 + grub-core/tests/asn1/Test_simple.c | 205 ++ grub-core/tests/asn1/Test_strings.c | 142 + grub-core/tests/asn1/asn1_test.c | 49 + grub-core/tests/asn1/asn1_test.h | 44 + grub-core/tests/asn1/object-id-decoding.c | 109 + grub-core/tests/asn1/object-id-encoding.c | 114 + grub-core/tests/asn1/octet-string.c | 199 ++ grub-core/tests/asn1/reproducers.c | 80 + grub-core/tests/lib/functional_test.c | 1 + grub-core/tpm2/args.c | 140 + grub-core/tpm2/buffer.c | 145 + grub-core/tpm2/module.c | 1325 +++++++++ grub-core/tpm2/mu.c | 1168 ++++++++ grub-core/tpm2/tcg2-emu.c | 52 + grub-core/tpm2/tcg2.c | 143 + grub-core/tpm2/tpm2.c | 1048 +++++++ grub-core/tpm2/tpm2key.asn | 33 + grub-core/tpm2/tpm2key.c | 476 ++++ grub-core/tpm2/tpm2key_asn1_tab.c | 45 + include/grub/cryptodisk.h | 16 + include/grub/emu/misc.h | 5 + include/grub/key_protector.h | 46 + include/grub/libtasn1.h | 657 +++++ include/grub/tpm2/buffer.h | 65 + include/grub/tpm2/internal/args.h | 49 + include/grub/tpm2/internal/functions.h | 156 + include/grub/tpm2/internal/structs.h | 768 +++++ include/grub/tpm2/internal/types.h | 403 +++ include/grub/tpm2/mu.h | 396 +++ include/grub/tpm2/tcg2.h | 34 + include/grub/tpm2/tpm2.h | 34 + include/grub/tpm2/tpm2key.h | 86 + tests/asn1_test.in | 11 + tests/tpm2_test.in | 389 +++ tests/util/grub-shell.in | 6 +- util/grub-protect.c | 1420 ++++++++++ 75 files changed, 19769 insertions(+), 75 deletions(-) create mode 100644 docs/man/grub-protect.h2m create mode 100644 grub-core/disk/key_protector.c create mode 100644 grub-core/lib/libtasn1-patches/0001-libtasn1-disable-code-not-needed-in-grub.patch create mode 100644 grub-core/lib/libtasn1-patches/0002-libtasn1-changes-for-grub-compatibility.patch create mode 100644 grub-core/lib/libtasn1-patches/0003-libtasn1-fix-the-potential-buffer-overrun.patch create mode 100644 grub-core/lib/libtasn1/COPYING create mode 100644 grub-core/lib/libtasn1/README.md create mode 100644 grub-core/lib/libtasn1/lib/coding.c create mode 100644 grub-core/lib/libtasn1/lib/decoding.c create mode 100644 grub-core/lib/libtasn1/lib/element.c create mode 100644 grub-core/lib/libtasn1/lib/element.h create mode 100644 grub-core/lib/libtasn1/lib/errors.c create mode 100644 grub-core/lib/libtasn1/lib/gstr.c create mode 100644 grub-core/lib/libtasn1/lib/gstr.h create mode 100644 grub-core/lib/libtasn1/lib/int.h create mode 100644 grub-core/lib/libtasn1/lib/parser_aux.c create mode 100644 grub-core/lib/libtasn1/lib/parser_aux.h create mode 100644 grub-core/lib/libtasn1/lib/structure.c create mode 100644 grub-core/lib/libtasn1/lib/structure.h create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c create mode 100644 grub-core/lib/posix_wrap/c-ctype.h create mode 100644 grub-core/tests/asn1/CVE-2018-1000654-1_asn1_tab.h create mode 100644 grub-core/tests/asn1/CVE-2018-1000654-2_asn1_tab.h create mode 100644 grub-core/tests/asn1/CVE-2018-1000654.c create mode 100644 grub-core/tests/asn1/Test_overflow.c create mode 100644 grub-core/tests/asn1/Test_simple.c create mode 100644 grub-core/tests/asn1/Test_strings.c create mode 100644 grub-core/tests/asn1/asn1_test.c create mode 100644 grub-core/tests/asn1/asn1_test.h create mode 100644 grub-core/tests/asn1/object-id-decoding.c create mode 100644 grub-core/tests/asn1/object-id-encoding.c create mode 100644 grub-core/tests/asn1/octet-string.c create mode 100644 grub-core/tests/asn1/reproducers.c create mode 100644 grub-core/tpm2/args.c create mode 100644 grub-core/tpm2/buffer.c create mode 100644 grub-core/tpm2/module.c create mode 100644 grub-core/tpm2/mu.c create mode 100644 grub-core/tpm2/tcg2-emu.c create mode 100644 grub-core/tpm2/tcg2.c create mode 100644 grub-core/tpm2/tpm2.c create mode 100644 grub-core/tpm2/tpm2key.asn create mode 100644 grub-core/tpm2/tpm2key.c create mode 100644 grub-core/tpm2/tpm2key_asn1_tab.c create mode 100644 include/grub/key_protector.h create mode 100644 include/grub/libtasn1.h create mode 100644 include/grub/tpm2/buffer.h create mode 100644 include/grub/tpm2/internal/args.h create mode 100644 include/grub/tpm2/internal/functions.h create mode 100644 include/grub/tpm2/internal/structs.h create mode 100644 include/grub/tpm2/internal/types.h create mode 100644 include/grub/tpm2/mu.h create mode 100644 include/grub/tpm2/tcg2.h create mode 100644 include/grub/tpm2/tpm2.h create mode 100644 include/grub/tpm2/tpm2key.h create mode 100644 tests/asn1_test.in create mode 100644 tests/tpm2_test.in create mode 100644 util/grub-protect.c Range-diff against v15: 1: c6a7b2a55 = 1: bc0e42183 posix_wrap: tweaks in preparation for libtasn1 2: c2dfb28d9 = 2: 6824619ec libtasn1: import libtasn1-4.19.0 3: f5c15acce = 3: c49a0287a libtasn1: disable code not needed in grub 4: 30271d827 = 4: 068b97b14 libtasn1: changes for grub compatibility 5: 9eb5bb4fc = 5: 0fdb7ce8c libtasn1: fix the potential buffer overrun 6: ef1e5cfe7 ! 6: dc1e882a2 libtasn1: compile into asn1 module @@ Commit message ## grub-core/Makefile.core.def ## @@ grub-core/Makefile.core.def: module = { - efi = commands/bli.c; enable = efi; + depends = part_gpt; }; + +module = { 7: f851596f8 = 7: 141893df5 asn1_test: test module for libtasn1 8: f04612ab5 = 8: 762704b8b libtasn1: Add the documentation 9: e03991256 = 9: 7320efe13 key_protector: Add key protectors framework 10: f3368e733 = 10: d506f4baf tpm2: Add TPM Software Stack (TSS) 11: 86495e70d = 11: 11a7fbdab key_protector: Add TPM2 Key Protector 12: 3e5484cf0 ! 12: 3b2872215 cryptodisk: Support key protectors @@ grub-core/disk/cryptodisk.c: grub_cryptodisk_scan_device_real (const char *name, + break; + } -- if (!cargs->key_len) +- if (cargs->key_len) - { -- /* Get the passphrase from the user, if no key data. */ -- askpass = 1; -- part = grub_partition_get_name (source->partition); -- grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name, -- source->partition != NULL ? "," : "", -- part != NULL ? part : N_("UNKNOWN"), -- dev->uuid); -- grub_free (part); -- -- cargs->key_data = grub_malloc (GRUB_CRYPTODISK_MAX_PASSPHRASE); -- if (cargs->key_data == NULL) -- goto error_no_close; -- -- if (!grub_password_get ((char *) cargs->key_data, GRUB_CRYPTODISK_MAX_PASSPHRASE)) -- { -- grub_error (GRUB_ERR_BAD_ARGUMENT, "passphrase not supplied"); -- goto error; -- } -- cargs->key_len = grub_strlen ((char *) cargs->key_data); +- ret = cr->recover_key (source, dev, cargs); +- if (ret != GRUB_ERR_NONE) +- goto error; - } +- else +- { +- /* Get the passphrase from the user, if no key data. */ +- unsigned long tries = 3; +- const char *tries_env; + if (dev == NULL) + { + grub_error (GRUB_ERR_BAD_MODULE, @@ grub-core/disk/cryptodisk.c: grub_cryptodisk_scan_device_real (const char *name, + goto error_no_close; + } -- ret = cr->recover_key (source, dev, cargs); -- if (ret != GRUB_ERR_NONE) -- goto error; +- askpass = 1; +- cargs->key_data = grub_malloc (GRUB_CRYPTODISK_MAX_PASSPHRASE); +- if (cargs->key_data == NULL) +- goto error_no_close; + if (cargs->protectors) + { + for (i = 0; cargs->protectors[i]; i++) + { + if (cargs->key_cache[i].invalid) + continue; -+ + +- tries_env = grub_env_get ("cryptodisk_passphrase_tries"); +- if (tries_env != NULL && tries_env[0] != '\0') +- { +- unsigned long tries_env_val; +- const char *p; + if (cargs->key_cache[i].key == NULL) + { + ret = grub_key_protector_recover_key (cargs->protectors[i], @@ grub-core/disk/cryptodisk.c: grub_cryptodisk_scan_device_real (const char *name, + continue; + } + } -+ + +- tries_env_val = grub_strtoul (tries_env, &p, 0); +- if (*p == '\0' && tries_env_val != ~0UL) +- tries = tries_env_val; +- else +- grub_printf_ (N_("Invalid cryptodisk_passphrase_tries value `%s'. Defaulting to %lu.\n"), +- tries_env, +- tries); +- } + cargs->key_data = cargs->key_cache[i].key; + cargs->key_len = cargs->key_cache[i].key_len; -+ + +- for (; tries > 0; tries--) +- { +- part = grub_partition_get_name (source->partition); +- grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name, +- source->partition != NULL ? "," : "", +- part != NULL ? part : N_("UNKNOWN"), +- dev->uuid); +- grub_free (part); +- +- if (!grub_password_get ((char *) cargs->key_data, GRUB_CRYPTODISK_MAX_PASSPHRASE)) +- { +- grub_error (GRUB_ERR_BAD_ARGUMENT, "passphrase not supplied"); + ret = cr->recover_key (source, dev, cargs); + if (ret != GRUB_ERR_NONE) + { @@ grub-core/disk/cryptodisk.c: grub_cryptodisk_scan_device_real (const char *name, + grub_dprintf ("cryptodisk", + "recovered a key from key protector %s but it " + "failed to unlock %s%s%s (%s)\n", -+ cargs->protectors[i], source->name, -+ source->partition != NULL ? "," : "", -+ part != NULL ? part : N_("UNKNOWN"), dev->uuid); ++ cargs->protectors[i], source->name, ++ source->partition != NULL ? "," : "", ++ part != NULL ? part : N_("UNKNOWN"), dev->uuid); + grub_free (part); + continue; + } @@ grub-core/disk/cryptodisk.c: grub_cryptodisk_scan_device_real (const char *name, + { + ret = grub_cryptodisk_insert (dev, name, source); + if (ret != GRUB_ERR_NONE) -+ goto error; + goto error; +- } +- cargs->key_len = grub_strlen ((char *) cargs->key_data); + goto cleanup; + } + } - -- ret = grub_cryptodisk_insert (dev, name, source); -- if (ret != GRUB_ERR_NONE) ++ + part = grub_partition_get_name (source->partition); + grub_error (GRUB_ERR_ACCESS_DENIED, + N_("no key protector provided a usable key for %s%s%s (%s)"), + source->name, source->partition != NULL ? "," : "", + part != NULL ? part : N_("UNKNOWN"), dev->uuid); + grub_free (part); - goto error; ++ goto error; + } + -+ if (!cargs->key_len) ++ if (cargs->key_len) ++ { ++ ret = cr->recover_key (source, dev, cargs); ++ if (ret != GRUB_ERR_NONE) ++ goto error; ++ } ++ else + { + /* Get the passphrase from the user, if no key data. */ ++ unsigned long tries = 3; ++ const char *tries_env; + +- ret = cr->recover_key (source, dev, cargs); +- if (ret == GRUB_ERR_NONE) +- break; +- if (ret != GRUB_ERR_ACCESS_DENIED || tries == 1) + askpass = 1; -+ part = grub_partition_get_name (source->partition); -+ grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name, -+ source->partition != NULL ? "," : "", -+ part != NULL ? part : N_("UNKNOWN"), dev->uuid); -+ grub_free (part); -+ + cargs->key_data = grub_malloc (GRUB_CRYPTODISK_MAX_PASSPHRASE); + if (cargs->key_data == NULL) -+ goto error; ++ goto error_no_close; + -+ if (!grub_password_get ((char *) cargs->key_data, GRUB_CRYPTODISK_MAX_PASSPHRASE)) ++ tries_env = grub_env_get ("cryptodisk_passphrase_tries"); ++ if (tries_env != NULL && tries_env[0] != '\0') + { -+ grub_error (GRUB_ERR_BAD_ARGUMENT, "passphrase not supplied"); -+ goto error; ++ unsigned long tries_env_val; ++ const char *p; ++ ++ tries_env_val = grub_strtoul (tries_env, &p, 0); ++ if (*p == '\0' && tries_env_val != ~0UL) ++ tries = tries_env_val; ++ else ++ grub_printf_ (N_("Invalid cryptodisk_passphrase_tries value `%s'. Defaulting to %lu.\n"), ++ tries_env, ++ tries); + } -+ cargs->key_len = grub_strlen ((char *) cargs->key_data); -+ } + -+ ret = cr->recover_key (source, dev, cargs); -+ if (ret != GRUB_ERR_NONE) -+ goto error; ++ for (; tries > 0; tries--) ++ { ++ part = grub_partition_get_name (source->partition); ++ grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name, ++ source->partition != NULL ? "," : "", ++ part != NULL ? part : N_("UNKNOWN"), ++ dev->uuid); ++ grub_free (part); ++ ++ if (!grub_password_get ((char *) cargs->key_data, GRUB_CRYPTODISK_MAX_PASSPHRASE)) ++ { ++ grub_error (GRUB_ERR_BAD_ARGUMENT, "passphrase not supplied"); + goto error; +- grub_puts_ (N_("Invalid passphrase.")); +- +- /* +- * Since recover_key() calls a function that returns grub_errno, +- * a leftover error value from a previously rejected passphrase +- * will trigger a phantom failure. We therefore clear it before +- * trying a new passphrase. +- */ +- grub_errno = GRUB_ERR_NONE; +- } +- } ++ } ++ cargs->key_len = grub_strlen ((char *) cargs->key_data); + +- ret = grub_cryptodisk_insert (dev, name, source); +- if (ret != GRUB_ERR_NONE) +- goto error; ++ ret = cr->recover_key (source, dev, cargs); ++ if (ret == GRUB_ERR_NONE) ++ break; ++ if (ret != GRUB_ERR_ACCESS_DENIED || tries == 1) ++ goto error; ++ grub_puts_ (N_("Invalid passphrase.")); ++ ++ /* ++ * Since recover_key() calls a function that returns grub_errno, ++ * a leftover error value from a previously rejected passphrase ++ * will trigger a phantom failure. We therefore clear it before ++ * trying a new passphrase. ++ */ ++ grub_errno = GRUB_ERR_NONE; ++ } ++ } + + ret = grub_cryptodisk_insert (dev, name, source); + if (ret != GRUB_ERR_NONE) @@ grub-core/disk/cryptodisk.c: grub_cmd_cryptomount (grub_extcmd_context_t ctxt, i + if (state[OPTION_PASSWORD].set && state[OPTION_PROTECTOR].set) /* password and key protector */ + return grub_error (GRUB_ERR_BAD_ARGUMENT, + "a password and a key protector cannot both be set"); ++ ++ if (state[OPTION_KEYFILE].set && state[OPTION_PROTECTOR].set) /* key file and key protector */ ++ return grub_error (GRUB_ERR_BAD_ARGUMENT, ++ "a key file and a key protector cannot both be set"); + if (state[OPTION_PASSWORD].set) /* password */ { 13: b7bd289b6 = 13: 55f8ea964 util/grub-protect: Add new tool 14: 7cb1d9740 = 14: 3a29b8311 tpm2: Support authorized policy 15: d7b4b99a9 = 15: ca6c7ce07 tpm2: Implement NV index 16: d48b1ac29 < -: --------- cryptodisk: Fallback to passphrase -: --------- > 16: e0349bcf8 cryptodisk: Fallback to passphrase 17: 0cfc6d2b7 = 17: 0a9e710fd cryptodisk: wipe out the cached keys from protectors 18: 8c7507f0f = 18: 31d81e0e4 diskfilter: look up cryptodisk devices first 19: 64f1a3e02 = 19: b43b7b6f3 tpm2: Enable tpm2 module for grub-emu 20: 93fc657ca = 20: 304ca3e27 tests: Add tpm2_test -- 2.35.3 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
