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

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Browse Source 
Conflicts:
	armsrc/Makefile
	armsrc/iso14443b.c
	armsrc/lfops.c
	client/cmdhf14b.c
	client/cmdhfmfu.c
	fpga/fpga_hf.bit
	fpga/hi_read_rx_xcorr.v
This commit is contained in:
iceman1001
2015-06-23 23:02:29 +02:00
parent 62f0edfb8e dd3d1b7012
commit f53020e729
10 changed files with 114 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/cmddata.c
View File

@@ -1561,7 +1561,7 @@ int PSKDemod(const char *Cmd, bool verbose)
}
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
size_t BitLen = getFromGraphBuf(BitStream);
if (BitLen==0) return -1;
if (BitLen==0) return 0;
uint8_t carrier=countFC(BitStream, BitLen, 0);
if (carrier!=2 && carrier!=4 && carrier!=8){
//invalid carrier