diff options
| author | Peter Jones <pjones@redhat.com> | 2021-08-04 13:24:11 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-09-07 17:05:04 -0400 |
| commit | e13ac7386ea425c9222e05a2f9879d5af5cb91f6 (patch) | |
| tree | b4a9ee9785709a1ac74f1d8c3f431b481e8e960f /lib/variables.c | |
| parent | 0837d010a6ee140ff3cc770aadc89fbb015a7ca2 (diff) | |
| download | efi-boot-shim-e13ac7386ea425c9222e05a2f9879d5af5cb91f6.tar.gz efi-boot-shim-e13ac7386ea425c9222e05a2f9879d5af5cb91f6.zip | |
Make CopyMem() work with EFI's declaration
EFI_BOOT_SERVICES includes CopyMem() and SetMem() functions which are
marked EFIAPI, and in the case of CopyMem() does not mark the source
argument as CONST.
This patch makes all our invocations work with that, so (once gnu-efi's
implementation is fixed to match) we can use the existing implementation
as the implementation in a mock EFI_BOOT_SERVICES.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'lib/variables.c')
| -rw-r--r-- | lib/variables.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/variables.c b/lib/variables.c index ff61d0e2..3ec05478 100644 --- a/lib/variables.c +++ b/lib/variables.c @@ -49,7 +49,7 @@ fill_esl(const EFI_SIGNATURE_DATA *first_sig, const size_t howmany, sl->SignatureListSize = needed; sd = (EFI_SIGNATURE_DATA *)(out + sizeof(EFI_SIGNATURE_LIST)); - CopyMem(sd, first_sig, data_len); + CopyMem(sd, (void *)first_sig, data_len); return EFI_SUCCESS; } @@ -69,8 +69,8 @@ fill_esl_with_one_signature(const uint8_t *data, const uint32_t data_len, if (out) { sd = AllocateZeroPool(sig_size); if (owner) - CopyMem(sd, owner, sizeof(EFI_GUID)); - CopyMem(sd->SignatureData, data, data_len); + CopyMem(sd, (void *)owner, sizeof(EFI_GUID)); + CopyMem(sd->SignatureData, (void *)data, data_len); } efi_status = fill_esl(sd, 1, type, sig_size, out, outlen); |