d6d145b71a
- Power guest secure boot with static keys: GRUB2 signing portion (jsc#SLE-18271) (bsc#1192764) * grub2.spec - Power guest secure boot with static keys: GRUB2 portion (jsc#SLE-18144) (bsc#1192686) * 0001-ieee1275-Drop-HEAP_MAX_ADDR-and-HEAP_MIN_SIZE-consta.patch * 0002-ieee1275-claim-more-memory.patch * 0003-ieee1275-request-memory-with-ibm-client-architecture.patch * 0004-Add-suport-for-signing-grub-with-an-appended-signatu.patch * 0005-docs-grub-Document-signing-grub-under-UEFI.patch * 0006-docs-grub-Document-signing-grub-with-an-appended-sig.patch * 0007-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch * 0008-pgp-factor-out-rsa_pad.patch * 0009-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch * 0010-posix_wrap-tweaks-in-preparation-for-libtasn1.patch * 0011-libtasn1-import-libtasn1-4.18.0.patch * 0012-libtasn1-disable-code-not-needed-in-grub.patch * 0013-libtasn1-changes-for-grub-compatibility.patch * 0014-libtasn1-compile-into-asn1-module.patch * 0015-test_asn1-test-module-for-libtasn1.patch * 0016-grub-install-support-embedding-x509-certificates.patch * 0017-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch * 0018-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch * 0019-appended-signatures-support-verifying-appended-signa.patch * 0020-appended-signatures-verification-tests.patch * 0021-appended-signatures-documentation.patch * 0022-ieee1275-enter-lockdown-based-on-ibm-secure-boot.patch * 0023-x509-allow-Digitial-Signature-plus-other-Key-Usages.patch - Fix no menuentry is found if hibernation on btrfs RAID1 (bsc#1193090) OBS-URL: https://build.opensuse.org/request/show/945751 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=401
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From fa3436ad10a63d5ad3d27cc330fb2594e699cc34 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Axtens <dja@axtens.net>
|
|
Date: Sat, 2 May 2020 00:27:57 +1000
|
|
Subject: [PATCH 10/23] posix_wrap: tweaks in preparation for libtasn1
|
|
|
|
- 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 7217138ff..591dbf328 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 7a8d385e9..4634db09f 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 854eb0122..f63412c8d 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.31.1
|
|
|