[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/18] posix_wrap: tweaks in preparation for libtasn1
From: |
Daniel Axtens |
Subject: |
[PATCH v2 07/18] posix_wrap: tweaks in preparation for libtasn1 |
Date: |
Wed, 28 Oct 2020 12:57:24 +1100 |
- Define SIZEOF_UNSIGNED_LONG_INT, it's the same as
SIZEOF_UNSIGNED_LONG.
- Define WORD_BIT, the size in bits of an int. This is a defined
in the Single Unix Specification and in gnulib's limits.h. gnulib
assumes it's 32 bits on all our platforms, including 64 bit
platforms, so we also use that value.
- Provide strto[u]l[l] preprocessor macros that resolve to
grub_strto[u]l[l]. To avoid gcrypt redefining strtoul, we
also define HAVE_STRTOUL here.
Signed-off-by: Daniel Axtens <dja@axtens.net>
---
grub-core/lib/posix_wrap/limits.h | 1 +
grub-core/lib/posix_wrap/stdlib.h | 8 ++++++++
grub-core/lib/posix_wrap/sys/types.h | 1 +
3 files changed, 10 insertions(+)
diff --git a/grub-core/lib/posix_wrap/limits.h
b/grub-core/lib/posix_wrap/limits.h
index 7217138ffd6b..591dbf3289d8 100644
--- a/grub-core/lib/posix_wrap/limits.h
+++ b/grub-core/lib/posix_wrap/limits.h
@@ -37,5 +37,6 @@
#define LONG_MAX GRUB_LONG_MAX
#define CHAR_BIT 8
+#define WORD_BIT 32
#endif
diff --git a/grub-core/lib/posix_wrap/stdlib.h
b/grub-core/lib/posix_wrap/stdlib.h
index 7a8d385e973a..4634db09f294 100644
--- a/grub-core/lib/posix_wrap/stdlib.h
+++ b/grub-core/lib/posix_wrap/stdlib.h
@@ -58,4 +58,12 @@ abs (int c)
return (c >= 0) ? c : -c;
}
+#define strtol grub_strtol
+
+/* for libgcrypt */
+#define HAVE_STRTOUL
+#define strtoul grub_strtoul
+
+#define strtoull grub_strtoull
+
#endif
diff --git a/grub-core/lib/posix_wrap/sys/types.h
b/grub-core/lib/posix_wrap/sys/types.h
index 854eb0122efa..f63412c8da06 100644
--- a/grub-core/lib/posix_wrap/sys/types.h
+++ b/grub-core/lib/posix_wrap/sys/types.h
@@ -51,6 +51,7 @@ typedef grub_uint8_t byte;
typedef grub_addr_t uintptr_t;
#define SIZEOF_UNSIGNED_LONG GRUB_CPU_SIZEOF_LONG
+#define SIZEOF_UNSIGNED_LONG_INT GRUB_CPU_SIZEOF_LONG
#define SIZEOF_UNSIGNED_INT 4
#define SIZEOF_UNSIGNED_LONG_LONG 8
#define SIZEOF_UNSIGNED_SHORT 2
--
2.25.1
- [PATCH v2 00/18] Verify appended signatures from grub, Daniel Axtens, 2020/10/27
- [PATCH v2 01/18] docs/grub: grub-install is no longer a shell script, Daniel Axtens, 2020/10/27
- [PATCH v2 02/18] docs/grub: --pubkey has been supported for some time, Daniel Axtens, 2020/10/27
- [PATCH v2 03/18] dl: provide a fake grub_dl_set_persistent for the emu target, Daniel Axtens, 2020/10/27
- [PATCH v2 04/18] verifiers: factor unsafe module handling out of shim_lock, Daniel Axtens, 2020/10/27
- [PATCH v2 05/18] pgp: factor out rsa_pad, Daniel Axtens, 2020/10/27
- [PATCH v2 06/18] crypto: move storage for grub_crypto_pk_* to crypto.c, Daniel Axtens, 2020/10/27
- [PATCH v2 07/18] posix_wrap: tweaks in preparation for libtasn1,
Daniel Axtens <=
- [PATCH v2 09/18] libtasn1: disable code not needed in grub, Daniel Axtens, 2020/10/27
- [PATCH v2 08/18] libtasn1: import libtasn1-4.16.0, Daniel Axtens, 2020/10/27
- [PATCH v2 10/18] libtasn1: changes for grub compatibility, Daniel Axtens, 2020/10/27
- [PATCH v2 11/18] libtasn1: compile into asn1 module, Daniel Axtens, 2020/10/27
- [PATCH v2 13/18] grub-install: support embedding x509 certificates, Daniel Axtens, 2020/10/27
- [PATCH v2 12/18] test_asn1: test module for libtasn1, Daniel Axtens, 2020/10/27
- [PATCH v2 14/18] appended signatures: import GNUTLS's ASN.1 description files, Daniel Axtens, 2020/10/27
- [PATCH v2 15/18] appended signatures: parse PKCS#7 signedData and X.509 certificates, Daniel Axtens, 2020/10/27
- [PATCH v2 16/18] appended signatures: support verifying appended signatures, Daniel Axtens, 2020/10/27
- [PATCH v2 17/18] appended signatures: verification tests, Daniel Axtens, 2020/10/27