Merge branch 'master' of https://github.com/iceman1001/ForPm3

Conflicts:
	armsrc/appmain.c
	armsrc/apps.h

diff --cc armsrc/appmain.c
Simple merge

diff --cc armsrc/mifarecmd.c
index ecd8728db9c4b9dcf3168b3207665cd1bf676597,470af6a7a9edc9084ac3e5219be651ba76c61e0a..22926dcfaf399f15c605000865939eafccfb7e70
--- 1/armsrc/mifarecmd.c
--- 2/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@@ -1061,3 -1127,58 +1127,58 @@@ void MifareCIdent()
                        //\r
  // DESFIRE\r
  //\r
 -}
+ \r
+ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){\r
+ \r
+       byte_t dataout[11] = {0x00};\r
+       uint8_t uid[10] = {0x00};\r
+       uint32_t cuid;\r
+     \r
+       iso14a_clear_trace();\r
+       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+ \r
+       int len = iso14443a_select_card(uid, NULL, &cuid);\r
+       if(!len) {\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
+                       Dbprintf("Can't select card");\r
+               OnError(1);\r
+               return;\r
+       };\r
+ \r
+       if(mifare_desfire_des_auth1(cuid, dataout)){\r
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)        \r
+                       Dbprintf("Authentication part1: Fail.");\r
+               OnError(4);\r
+               return;\r
+       }\r
+ \r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
+     \r
+     cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));\r
+ }\r
+ \r
+ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){\r
+ \r
+       uint32_t cuid = arg0;\r
+       uint8_t key[16] = {0x00};\r
+       byte_t isOK = 0;\r
+       byte_t dataout[12] = {0x00};\r
+     \r
+       memcpy(key, datain, 16);\r
+       \r
+       isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r
+       \r
+       if( isOK) {\r
+           if (MF_DBGLEVEL >= MF_DBG_EXTENDED) \r
+                       Dbprintf("Authentication part2: Failed");  \r
+               OnError(4);\r
+               return;\r
+       }\r
+ \r
+       if (MF_DBGLEVEL >= MF_DBG_EXTENDED) \r
+               DbpString("AUTH 2 FINISHED");\r
+ \r
+       cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+       LEDsoff();\r
++}