On Fri, Apr 04, 2025 at 02:05:02AM +0300, Vladimir Serbinenko wrote:
> Update libgcrypt to 1.11 and related changes
Unfortunately it breaks some builds...
./configure --target=arm-linux-gnueabihf --with-platform=coreboot
make
gcc -DHAVE_CONFIG_H -I. -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64
-I./include -DGRUB_FILE=\"grub-core/lib/libgcrypt-grub/cipher/init.c\" -I. -I.
-I. -I. -I./include -I./include -I./grub-core/lib/libgcrypt-grub/src/
-I./grub-core/lib/libgcrypt_wrap -I./grub-core/lib/posix_wrap
-D_GCRYPT_IN_LIBGCRYPT=1 -D_GCRYPT_CONFIG_H_INCLUDED=1 -I./include/grub/gcrypt
-D_FILE_OFFSET_BITS=64 -std=gnu99 -fno-common -Wall -W -Wshadow
-Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations
-Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args
-Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration
-Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar
-Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch
-Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label
-Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings
-Wnested-externs -Wstrict-prototypes -Wcast-align -Wextra -Wattributes
-Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch
-Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast
-Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign
-Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2
-Werror -Wno-error=sign-compare -Wno-missing-field-initializers
-Wno-redundant-decls -Wno-undef -fno-builtin -MT
grub-core/lib/libgcrypt-grub/cipher/libgrubgcry_a-init.o -MD -MP -MF
grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-init.Tpo -c -o
grub-core/lib/libgcrypt-grub/cipher/libgrubgcry_a-init.o `test -f
'grub-core/lib/libgcrypt-grub/cipher/init.c' || echo
'./'`grub-core/lib/libgcrypt-grub/cipher/init.c
grub-core/lib/libgcrypt-grub/cipher/gost28147.c:44:21: fatal error:
gost-sb.h: No such file or directory
#include "gost-sb.h"
^
compilation terminated.
Makefile:6101: recipe for target
'grub-core/lib/libgcrypt-grub/cipher/libgrubgcry_a-gost28147.o' failed
make[2]: *** [grub-core/lib/libgcrypt-grub/cipher/libgrubgcry_a-gost28147.o]
Error 1
make[2]: *** Waiting for unfinished jobs....
mv -f
grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-arcfour.Tpo
grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-arcfour.Po
mv -f grub-core/video/fb/.deps-util/libgrubmods_a-video_fb.Tpo
grub-core/video/fb/.deps-util/libgrubmods_a-video_fb.Po
mv -f grub-core/video/fb/.deps-util/libgrubmods_a-fbblit.Tpo
grub-core/video/fb/.deps-util/libgrubmods_a-fbblit.Po
mv -f
grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-gostr3411-94.Tpo
grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-gostr3411-94.Po
mv -f grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-crc.Tpo
grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-crc.Po
mv -f grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-init.Tpo
grub-core/lib/libgcrypt-grub/cipher/.deps-util/libgrubgcry_a-init.Po
grub-core/lib/libgcrypt-grub/cipher/hash-common.c: In function
‘_gcry_md_block_write’:
grub-core/lib/libgcrypt-grub/cipher/hash-common.c:67:17: warning: comparison
between signed and unsigned integer expressions [-Wsign-compare]
if (hd->count > blocksize)
^
grub-core/lib/libgcrypt-grub/cipher/hash-common.c:76:21: warning: comparison
between signed and unsigned integer expressions [-Wsign-compare]
if (hd->count == blocksize) /* Flush the buffer. */
Is it possible to fix some warnings too? There are more of them...
And...
Importing libgcrypt...
WARNING: C file isn't a module: blake2.c
patching file grub-core/lib/libgcrypt-grub/cipher/md.c
Hunk #7 succeeded at 897 (offset -1 lines).
patching file grub-core/lib/libgcrypt-grub/cipher/keccak.c
patching file grub-core/lib/libgcrypt-grub/mpi/mpiutil.c
patching file grub-core/lib/libgcrypt-grub/src/sexp.c
patching file grub-core/lib/libgcrypt-grub/cipher/aria.c
patching file grub-core/lib/libgcrypt-grub/cipher/rsa-common.c
Hunk #4 succeeded at 1102 (offset 100 lines).
Please fix blake2.c warning and hunks offsets.
Daniel
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
