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

[Daniel Kiper]

Again, missing commit message and SOB.

Could you add to the GRUB Developers Manual description how to upgrade
the libgcrypt?

On Fri, May 24, 2024 at 08:30:04PM +0300, Vladimir Serbinenko wrote:
> ---
>  autogen.sh                                 |   5 +
>  conf/Makefile.common                       |   4 +-
>  grub-core/Makefile.core.def                |  36 ++-
>  grub-core/commands/hashsum.c               |   2 +-
>  grub-core/commands/legacycfg.c             |   6 +-
>  grub-core/commands/pgp.c                   | 114 +++------
>  grub-core/commands/xnu_uuid.c              |   2 +-
>  grub-core/disk/cryptodisk.c                |   2 +-
>  grub-core/io/gzio.c                        |   2 +-
>  grub-core/io/lzopio.c                      |   2 +-
>  grub-core/lib/adler32.c                    |  21 +-
>  grub-core/lib/crc64.c                      |  24 +-
>  grub-core/lib/crypto.c                     | 245 ++++++++++++++++++-
>  grub-core/lib/libgcrypt-patches/01_md.diff | 141 +++++++++++

s/01_md.diff/01-md.patch/ We use "patch" extension for the patches.
And should not this be a separate patch in the series?

>  grub-core/lib/libgcrypt/src/gcrypt-int.h   |  51 ----
>  grub-core/lib/libgcrypt_wrap/cipher_wrap.h |  12 +-
>  grub-core/lib/libgcrypt_wrap/mem.c         |  83 ++++++-
>  grub-core/lib/xzembed/xz_dec_stream.c      |  18 +-
>  include/grub/crypto.h                      | 261 +++++++++++++++++----
>  include/grub/gcrypt/gpg-error.h            |   9 +
>  util/grub-fstest.c                         |   2 +-
>  util/import_gcry.py                        | 160 ++++++++-----
>  util/import_gcrypt_inth.sed                |  17 ++
>  util/import_gcrypth.sed                    |   2 -
>  24 files changed, 941 insertions(+), 280 deletions(-)
>  create mode 100644 grub-core/lib/libgcrypt-patches/01_md.diff
>  create mode 100644 util/import_gcrypt_inth.sed

[...]

> diff --git a/util/import_gcry.py b/util/import_gcry.py
> index 2b3322d3a..02f727fca 100644
> --- a/util/import_gcry.py
> +++ b/util/import_gcry.py

[...]

> @@ -148,14 +188,10 @@ for cipher_file in cipher_files:
>          iscipher = False
>          iscryptostart = False
>          iscomma = False
> -        isglue = False
>          skip_statement = False
> +        skip_comma = False
>          if isc:
> -            modname = cipher_file [0:len(cipher_file) - 2]
> -            if re.match (".*-glue$", modname):
> -                modname = modname.replace ("-glue", "")
> -                isglue = True
> -            modname = "gcry_%s" % modname
> +            modname = "gcry_%s" % 
> cipher_file.removesuffix(".c").removesuffix("-glue").replace("-", "_")

The removesuffix is not support by older Python than 3.9.

Additionally, GCC 12.2.0 complains:

  gcc -DHAVE_CONFIG_H -I.  -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 
-I./include -DGRUB_FILE=\"grub-core/lib/libgcrypt-grub/src/const-time.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 -DHAVE_STRTOUL=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-error=shift-count-overflow 
-Wno-missing-field-initializers -Wno-redundant-decls -Wno-undef -fno-builtin  
-MT grub-core/lib/libgcrypt-grub/src/libgrubgcry_a-const-time.o -MD -MP -MF 
grub-core/lib/libgcrypt-grub/src/.deps-util/libgrubgcry_a-const-time.Tpo -c -o 
grub-core/lib/libgcrypt-grub/src/libgrubgcry_a-const-time.o `test -f 
'grub-core/lib/libgcrypt-grub/src/const-time.c' || echo 
'./'`grub-core/lib/libgcrypt-grub/src/const-time.c
  In file included from grub-core/lib/libgcrypt-grub/src/const-time.c:22:
  ./grub-core/lib/posix_wrap/stdlib.h:70: error: "HAVE_STRTOUL" redefined 
[-Werror]
     70 | #define HAVE_STRTOUL
        |
  <command-line>: note: this is the location of the previous definition

Daniel