34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
---
|
|
grub-core/kern/dl.c | 3 ++-
|
|
util/grub-module-verifierXX.c | 3 ++-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
|
|
index 48f8a7907..7d395096f 100644
|
|
--- a/grub-core/kern/dl.c
|
|
+++ b/grub-core/kern/dl.c
|
|
@@ -467,7 +467,8 @@ grub_dl_check_license (grub_dl_t mod, El
|
|
|
|
if (grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3") == 0
|
|
|| grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3+") == 0
|
|
- || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv2+") == 0)
|
|
+ || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv2+") == 0
|
|
+ || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=CC0") == 0)
|
|
return GRUB_ERR_NONE;
|
|
|
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
|
diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c
|
|
index ceb24309a..284f9026e 100644
|
|
--- a/util/grub-module-verifierXX.c
|
|
+++ b/util/grub-module-verifierXX.c
|
|
@@ -157,7 +157,8 @@ check_license (const char * const filena
|
|
Elf_Shdr *s = find_section (arch, e, ".module_license");
|
|
if (s && (strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv3") == 0
|
|
|| strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv3+") == 0
|
|
- || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv2+") == 0))
|
|
+ || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv2+") == 0
|
|
+ || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=CC0") == 0))
|
|
return;
|
|
grub_util_error ("%s: incompatible license", filename);
|
|
}
|