# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1518222450 -28800
# Node ID b7cd40b0730ac944e69755ffac30211d213dcaec
# Parent  546d7dabdf99c439f20906f56ce21d5a67fe7e06# Parent  190b7af3bdacfb40d3951d71b3aa9bb379e66e02
merge

diff -r 546d7dabdf99 -r b7cd40b0730a .travis.yml
diff -r 546d7dabdf99 -r b7cd40b0730a libtomcrypt/Makefile.in
--- a/libtomcrypt/Makefile.in	Fri Feb 09 23:58:47 2018 +0800
+++ b/libtomcrypt/Makefile.in	Sat Feb 10 08:27:30 2018 +0800
@@ -40,7 +40,7 @@
 EXTRALIBS = ../libtommath/libtommath.a
 
 #Compilation flags
-LTC_CFLAGS  = -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/
+LTC_CFLAGS  = -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/ $(CFLAGS)
 LTC_LDFLAGS = $(LDFLAGS) $(EXTRALIBS)
 VERSION=1.18.1
 
diff -r 546d7dabdf99 -r b7cd40b0730a libtomcrypt/src/misc/zeromem.c
--- a/libtomcrypt/src/misc/zeromem.c	Fri Feb 09 23:58:47 2018 +0800
+++ b/libtomcrypt/src/misc/zeromem.c	Sat Feb 10 08:27:30 2018 +0800
@@ -21,7 +21,7 @@
 */
 void zeromem(volatile void *out, size_t outlen)
 {
-   m_burn(out, outlen);
+   m_burn((void*)out, outlen);
 }
 
 /* ref:         $Format:%D$ */