[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/6] afsplitter: Move into its own module
From: |
Patrick Steinhardt |
Subject: |
[PATCH v2 4/6] afsplitter: Move into its own module |
Date: |
Tue, 5 Nov 2019 07:58:38 +0100 |
While the AFSplitter code is currently used only by the luks module,
upcoming support for luks2 will add a second module that depends on it.
To avoid any linker errors when adding the code to both modules because
of duplicated symbols, this commit moves it into its own standalone
module "afsplitter" as a preparatory step.
Signed-off-by: Patrick Steinhardt <address@hidden>
---
grub-core/Makefile.core.def | 6 +++++-
grub-core/disk/AFSplitter.c | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 037de4023..db346a9f4 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1181,10 +1181,14 @@ module = {
common = lib/json/json.c;
};
+module = {
+ name = afsplitter;
+ common = disk/AFSplitter.c;
+};
+
module = {
name = luks;
common = disk/luks.c;
- common = disk/AFSplitter.c;
};
module = {
diff --git a/grub-core/disk/AFSplitter.c b/grub-core/disk/AFSplitter.c
index f5a8ddc61..249163ff0 100644
--- a/grub-core/disk/AFSplitter.c
+++ b/grub-core/disk/AFSplitter.c
@@ -21,9 +21,12 @@
*/
#include <grub/crypto.h>
+#include <grub/dl.h>
#include <grub/mm.h>
#include <grub/misc.h>
+GRUB_MOD_LICENSE ("GPLv2+");
+
gcry_err_code_t AF_merge (const gcry_md_spec_t * hash, grub_uint8_t * src,
grub_uint8_t * dst, grub_size_t blocksize,
grub_size_t blocknumbers);
--
2.23.0
- Re: [PATCH 2/6] jsmn: Add convenience functions, (continued)
- Re: [PATCH 2/6] jsmn: Add convenience functions, Daniel Kiper, 2019/11/04
- Re: [PATCH 2/6] jsmn: Add convenience functions, Patrick Steinhardt, 2019/11/04
- Re: [PATCH 2/6] jsmn: Add convenience functions, Daniel Kiper, 2019/11/06
- Re: [PATCH 2/6] jsmn: Add convenience functions, Patrick Steinhardt, 2019/11/06
- Re: [PATCH 2/6] jsmn: Add convenience functions, Daniel Kiper, 2019/11/13
[PATCH 1/6] jsmn: Add JSON parser, Patrick Steinhardt, 2019/11/02
[PATCH 4/6] afsplitter: Move into its own module, Patrick Steinhardt, 2019/11/02
[PATCH 5/6] luks: Move configuration of ciphers into cryptodisk, Patrick Steinhardt, 2019/11/02
[PATCH 6/6] disk: Implement support for LUKS2, Patrick Steinhardt, 2019/11/02
[PATCH v2 0/6] Support for LUKS2 disk encryption, Patrick Steinhardt, 2019/11/05
- [PATCH v2 4/6] afsplitter: Move into its own module,
Patrick Steinhardt <=
- [PATCH v2 3/6] bootstrap: Add gnulib's base64 module, Patrick Steinhardt, 2019/11/05
- [PATCH v2 2/6] json: Implement wrapping interface, Patrick Steinhardt, 2019/11/05
- [PATCH v2 1/6] json: Import upstream jsmn-1.1.0, Patrick Steinhardt, 2019/11/05
- [PATCH v2 5/6] luks: Move configuration of ciphers into cryptodisk, Patrick Steinhardt, 2019/11/05
- [PATCH v2 6/6] disk: Implement support for LUKS2, Patrick Steinhardt, 2019/11/05
[PATCH v3 0/6] Support for LUKS2 disk encryption, Patrick Steinhardt, 2019/11/13