github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fixes, shadow

Browse source
This commit is contained in:
iceman1001 2019-04-07 10:17:43 +02:00
commit aea6c6d3c5
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
armsrc/Standalone/hf_bog.c
View file

@ -85,7 +85,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
uint8_t *data = dmaBuf; uint8_t *data = dmaBuf;
uint8_t previous_data = 0; uint8_t previous_data = 0;
int dataLen = 0; int dataLen;
bool TagIsActive = false; bool TagIsActive = false;
bool ReaderIsActive = false; bool ReaderIsActive = false;
@ -110,7 +110,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
// triggered == false -- to wait first for card // triggered == false -- to wait first for card
bool triggered = !(param & 0x03); bool triggered = !(param & 0x03);
uint32_t rsamples = 0; uint32_t my_rsamples = 0;
// Current captured passwords counter // Current captured passwords counter
uint8_t auth_attempts = 0; uint8_t auth_attempts = 0;
@ -151,11 +151,11 @@ void RAMFUNC SniffAndStore(uint8_t param) {
LED_A_OFF(); LED_A_OFF();
// Need two samples to feed Miller and Manchester-Decoder // Need two samples to feed Miller and Manchester-Decoder
if (rsamples & 0x01) { if (my_rsamples & 0x01) {
if (!TagIsActive) { // no need to try decoding reader data if the tag is sending if (!TagIsActive) { // no need to try decoding reader data if the tag is sending
uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4); uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
if (MillerDecoding(readerdata, (rsamples - 1) * 4)) { if (MillerDecoding(readerdata, (my_rsamples - 1) * 4)) {
LED_C_ON(); LED_C_ON();
// check - if there is a short 7bit request from reader // check - if there is a short 7bit request from reader
@ -190,7 +190,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
// no need to try decoding tag data if the reader is sending - and we cannot afford the time // no need to try decoding tag data if the reader is sending - and we cannot afford the time
if (!ReaderIsActive) { if (!ReaderIsActive) {
uint8_t tagdata = (previous_data << 4) | (*data & 0x0F); uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
if (ManchesterDecoding(tagdata, 0, (rsamples - 1) * 4)) { if (ManchesterDecoding(tagdata, 0, (my_rsamples - 1) * 4)) {
LED_B_ON(); LED_B_ON();
if (!LogTrace(receivedResp, if (!LogTrace(receivedResp,
@ -214,7 +214,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
} }
previous_data = *data; previous_data = *data;
rsamples++; my_rsamples++;
data++; data++;
if (data == dmaBuf + DMA_BUFFER_SIZE) { if (data == dmaBuf + DMA_BUFFER_SIZE) {
data = dmaBuf; data = dmaBuf;

4
armsrc/Standalone/hf_bog.h
View file

@ -6,10 +6,6 @@
// StandAlone Mod // StandAlone Mod
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef FALSE
#define FALSE 0
#endif
#ifndef __HF_BOG_H #ifndef __HF_BOG_H
#define __HF_BOG_H #define __HF_BOG_H