tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnulib: Handle warnings introduced by updated gnulib

Browse Source 
- Fix type of size variable in luks2_verify_key()
- Avoid redefinition of SIZE_MAX and ATTRIBUTE_ERROR
- Work around gnulib's int types on older compilers

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Robbie Harwood 2022-03-15 14:05:43 -04:00 committed by Daniel Kiper
parent 2b79024598
commit 49b52b4d87
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.h.in
View File

@ -149,4 +149,9 @@ typedef __UINT_FAST32_TYPE__ uint_fast32_t;
# define abort __builtin_trap # define abort __builtin_trap
# endif /* !_GL_INLINE_HEADER_BEGIN */ # endif /* !_GL_INLINE_HEADER_BEGIN */
/* gnulib doesn't build cleanly with older compilers. */
# if __GNUC__ < 11
_Pragma ("GCC diagnostic ignored \"-Wtype-limits\"")
# endif
#endif #endif

4
grub-core/disk/luks2.c
View File

@ -390,7 +390,7 @@ luks2_verify_key (grub_luks2_digest_t *d, grub_uint8_t *candidate_key,
{ {
grub_uint8_t candidate_digest[GRUB_CRYPTODISK_MAX_KEYLEN]; grub_uint8_t candidate_digest[GRUB_CRYPTODISK_MAX_KEYLEN];
grub_uint8_t digest[GRUB_CRYPTODISK_MAX_KEYLEN], salt[GRUB_CRYPTODISK_MAX_KEYLEN]; grub_uint8_t digest[GRUB_CRYPTODISK_MAX_KEYLEN], salt[GRUB_CRYPTODISK_MAX_KEYLEN];
grub_size_t saltlen = sizeof (salt), digestlen = sizeof (digest); idx_t saltlen = sizeof (salt), digestlen = sizeof (digest);
const gcry_md_spec_t *hash; const gcry_md_spec_t *hash;
gcry_err_code_t gcry_ret; gcry_err_code_t gcry_ret;
@ -429,7 +429,7 @@ luks2_decrypt_key (grub_uint8_t *out_key,
grub_uint8_t area_key[GRUB_CRYPTODISK_MAX_KEYLEN]; grub_uint8_t area_key[GRUB_CRYPTODISK_MAX_KEYLEN];
grub_uint8_t salt[GRUB_CRYPTODISK_MAX_KEYLEN]; grub_uint8_t salt[GRUB_CRYPTODISK_MAX_KEYLEN];
grub_uint8_t *split_key = NULL; grub_uint8_t *split_key = NULL;
grub_size_t saltlen = sizeof (salt); idx_t saltlen = sizeof (salt);
char cipher[32], *p; char cipher[32], *p;
const gcry_md_spec_t *hash; const gcry_md_spec_t *hash;
gcry_err_code_t gcry_ret; gcry_err_code_t gcry_ret;

6
grub-core/lib/posix_wrap/limits.h
View File

@ -25,7 +25,11 @@
#define USHRT_MAX GRUB_USHRT_MAX #define USHRT_MAX GRUB_USHRT_MAX
#define UINT_MAX GRUB_UINT_MAX #define UINT_MAX GRUB_UINT_MAX
#define ULONG_MAX GRUB_ULONG_MAX #define ULONG_MAX GRUB_ULONG_MAX
#define SIZE_MAX GRUB_SIZE_MAX
/* gnulib also defines this type */
#ifndef SIZE_MAX
# define SIZE_MAX GRUB_SIZE_MAX
#endif
#define SCHAR_MIN GRUB_SCHAR_MIN #define SCHAR_MIN GRUB_SCHAR_MIN
#define SCHAR_MAX GRUB_SCHAR_MAX #define SCHAR_MAX GRUB_SCHAR_MAX

4
include/grub/compiler.h
View File

@ -30,10 +30,10 @@
/* Does this compiler support compile-time error attributes? */ /* Does this compiler support compile-time error attributes? */
#if GNUC_PREREQ(4,3) #if GNUC_PREREQ(4,3)
# define ATTRIBUTE_ERROR(msg) \ # define GRUB_ATTRIBUTE_ERROR(msg) \
__attribute__ ((__error__ (msg))) __attribute__ ((__error__ (msg)))
#else #else
# define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn)) # define GRUB_ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
#endif #endif
#if GNUC_PREREQ(4,4) #if GNUC_PREREQ(4,4)

2
include/grub/list.h
View File

@ -40,7 +40,7 @@ void EXPORT_FUNC(grub_list_remove) (grub_list_t item);
static inline void * static inline void *
grub_bad_type_cast_real (int line, const char *file) grub_bad_type_cast_real (int line, const char *file)
ATTRIBUTE_ERROR ("bad type cast between incompatible grub types"); GRUB_ATTRIBUTE_ERROR ("bad type cast between incompatible grub types");
static inline void * static inline void *
grub_bad_type_cast_real (int line, const char *file) grub_bad_type_cast_real (int line, const char *file)