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>

1 files changed, 2 insertions, 2 deletions

diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h
index b97149e2..0c2fb8b0 100644
--- a/Cryptlib/Include/OpenSslSupport.h
+++ b/Cryptlib/Include/OpenSslSupport.h
@@ -262,11 +262,11 @@ extern FILE  *stdout;
 //

 // Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions

 //

-#define memcpy(dest,source,count)         ( {CopyMem(dest,source,(UINTN)(count)); dest; })

+#define memcpy(dest,source,count)         ( {CopyMem(dest,(void *)source,(UINTN)(count)); dest; })

 #define memset(dest,ch,count)             SetMem(dest,(UINTN)(count),(UINT8)(ch))

 #define memchr(buf,ch,count)              ScanMem8((CHAR8 *)buf,(UINTN)(count),ch)

 #define memcmp(buf1,buf2,count)           (int)(CompareMem(buf1,buf2,(UINTN)(count)))

-#define memmove(dest,source,count)        CopyMem(dest,source,(UINTN)(count))

+#define memmove(dest,source,count)        CopyMem(dest,(void *)source,(UINTN)(count))

 #define localtime(timer)                  NULL

 #define assert(expression)

 #define atoi(nptr)                        AsciiStrDecimalToUintn((const CHAR8 *)nptr)