Re: [PATCH v3 3/5] Adjust import script, definitions and API users for libgcrypt 1.10

[Gary Lin]

On Fri, May 24, 2024 at 08:30:04PM +0300, Vladimir Serbinenko wrote:
> diff --git a/conf/Makefile.common b/conf/Makefile.common
> index b8f216f6c..1fd3fc9da 100644
> --- a/conf/Makefile.common
> +++ b/conf/Makefile.common
> @@ -81,8 +81,8 @@ CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/lib/gnulib 
> -I$(top_srcdir)/grub-co
>  CFLAGS_POSIX = -fno-builtin
>  CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
>  
> -CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers 
> -Wno-redundant-decls -Wno-undef $(CFLAGS_POSIX)
> -CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap 
> $(CPPFLAGS_POSIX) -D_GCRYPT_IN_LIBGCRYPT=1 -I$(top_srcdir)/include/grub/gcrypt
> +CFLAGS_GCRY = -Wno-error=sign-compare -Wno-error=shift-count-overflow 
> -Wno-missing-field-initializers -Wno-redundant-decls -Wno-undef 
> $(CFLAGS_POSIX)
> +CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap 
> $(CPPFLAGS_POSIX) -D_GCRYPT_IN_LIBGCRYPT=1 -D_GCRYPT_CONFIG_H_INCLUDED=1 
> -DHAVE_STRTOUL=1 -I$(top_srcdir)/include/grub/gcrypt
>  
>  CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
>  
The 'shift-count-overflow' warnings is caused by u32 MD_NBLOCKS_TYPE.
I'd propose to add "#define USE_SHA512 1" to cipher_wrap.h to change
MD_NBLOCKS_TYPE to u64 to fix the warnings.

Gary Lin