Mercurial > dropbear

changeset 1506:b7cd40b0730a coverity

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Matt Johnston <matt@ucc.asn.au>
date Sat, 10 Feb 2018 08:27:30 +0800
parents 546d7dabdf99 (current diff) 190b7af3bdac (diff)
children d54bbb645f02
files .travis.yml
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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$ */