dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into experimental_varlen

Browse Source 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
This commit is contained in:
Philippe Teuwen
2019-04-26 10:54:12 +02:00
parent 1c136c8fc6 4ad9f57939
commit a14b3d8b87
4 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/cmdtrace.c
View File

@@ -28,9 +28,6 @@ static int usage_trace_list() {
PrintAndLogEx(NORMAL, " 14b - interpret data as iso14443b communications");
PrintAndLogEx(NORMAL, " 15 - interpret data as iso15693 communications");
PrintAndLogEx(NORMAL, " des - interpret data as DESFire communications");
#ifdef WITH_EMV
PrintAndLogEx(NORMAL, " emv - interpret data as EMV / communications");
#endif
PrintAndLogEx(NORMAL, " iclass - interpret data as iclass communications");
PrintAndLogEx(NORMAL, " topaz - interpret data as topaz communications");
PrintAndLogEx(NORMAL, " 7816 - interpret data as iso7816-4 communications");

2
client/comms.c
View File

@@ -239,7 +239,7 @@ static void memcpy_filtered(void *dest, const void *src, size_t n, bool filter)
#if defined(__linux__) || (__APPLE__)
memcpy(dest, src, n);
#else
if (filter)
if (filter) {
// Filter out ANSI sequences on these OS
uint16_t si=0;
for (uint16_t i=0; i < n; i++) {