]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
CHG: the reset of pcb_num should be before untraditional tags return.
authoriceman1001 <iceman@iuse.se>
Wed, 16 Nov 2016 16:43:08 +0000 (17:43 +0100)
committericeman1001 <iceman@iuse.se>
Wed, 16 Nov 2016 16:43:08 +0000 (17:43 +0100)
armsrc/iso14443a.c

index 4bd55fb3b75d77681120a6d4c4b3150731aa63c6..7c0913d83fe3072c1ff747cd218748b9d6487903 100644 (file)
@@ -1866,6 +1866,9 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u
                        memset(uid_ptr,0,10);
        }
 
+       // reset the PCB block number
+       iso14_pcb_blocknum = 0;
+       
        // check for proprietary anticollision:
        if ((resp[0] & 0x1F) == 0) return 3;
        
@@ -1977,12 +1980,8 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u
                p_hi14a_card->ats_len = len;
        }
 
-       // reset the PCB block number
-       iso14_pcb_blocknum = 0;
-
        // set default timeout based on ATS
        iso14a_set_ATS_timeout(resp);
-
        return 1;       
 }
 
@@ -2216,7 +2215,7 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
        
        BigBuf_free(); BigBuf_Clear_ext(false); 
        clear_trace();
-       set_tracing(TRUE);      
+       set_tracing(FALSE);     
        iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
        sync_time = GetCountSspClk() & 0xfffffff8;
Impressum, Datenschutz