[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v14 06/20] libtasn1: compile into asn1 module
From: |
Gary Lin |
Subject: |
[PATCH v14 06/20] libtasn1: compile into asn1 module |
Date: |
Fri, 3 May 2024 14:48:42 +0800 |
From: Daniel Axtens <dja@axtens.net>
Create a wrapper file that specifies the module license.
Set up the makefile so it is built.
Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
---
grub-core/Makefile.core.def | 15 +++++++++++++++
grub-core/lib/libtasn1_wrap/wrap.c | 26 ++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 007ff628e..93274bbaf 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2599,3 +2599,18 @@ module = {
efi = commands/bli.c;
enable = efi;
};
+
+module = {
+ name = asn1;
+ common = lib/libtasn1/lib/decoding.c;
+ common = lib/libtasn1/lib/coding.c;
+ common = lib/libtasn1/lib/element.c;
+ common = lib/libtasn1/lib/structure.c;
+ common = lib/libtasn1/lib/parser_aux.c;
+ common = lib/libtasn1/lib/gstr.c;
+ common = lib/libtasn1/lib/errors.c;
+ common = lib/libtasn1_wrap/wrap.c;
+ cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+ // -Wno-type-limits comes from libtasn1's configure.ac
+ cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)
-I$(srcdir)/lib/libtasn1/lib -Wno-type-limits';
+};
diff --git a/grub-core/lib/libtasn1_wrap/wrap.c
b/grub-core/lib/libtasn1_wrap/wrap.c
new file mode 100644
index 000000000..622ba942e
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/wrap.c
@@ -0,0 +1,26 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2020 IBM Corporation
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+
+/*
+ * libtasn1 is provided under LGPL2.1+, which is compatible
+ * with GPL3+. As Grub as a whole is under GPL3+, this module
+ * is therefore under GPL3+ also.
+ */
+GRUB_MOD_LICENSE ("GPLv3+");
--
2.35.3
- [PATCH v14 00/20] Automatic Disk Unlock with TPM2, Gary Lin, 2024/05/03
- [PATCH v14 01/20] posix_wrap: tweaks in preparation for libtasn1, Gary Lin, 2024/05/03
- [PATCH v14 02/20] libtasn1: import libtasn1-4.19.0, Gary Lin, 2024/05/03
- [PATCH v14 05/20] libtasn1: fix the potential buffer overrun, Gary Lin, 2024/05/03
- [PATCH v14 03/20] libtasn1: disable code not needed in grub, Gary Lin, 2024/05/03
- [PATCH v14 07/20] asn1_test: test module for libtasn1, Gary Lin, 2024/05/03
- [PATCH v14 04/20] libtasn1: changes for grub compatibility, Gary Lin, 2024/05/03
- [PATCH v14 06/20] libtasn1: compile into asn1 module,
Gary Lin <=
- [PATCH v14 17/20] cryptodisk: wipe out the cached keys from protectors, Gary Lin, 2024/05/03
- [PATCH v14 08/20] libtasn1: Add the documentation, Gary Lin, 2024/05/03
- [PATCH v14 11/20] key_protector: Add TPM2 Key Protector, Gary Lin, 2024/05/03
- [PATCH v14 14/20] tpm2: Support authorized policy, Gary Lin, 2024/05/03
- [PATCH v14 13/20] util/grub-protect: Add new tool, Gary Lin, 2024/05/03
- [PATCH v14 16/20] cryptodisk: Fallback to passphrase, Gary Lin, 2024/05/03
- [PATCH v14 18/20] diskfilter: look up cryptodisk devices first, Gary Lin, 2024/05/03
- [PATCH v14 09/20] key_protector: Add key protectors framework, Gary Lin, 2024/05/03
- [PATCH v14 10/20] tpm2: Add TPM Software Stack (TSS), Gary Lin, 2024/05/03
- [PATCH v14 15/20] tpm2: Implement NV index, Gary Lin, 2024/05/03