summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2017-02-14 11:54:59 -0500
committerPeter Jones <pjones@redhat.com>2017-03-27 14:16:42 -0400
commitd00ea5558eff006f244651b1593b4db2c8e85151 (patch)
tree3c6bde79beff50e44f28cc4ceedf169018c58f59
parent29f3c91d4eba095de8c737dc3badc6ea91b84c0f (diff)
downloadefi-boot-shim-d00ea5558eff006f244651b1593b4db2c8e85151.tar.gz
efi-boot-shim-d00ea5558eff006f244651b1593b4db2c8e85151.zip
Fix some i386 type casting errors
Signed-off-by: Peter Jones <pjones@redhat.com>
-rw-r--r--httpboot.c4
-rw-r--r--shim.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/httpboot.c b/httpboot.c
index 4454691b..f8fbc735 100644
--- a/httpboot.c
+++ b/httpboot.c
@@ -506,7 +506,7 @@ no_event:
}
static EFI_STATUS
-receive_http_response(EFI_HTTP_PROTOCOL *http, VOID **buffer, UINTN *buf_size)
+receive_http_response(EFI_HTTP_PROTOCOL *http, VOID **buffer, UINT64 *buf_size)
{
EFI_HTTP_TOKEN rx_token;
EFI_HTTP_MESSAGE rx_message;
@@ -645,7 +645,7 @@ no_event:
static EFI_STATUS
http_fetch (EFI_HANDLE image, EFI_HANDLE device,
CHAR8 *hostname, CHAR8 *uri, BOOLEAN is_ip6,
- VOID **buffer, UINTN *buf_size)
+ VOID **buffer, UINT64 *buf_size)
{
EFI_GUID http_binding_guid = EFI_HTTP_SERVICE_BINDING_PROTOCOL_GUID;
EFI_GUID http_protocol_guid = EFI_HTTP_PROTOCOL_GUID;
diff --git a/shim.c b/shim.c
index dcdbbf6c..dfae265d 100644
--- a/shim.c
+++ b/shim.c
@@ -1815,8 +1815,8 @@ EFI_STATUS start_image(EFI_HANDLE image_handle, CHAR16 *ImagePath)
}
/* Measure the binary into the TPM */
- tpm_log_event((EFI_PHYSICAL_ADDRESS)data, datasize, 9,
- (CHAR8 *)"Second stage bootloader");
+ tpm_log_event((EFI_PHYSICAL_ADDRESS)(UINTN)data, datasize,
+ 9, (CHAR8 *)"Second stage bootloader");
/*
* We need to modify the loaded image protocol entry before running
@@ -1901,8 +1901,8 @@ EFI_STATUS measure_mok()
if (efi_status != EFI_SUCCESS)
return efi_status;
- efi_status = tpm_log_event((EFI_PHYSICAL_ADDRESS)Data, DataSize, 14,
- (CHAR8 *)"MokList");
+ efi_status = tpm_log_event((EFI_PHYSICAL_ADDRESS)(UINTN)Data,
+ DataSize, 14, (CHAR8 *)"MokList");
FreePool(Data);
@@ -1915,8 +1915,8 @@ EFI_STATUS measure_mok()
if (efi_status != EFI_SUCCESS)
return efi_status;
- efi_status = tpm_log_event((EFI_PHYSICAL_ADDRESS)Data, DataSize, 14,
- (CHAR8 *)"MokSBState");
+ efi_status = tpm_log_event((EFI_PHYSICAL_ADDRESS)(UINTN)Data,
+ DataSize, 14, (CHAR8 *)"MokSBState");
FreePool(Data);