Re: [PATCH v6 0/6] Support for LUKS2 disk encryption

[Daniel Kiper]

On Tue, Dec 10, 2019 at 10:26:15AM +0100, Patrick Steinhardt wrote:
> Hi,
>
> this is the 6th version of this patchset aiming to implement
> support for LUKS2 disk encryption. All changes relate to the JSON
> interface, only:

Sadly your patchset brakes at least i386-pc and arm-coreboot builds.
Compiler spits:

  disk/luks2.c: In function ‘luks2_parse_digest’:
  disk/luks2.c:235:25: error: passing argument 1 of ‘grub_json_getuint64’ from 
incompatible pointer type [-Werror=incompatible-pointer-types]
      grub_json_getuint64 (&bit, &o, NULL))
                           ^
  In file included from ../include/grub/disk.h:24:0,
                   from ../include/grub/cryptodisk.h:22,
                   from disk/luks2.c:19:
  ./lib/json/json.h:108:31: note: expected ‘grub_uint64_t * {aka long long 
unsigned int *}’ but argument is of type ‘grub_size_t * {aka unsigned int *}’
   extern grub_err_t EXPORT_FUNC(grub_json_getuint64) (grub_uint64_t *out,
                                 ^
  ../include/grub/symbol.h:68:25: note: in definition of macro ‘EXPORT_FUNC’
   # define EXPORT_FUNC(x) x
                           ^
  disk/luks2.c:247:25: error: passing argument 1 of ‘grub_json_getuint64’ from 
incompatible pointer type [-Werror=incompatible-pointer-types]
      grub_json_getuint64 (&bit, &o, NULL))
                           ^
  In file included from ../include/grub/disk.h:24:0,
                   from ../include/grub/cryptodisk.h:22,
                   from disk/luks2.c:19:
  ./lib/json/json.h:108:31: note: expected ‘grub_uint64_t * {aka long long 
unsigned int *}’ but argument is of type ‘grub_size_t * {aka unsigned int *}’
   extern grub_err_t EXPORT_FUNC(grub_json_getuint64) (grub_uint64_t *out,
                                 ^
  ../include/grub/symbol.h:68:25: note: in definition of macro ‘EXPORT_FUNC’
   # define EXPORT_FUNC(x) x
                           ^
  disk/luks2.c: In function ‘luks2_get_keyslot’:
  disk/luks2.c:265:28: error: passing argument 1 of ‘grub_json_getuint64’ from 
incompatible pointer type [-Werror=incompatible-pointer-types]
         grub_json_getuint64 (&idx, &keyslot, NULL) ||
                              ^
  In file included from ../include/grub/disk.h:24:0,
                   from ../include/grub/cryptodisk.h:22,
                   from disk/luks2.c:19:
  ./lib/json/json.h:108:31: note: expected ‘grub_uint64_t * {aka long long 
unsigned int *}’ but argument is of type ‘grub_size_t * {aka unsigned int *}’
   extern grub_err_t EXPORT_FUNC(grub_json_getuint64) (grub_uint64_t *out,
                                 ^
  ../include/grub/symbol.h:68:25: note: in definition of macro ‘EXPORT_FUNC’
   # define EXPORT_FUNC(x) x
                           ^
  disk/luks2.c:294:25: error: passing argument 1 of ‘grub_json_getuint64’ from 
incompatible pointer type [-Werror=incompatible-pointer-types]
      grub_json_getuint64 (&idx, &segment, NULL) ||
                           ^
  In file included from ../include/grub/disk.h:24:0,
                   from ../include/grub/cryptodisk.h:22,
                   from disk/luks2.c:19:
  ./lib/json/json.h:108:31: note: expected ‘grub_uint64_t * {aka long long 
unsigned int *}’ but argument is of type ‘grub_size_t * {aka unsigned int *}’
   extern grub_err_t EXPORT_FUNC(grub_json_getuint64) (grub_uint64_t *out,
                                 ^
  ../include/grub/symbol.h:68:25: note: in definition of macro ‘EXPORT_FUNC’
   # define EXPORT_FUNC(x) x
                           ^
  cc1: all warnings being treated as errors

Please fix all of that and repost the patchset.

Daniel