github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CHG: dropfield

Browse source
This commit is contained in:
iceman1001 2017-11-10 20:49:56 +01:00
commit 9b4e52b89e
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/cmdhfmfu.c
View file

@ -193,12 +193,6 @@ static void ul_switch_on_field(void) {
SendCommand(&c); SendCommand(&c);
} }
void ul_switch_off_field(void) {
UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}};
clearCommandBuffer();
SendCommand(&c);
}
static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength ) { static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uint16_t responseLength ) {
UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}}; UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT | ISO14A_APPEND_CRC | ISO14A_NO_RATS, cmdlen, 0}};
memcpy(c.d.asBytes, cmd, cmdlen); memcpy(c.d.asBytes, cmd, cmdlen);
@ -630,10 +624,10 @@ static int ulc_magic_test(){
} }
*/ */
static int ul_magic_test(){ static int ul_magic_test(){
// Magic Ultralight tests // Magic Ultralight tests
// 1) take present UID, and try to write it back. OBSOLETE // 1) take present UID, and try to write it back. OBSOLETE
// 2) make a wrong length write to page0, and see if tag answers with ACK/NACK: // 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
iso14a_card_select_t card; iso14a_card_select_t card;
if ( !ul_select(&card) ) if ( !ul_select(&card) )
return UL_ERROR; return UL_ERROR;
@ -700,6 +694,7 @@ uint32_t GetHF14AMfU_Type(void){
case -1 : tagtype = (UL | UL_C | NTAG_203); break; // could be UL | UL_C magic tags case -1 : tagtype = (UL | UL_C | NTAG_203); break; // could be UL | UL_C magic tags
default : tagtype = UNKNOWN; break; default : tagtype = UNKNOWN; break;
} }
// UL vs UL-C vs ntag203 test // UL vs UL-C vs ntag203 test
if (tagtype & (UL | UL_C | NTAG_203)) { if (tagtype & (UL | UL_C | NTAG_203)) {
if ( !ul_select(&card) ) return UL_ERROR; if ( !ul_select(&card) ) return UL_ERROR;
@ -2358,7 +2353,8 @@ int CmdHF14AMfuPwdGen(const char *Cmd){
PrintAndLog(" Ami | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid)); PrintAndLog(" Ami | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid));
PrintAndLog(" LD | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid)); PrintAndLog(" LD | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid));
PrintAndLog("------+----------+-----"); PrintAndLog("------+----------+-----");
PrintAndLog(" Vingcard algo");
PrintAndLog("--------------------");
return 0; return 0;
} }
//------------------------------------ //------------------------------------

3
client/cmdhfmfu.h
View file

@ -10,6 +10,9 @@
#include "util.h" #include "util.h"
#include "protocols.h" #include "protocols.h"
#include "data.h" #include "data.h"
#define ul_switch_off_field DropField
typedef struct { typedef struct {
uint8_t version[8]; uint8_t version[8];
uint8_t tbo[2]; uint8_t tbo[2];