mirror of
https://codeberg.org/canoeboot/cbmk.git
synced 2025-01-10 17:19:57 +00:00
eb4ac3c334
The xHCI patches were removed because they caused issues on Sandybridge-based Dell Latitude laptops. See: https://codeberg.org/libreboot/lbmk/issues/216 The issue was not reported elsewhere, but we still don't need xHCI support in Canoeboot's GRUB because none of the available coreboot targets have xHCI support. However, we may want it in the future and it helps to keep Canoeboot in sync with Libreboot (this patch is adapted from lbmk). Each given coreboot target can say which GRUB tree to use by setting this in target.cfg: grubtree="xhci" In the above example, the "xhci" tree would be used. Some generic GRUB config has been moved to config/data/grub/ and config/grub/ now looks like config/coreboot/ - also, the grub.cfg file (named "payload" in each tree) is copied to the GRUB source tree as ".config", then added to GRUB's memdisk in the same way, as grub.cfg. Several other design changes had to be made because of this: * grub.cfg in memdisk no longer automatically jumps to one in CBFS, but now shows a menuentry for it if available * Certain commands in script/trees are disabled for GRUB, such as *config make commands. * gnulib is now defined in config/submodule/grub/, instead of config/git/grub - and this mitigates an existing bug where downloading gnulib first would make grub no longer possible to download in lbmk. There is another reason for merging this design change from lbmk, and that reasoning also applies to lbmk. Specifically: This change will enable per-board GRUB optimisation in the future. For example, we hardcode what partitions and LVMs GRUB scans because * is slow on ICH7-based machines, due to GRUB's design. On other machines, * is reasonably fast, for automatically enumerating the list of devices for boot. Use of * (and other wildcards) could enable our GRUB payload to automatically boot more distros, with minimal fuss. This can be done at a later date, in subsequent revisions. Signed-off-by: Leah Rowe <leah@libreboot.org>
83 lines
2.8 KiB
Diff
83 lines
2.8 KiB
Diff
From 0a21695c55f76f1c958bb633481d55b3168562f7 Mon Sep 17 00:00:00 2001
|
|
From: Ax333l <main@axelen.xyz>
|
|
Date: Thu, 17 Aug 2023 00:00:00 +0000
|
|
Subject: [PATCH 5/6] Compile with Argon2id support
|
|
|
|
Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
|
|
---
|
|
Makefile.util.def | 6 +++++-
|
|
grub-core/Makefile.core.def | 2 +-
|
|
grub-core/disk/luks2.c | 13 +++++++++++--
|
|
3 files changed, 17 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
|
index 1e9a13d3e..a167825c3 100644
|
|
--- a/Makefile.util.def
|
|
+++ b/Makefile.util.def
|
|
@@ -3,7 +3,7 @@ AutoGen definitions Makefile.tpl;
|
|
library = {
|
|
name = libgrubkern.a;
|
|
cflags = '$(CFLAGS_GNULIB)';
|
|
- cppflags = '$(CPPFLAGS_GNULIB) -I$(srcdir)/grub-core/lib/json';
|
|
+ cppflags = '$(CPPFLAGS_GNULIB) -I$(srcdir)/grub-core/lib/json -I$(srcdir)/grub-core/lib/argon2';
|
|
|
|
common = util/misc.c;
|
|
common = grub-core/kern/command.c;
|
|
@@ -36,6 +36,10 @@ library = {
|
|
common = grub-core/kern/misc.c;
|
|
common = grub-core/kern/partition.c;
|
|
common = grub-core/lib/crypto.c;
|
|
+ common = grub-core/lib/argon2/argon2.c;
|
|
+ common = grub-core/lib/argon2/core.c;
|
|
+ common = grub-core/lib/argon2/ref.c;
|
|
+ common = grub-core/lib/argon2/blake2/blake2b.c;
|
|
common = grub-core/lib/json/json.c;
|
|
common = grub-core/disk/luks.c;
|
|
common = grub-core/disk/luks2.c;
|
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
index 4a06789e5..e939dcc99 100644
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -1238,7 +1238,7 @@ module = {
|
|
common = disk/luks2.c;
|
|
common = lib/gnulib/base64.c;
|
|
cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
|
|
- cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -I$(srcdir)/lib/json';
|
|
+ cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -I$(srcdir)/lib/json -I$(srcdir)/lib/argon2';
|
|
};
|
|
|
|
module = {
|
|
diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
|
|
index bc818ea69..5b9eaa599 100644
|
|
--- a/grub-core/disk/luks2.c
|
|
+++ b/grub-core/disk/luks2.c
|
|
@@ -27,6 +27,7 @@
|
|
#include <grub/partition.h>
|
|
#include <grub/i18n.h>
|
|
|
|
+#include <argon2.h>
|
|
#include <base64.h>
|
|
#include <json.h>
|
|
|
|
@@ -462,8 +463,16 @@ luks2_decrypt_key (grub_uint8_t *out_key,
|
|
{
|
|
case LUKS2_KDF_TYPE_ARGON2I:
|
|
case LUKS2_KDF_TYPE_ARGON2ID:
|
|
- ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Argon2 not supported");
|
|
- goto err;
|
|
+ ret = argon2_hash (k->kdf.u.argon2.time, k->kdf.u.argon2.memory, k->kdf.u.argon2.cpus,
|
|
+ passphrase, passphraselen, salt, saltlen, area_key, k->area.key_size,
|
|
+ k->kdf.type == LUKS2_KDF_TYPE_ARGON2I ? Argon2_i : Argon2_id,
|
|
+ ARGON2_VERSION_NUMBER);
|
|
+ if (ret)
|
|
+ {
|
|
+ grub_dprintf ("luks2", "Argon2 failed: %s\n", argon2_error_message (ret));
|
|
+ goto err;
|
|
+ }
|
|
+ break;
|
|
case LUKS2_KDF_TYPE_PBKDF2:
|
|
hash = grub_crypto_lookup_md_by_name (k->kdf.u.pbkdf2.hash);
|
|
if (!hash)
|
|
--
|
|
2.39.2
|
|
|