projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #321 from Proxmark/iceman1001-patch-1
[proxmark3-svn]
/
armsrc
/
mifaresniff.c
diff --git
a/armsrc/mifaresniff.c
b/armsrc/mifaresniff.c
index 910ea74d519147afb76267ef32e3afb0a5c2b57f..7f94b0fe7c01ecdbce7a036a1fb94e00cfb1cbb2 100644
(file)
--- a/
armsrc/mifaresniff.c
+++ b/
armsrc/mifaresniff.c
@@
-10,14
+10,22
@@
\r
#include "mifaresniff.h"
\r
#include "apps.h"
\r
\r
#include "mifaresniff.h"
\r
#include "apps.h"
\r
+#include "proxmark3.h"
\r
+#include "util.h"
\r
+#include "string.h"
\r
+#include "iso14443crc.h"
\r
+#include "iso14443a.h"
\r
+#include "crapto1/crapto1.h"
\r
+#include "mifareutil.h"
\r
+#include "common.h"
\r
\r
\r
static int sniffState = SNF_INIT;
\r
static uint8_t sniffUIDType;
\r
\r
\r
static int sniffState = SNF_INIT;
\r
static uint8_t sniffUIDType;
\r
-static uint8_t sniffUID[8];
\r
-static uint8_t sniffATQA[2];
\r
+static uint8_t sniffUID[8]
= {0x00}
;
\r
+static uint8_t sniffATQA[2]
= {0x00}
;
\r
static uint8_t sniffSAK;
\r
static uint8_t sniffSAK;
\r
-static uint8_t sniffBuf[16];
\r
+static uint8_t sniffBuf[16]
= {0x00}
;
\r
static uint32_t timerData = 0;
\r
\r
\r
static uint32_t timerData = 0;
\r
\r
\r
@@
-140,7
+148,7
@@
bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
}
\r
\r
bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
\r
}
\r
\r
bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
\r
- if (
traceLen
&& (GetTickCount() > timerData + maxTimeoutMs)) {
\r
+ if (
BigBuf_get_traceLen()
&& (GetTickCount() > timerData + maxTimeoutMs)) {
\r
return intMfSniffSend();
\r
}
\r
return FALSE;
\r
return intMfSniffSend();
\r
}
\r
return FALSE;
\r
@@
-150,14
+158,15
@@
bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
bool intMfSniffSend() {
\r
\r
int pckSize = 0;
\r
bool intMfSniffSend() {
\r
\r
int pckSize = 0;
\r
- int pckLen =
traceLen
;
\r
+ int pckLen =
BigBuf_get_traceLen()
;
\r
int pckNum = 0;
\r
int pckNum = 0;
\r
-
\r
+ uint8_t *trace = BigBuf_get_addr();
\r
+
\r
FpgaDisableSscDma();
\r
while (pckLen > 0) {
\r
pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);
\r
LED_B_ON();
\r
FpgaDisableSscDma();
\r
while (pckLen > 0) {
\r
pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);
\r
LED_B_ON();
\r
- cmd_send(CMD_ACK, 1,
pckSize, pckNum, trace + traceLen
- pckLen, pckSize);
\r
+ cmd_send(CMD_ACK, 1,
BigBuf_get_traceLen(), pckSize, trace + BigBuf_get_traceLen()
- pckLen, pckSize);
\r
LED_B_OFF();
\r
\r
pckLen -= pckSize;
\r
LED_B_OFF();
\r
\r
pckLen -= pckSize;
\r
@@
-168,7
+177,7
@@
bool intMfSniffSend() {
cmd_send(CMD_ACK,2,0,0,0,0);
\r
LED_B_OFF();
\r
\r
cmd_send(CMD_ACK,2,0,0,0,0);
\r
LED_B_OFF();
\r
\r
-
iso14a_
clear_trace();
\r
+ clear_trace();
\r
\r
return TRUE;
\r
}
\r
\r
return TRUE;
\r
}
\r
Impressum
,
Datenschutz