[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 07/19] posix_wrap: tweaks in preparation for libtasn1
From: |
Daniel Axtens |
Subject: |
[PATCH v3 07/19] posix_wrap: tweaks in preparation for libtasn1 |
Date: |
Thu, 21 Apr 2022 17:47:02 +1000 |
- 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>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
---
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 26918c8a01bc..4be7b4080633 100644
--- a/grub-core/lib/posix_wrap/limits.h
+++ b/grub-core/lib/posix_wrap/limits.h
@@ -41,5 +41,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 148e9d94bde0..e5093a9ee545 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 eeda543c47e2..2f3e865495ae 100644
--- a/grub-core/lib/posix_wrap/sys/types.h
+++ b/grub-core/lib/posix_wrap/sys/types.h
@@ -50,6 +50,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.32.0
- [PATCH v3 00/19] Appended signature secure boot support, Daniel Axtens, 2022/04/21
- [PATCH v3 01/19] Add suport for signing grub with an appended signature, Daniel Axtens, 2022/04/21
- [PATCH v3 03/19] docs/grub: Document signing grub with an appended signature, Daniel Axtens, 2022/04/21
- [PATCH v3 06/19] crypto: move storage for grub_crypto_pk_* to crypto.c, Daniel Axtens, 2022/04/21
- [PATCH v3 10/19] libtasn1: changes for grub compatibility, Daniel Axtens, 2022/04/21
- [PATCH v3 05/19] pgp: factor out rsa_pad, Daniel Axtens, 2022/04/21
- [PATCH v3 04/19] dl: provide a fake grub_dl_set_persistent for the emu target, Daniel Axtens, 2022/04/21
- [PATCH v3 07/19] posix_wrap: tweaks in preparation for libtasn1,
Daniel Axtens <=
- [PATCH v3 02/19] docs/grub: Document signing grub under UEFI, Daniel Axtens, 2022/04/21
- [PATCH v3 09/19] libtasn1: disable code not needed in grub, Daniel Axtens, 2022/04/21
- [PATCH v3 08/19] libtasn1: import libtasn1-4.18.0, Daniel Axtens, 2022/04/21
- [PATCH v3 13/19] grub-install: support embedding x509 certificates, Daniel Axtens, 2022/04/21
- [PATCH v3 12/19] test_asn1: test module for libtasn1, Daniel Axtens, 2022/04/21
- [PATCH v3 11/19] libtasn1: compile into asn1 module, Daniel Axtens, 2022/04/21
- [PATCH v3 14/19] appended signatures: import GNUTLS's ASN.1 description files, Daniel Axtens, 2022/04/21
- [PATCH v3 16/19] appended signatures: support verifying appended signatures, Daniel Axtens, 2022/04/21
- [PATCH v3 15/19] appended signatures: parse PKCS#7 signedData and X.509 certificates, Daniel Axtens, 2022/04/21