arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-07 07:12:34 +00:00
Code Issues Releases Wiki Activity

Allow to compile without Valgrind

Browse Source
This commit is contained in:
Dusan Klinec 2018-07-11 21:26:07 +02:00 committed by Pavol Rusnak
parent ff001a0f12
commit 957b8129bd
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -23,7 +23,10 @@ CFLAGS += $(OPTFLAGS) \
-Wformat-security \ -Wformat-security \
-Werror -Werror
VALGRIND ?= 1
CFLAGS += -I. CFLAGS += -I.
CFLAGS += -DVALGRIND=$(VALGRIND)
CFLAGS += -DUSE_ETHEREUM=1 CFLAGS += -DUSE_ETHEREUM=1
CFLAGS += -DUSE_GRAPHENE=1 CFLAGS += -DUSE_GRAPHENE=1
CFLAGS += -DUSE_NEM=1 CFLAGS += -DUSE_NEM=1

7
tests/test_check.c
View File

@ -31,8 +31,10 @@
#include <check.h> #include <check.h>
#include "check_mem.h" #include "check_mem.h"
#if VALGRIND
#include <valgrind/valgrind.h> #include <valgrind/valgrind.h>
#include <valgrind/memcheck.h> #include <valgrind/memcheck.h>
#endif
#include "options.h" #include "options.h"
@ -62,6 +64,7 @@
#include "rc4.h" #include "rc4.h"
#include "nem.h" #include "nem.h"
#if VALGRIND
/* /*
* This is a clever trick to make Valgrind's Memcheck verify code * This is a clever trick to make Valgrind's Memcheck verify code
* is constant-time with respect to secret data. * is constant-time with respect to secret data.
@ -71,6 +74,10 @@
#define MARK_SECRET_DATA(addr, len) VALGRIND_MAKE_MEM_UNDEFINED(addr, len) #define MARK_SECRET_DATA(addr, len) VALGRIND_MAKE_MEM_UNDEFINED(addr, len)
/* Call before secret data is freed or to mark non-secret data (public keys or signatures) */ /* Call before secret data is freed or to mark non-secret data (public keys or signatures) */
#define UNMARK_SECRET_DATA(addr, len) VALGRIND_MAKE_MEM_DEFINED (addr, len) #define UNMARK_SECRET_DATA(addr, len) VALGRIND_MAKE_MEM_DEFINED (addr, len)
#else
#define MARK_SECRET_DATA(addr, len)
#define UNMARK_SECRET_DATA(addr, len)
#endif
#define FROMHEX_MAXLEN 512 #define FROMHEX_MAXLEN 512