merge

--HG--
branch : coverity

libtomcrypt/Makefile.in

@@ -40,7 +40,7 @@ RANLIB    = ranlib
 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

libtomcrypt/src/misc/zeromem.c

@@ -21,7 +21,7 @@
 */
 void zeromem(volatile void *out, size_t outlen)
 {
-   m_burn(out, outlen);
+   m_burn((void*)out, outlen);
 }
 /* ref:         $Format:%D$ */