github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-23 06:25:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed: some minor bugs from the previous merge with master. It compiles clean now.

Browse source
This commit is contained in:
iceman1001 2015-01-06 12:26:15 +01:00
commit 1365b3a35f
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdhf14a.h
View file

@ -20,5 +20,5 @@ int CmdHF14AReader(const char *Cmd);
int CmdHF14ASim(const char *Cmd); int CmdHF14ASim(const char *Cmd);
int CmdHF14ASnoop(const char *Cmd); int CmdHF14ASnoop(const char *Cmd);
static char* getTagInfo(uint8_t uid);
#endif #endif

9
client/cmdmain.c
View file

@ -131,13 +131,12 @@ int getCommand(UsbCommand* response)
*/ */
bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) { bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
UsbCommand resp;
if (response == NULL) if (response == NULL)
response = &resp; response = &resp;
// Wait until the command is received
// Wait until the command is received for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
while(getCommand(response)) { while(getCommand(response)) {
if(response->cmd == cmd){ if(response->cmd == cmd){

2
client/nonce2key/crapto1.c
View file

@ -551,8 +551,6 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8],
return 0; return 0;
} }
}
s = statelist; s = statelist;
for(o = odd; *o != -1; ++o) for(o = odd; *o != -1; ++o)
for(e = even; *e != -1; ++e) for(e = even; *e != -1; ++e)