Merge pull request #21 from alexgrin/iceman_master

[proxmark3-svn] / client / cmdhfmfdesfire.c

diff --git a/client/cmdhfmfdesfire.c b/client/cmdhfmfdesfire.c
index f2c53dbf2eb6b8ae7b45de8d4da263d9cf8b31bc..89784da26bd8448cee97ab3444c50fb176b539c2 100644 (file)
--- a/client/cmdhfmfdesfire.c
+++ b/client/cmdhfmfdesfire.c
@@ -33,8 +33,8 @@ int CmdHF14AMfDESAuth(const char *Cmd){
         
     uint8_t blockNo = 0;
     //keyNo=0;
         
     uint8_t blockNo = 0;
     //keyNo=0;

-    uint32_t cuid=0;
-    uint8_t reply[16];
+    uint32_t cuid = 0;
+    uint8_t reply[16] = {0x00};

     //DES_cblock r1_b1;
     uint8_t b1[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     uint8_t b2[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     //DES_cblock r1_b1;
     uint8_t b1[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
     uint8_t b2[8]={ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};


@@ -126,8 +126,8 @@ int CmdHF14AMfAESAuth(const char *Cmd){
         
     uint8_t blockNo = 0;
     //keyNo=0;
         
     uint8_t blockNo = 0;
     //keyNo=0;

-    uint32_t cuid=0;
-    uint8_t reply[32];
+    uint32_t cuid = 0;
+    uint8_t reply[32] = {0x00};

     //DES_cblock r1_b1;
     //unsigned char * b1, b2, nr, b0, r0, r1;
     
     //DES_cblock r1_b1;
     //unsigned char * b1, b2, nr, b0, r0, r1;
     


@@ -239,7 +239,7 @@ static command_t CommandTable[] =
 
 int CmdHFMFDesfire(const char *Cmd){
     // flush
 
 int CmdHFMFDesfire(const char *Cmd){
     // flush

-    WaitForResponseTimeout(CMD_ACK,NULL,100);
+       clearCommandBuffer();

     CmdsParse(CommandTable, Cmd);
     return 0;
 }
     CmdsParse(CommandTable, Cmd);
     return 0;
 }