[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/18] libtasn1: compile into asn1 module
From: |
Daniel Axtens |
Subject: |
[PATCH 11/18] libtasn1: compile into asn1 module |
Date: |
Fri, 2 Oct 2020 15:13:14 +1000 |
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>
---
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 68ac0b746cc9..fc3f34495b58 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2542,3 +2542,18 @@ module = {
common = commands/i386/wrmsr.c;
enable = x86;
};
+
+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 000000000000..622ba942e33f
--- /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.25.1
- [PATCH 03/18] dl: provide a fake grub_dl_set_persistent for the emu target, (continued)
- [PATCH 03/18] dl: provide a fake grub_dl_set_persistent for the emu target, Daniel Axtens, 2020/10/02
- [PATCH 04/18] verifiers: factor unsafe module handling out of shim_lock, Daniel Axtens, 2020/10/02
- [PATCH 05/18] pgp: factor out rsa_pad, Daniel Axtens, 2020/10/02
- [PATCH 07/18] posix_wrap: tweaks in preparation for libtasn1, Daniel Axtens, 2020/10/02
- [PATCH 06/18] crypto: move storage for grub_crypto_pk_* to crypto.c, Daniel Axtens, 2020/10/02
- [PATCH 09/18] libtasn1: disable code not needed in grub, Daniel Axtens, 2020/10/02
- [PATCH 08/18] libtasn1: import libtasn1-4.16.0, Daniel Axtens, 2020/10/02
- [PATCH 10/18] libtasn1: changes for grub compatibility, Daniel Axtens, 2020/10/02
- [PATCH 11/18] libtasn1: compile into asn1 module,
Daniel Axtens <=
- [PATCH 13/18] grub-install: support embedding x509 certificates, Daniel Axtens, 2020/10/02
- [PATCH 12/18] test_asn1: test module for libtasn1, Daniel Axtens, 2020/10/02
- [PATCH 14/18] appended signatures: import GNUTLS's ASN.1 description files, Daniel Axtens, 2020/10/02
- [PATCH 15/18] appended signatures: parse PKCS#7 signedData and X.509 certificates, Daniel Axtens, 2020/10/02
- [PATCH 16/18] appended signatures: support verifying appended signatures, Daniel Axtens, 2020/10/02
- [PATCH 17/18] appended signatures: verification tests, Daniel Axtens, 2020/10/02
- [PATCH 18/18] appended signatures: documentation, Daniel Axtens, 2020/10/02