Accept key number from command line

[proxmark3-svn] / armsrc / mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index b1a6b3fb5af156948b86b566ce17f2c3d1582cf3..d46d293178fb288b73b503d8d6f356b1c726b446 100644 (file)
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -226,7 +226,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             }
             
             cmd[0] = AUTHENTICATE;
             }
             
             cmd[0] = AUTHENTICATE;

-            cmd[1] = 0x00;  //keynumber
+            cmd[1] = keyno;  //keynumber

             len = DesfireAPDU(cmd, 2, resp);
             if ( !len ) {
                 if (MF_DBGLEVEL >= 1) {
             len = DesfireAPDU(cmd, 2, resp);
             if ( !len ) {
                 if (MF_DBGLEVEL >= 1) {


@@ -236,19 +236,22 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 return;
             }
             
                 return;
             }
             

+            if ( resp[2] == 0xaf ){
+            } else {
+                DbpString("Authetication failed. Invalid key number.");
+                OnError();
+                return;
+            }
+            

             memcpy( encRndB, resp+3, 8);
             
             des_dec(&decRndB, &encRndB, &keybytes);
             memcpy( encRndB, resp+3, 8);
             
             des_dec(&decRndB, &encRndB, &keybytes);

-            Dbprintf("RndB: %02x%02x%02x%02x%02x%02x%02x%02x",decRndB[0],decRndB[1],decRndB[2],decRndB[3],decRndB[4],decRndB[5],decRndB[6],decRndB[7]);

             rol(decRndB,8);
             rol(decRndB,8);

-            Dbprintf("RndB': %02x%02x%02x%02x%02x%02x%02x%02x",decRndB[0],decRndB[1],decRndB[2],decRndB[3],decRndB[4],decRndB[5],decRndB[6],decRndB[7]);

             
             uint8_t decRndA[8] = {0x00};
             uint8_t encRndA[8] = {0x00};
             
             des_dec(&encRndA, &decRndA, &keybytes);
             
             uint8_t decRndA[8] = {0x00};
             uint8_t encRndA[8] = {0x00};
             
             des_dec(&encRndA, &decRndA, &keybytes);

-            Dbprintf("RndA: %02x%02x%02x%02x%02x%02x%02x%02x",decRndA[0],decRndA[1],decRndA[2],decRndA[3],decRndA[4],decRndA[5],decRndA[6],decRndA[7]);
-            Dbprintf("ek0RandA: %02x%02x%02x%02x%02x%02x%02x%02x",encRndA[0],encRndA[1],encRndA[2],encRndA[3],encRndA[4],encRndA[5],encRndA[6],encRndA[7]);

             
             memcpy(both, encRndA, 8);
             
             
             memcpy(both, encRndA, 8);
             


@@ -260,9 +263,28 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             des_dec(&encRndB, &decRndB, &keybytes);
             
             memcpy(both + 8, encRndB, 8);
             des_dec(&encRndB, &decRndB, &keybytes);
             
             memcpy(both + 8, encRndB, 8);

-            Dbprintf("both: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",both[0],both[1],both[2],both[3],both[4],both[5],both[6],both[7],both[8],both[9],both[10],both[11],both[12],both[13],both[14],both[15]);

             
             

-            // TODO: Send response
+            cmd[0] = ADDITIONAL_FRAME;
+            memcpy(cmd+1, both, 16 );
+            
+            len = DesfireAPDU(cmd, 17, resp);
+            if ( !len ) {
+                if (MF_DBGLEVEL >= 1) {
+                    DbpString("Authentication failed. Card timeout.");
+                }
+                OnError();
+                return;
+            }
+            
+            if ( resp[2] == 0x00 ){
+                // TODO: Create session key.
+            } else {
+                DbpString("Authetication failed.");
+                OnError();
+                return;
+            }
+            
+                // TODO: Optionally, confirm ek0RndA' = RndA' to varify PICC

             
             }
                        break;
             
             }
                        break;