Merge branch 'master' into 14a_rework3

[proxmark3-svn] / armsrc / iso14443a.c

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 33db9f223ef7b899b387c1ed1bd4583814217b88..5a27e06b6193b73737b17a9ae40f2ec1e224c9ec 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -1821,7 +1821,7 @@ int iso14443a_select_card(byte_t *uid_ptr, iso14a_card_select_t *p_hi14a_card, u
        }
 
        // PICC compilant with iso14443a-4 ---> (SAK & 0x20 != 0)
-       if( (sak & 0x20) == 0) return 2; 
+       if( (sak & 0x20) == 0) return 2; 
 
        if (!no_rats) {
                // Request for answer to select
@@ -1935,7 +1935,10 @@ void ReaderIso14443a(UsbCommand *c)
                        arg0 = iso14443a_select_card(NULL, card, NULL, true, 0, param & ISO14A_NO_RATS);
 
                        // if we cant select then we cant send data
-                       cantSELECT = (arg0 != 1);
+                       if (arg0 != 1 && arg0 != 2) {
+                               // 1 - all is OK with ATS, 2 - without ATS
+                               cantSELECT = true;
+                       }
                        
                        LED_B_ON();
                        cmd_send(CMD_ACK,arg0,card->uidlen,0,buf,sizeof(iso14a_card_select_t));