MF ultralight code cleanup

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 0469364c3f6cefe099db0297e771bea5b693add4..77169a3632f42d9e773d19a0faf2a20bd0ed92a7 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -322,15 +322,14 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
        len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);\r
        if (len != 4) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);\r
-               OnError(1);\r
-               return 1;\r
+               return 0;\r
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r
                Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);\r
 \r
        memcpy(pack, resp, 4);\r
-       return 0;\r
+       return 1;\r
 }\r
 \r
 int mifare_ultra_auth(uint8_t *keybytes){\r
@@ -353,8 +352,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
        len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, resp, respPar ,NULL);\r
        if (len != 11) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
-               OnError(1);\r
-               return 1;\r
+               return 0;\r
        }\r
 \r
        // tag nonce.\r
@@ -386,8 +384,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
        len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);\r
        if (len != 11) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r
-               OnError(1);\r
-               return 1;\r
+               return 0;\r
        }\r
 \r
        uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };\r
@@ -398,7 +395,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
        tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r
        if ( memcmp(resp_random_a, random_a, 8) != 0 ) {\r
                if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");\r
-               return 1;\r
+               return 0;\r
        }\r
 \r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r
@@ -418,7 +415,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
                                resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],\r
                                resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);\r
        }\r
-       return 0;\r
+       return 1;\r
 }\r
 \r
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)\r