dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chg: hf mf setmod - uses NG

Browse Source
This commit is contained in:
iceman1001
2019-05-15 06:52:22 -04:00
parent 41acc98d87
commit 65ff4f0e92
5 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
armsrc/appmain.c
View File

@@ -1066,7 +1066,7 @@ static void PacketReceived(PacketCommandNG *packet) {
// SniffMifare(packet->oldarg[0]);
// break;
case CMD_MIFARE_SETMOD:
MifareSetMod(packet->oldarg[0], packet->data.asBytes);
MifareSetMod(packet->data.asBytes);
break;
//mifare desfire
case CMD_MIFARE_DESFIRE_READBL:

2
armsrc/apps.h
View File

@@ -163,7 +163,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1);
void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain); // Work with "magic Chinese" card
void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain);
void MifareCIdent(); // is "magic chinese" card?
void MifareSetMod(uint8_t mod, uint8_t *key);
void MifareSetMod(uint8_t *datain);
void MifareUSetPwd(uint8_t arg0, uint8_t *datain);
void OnSuccessMagic();
void OnErrorMagic(uint8_t reason);

13
armsrc/mifarecmd.c
View File

@@ -1999,11 +1999,13 @@ void OnErrorMagic(uint8_t reason) {
OnSuccessMagic();
}
void MifareSetMod(uint8_t mod, uint8_t *key) {
uint64_t ui64Key = bytes_to_num(key, 6);
void MifareSetMod(uint8_t *datain) {
uint8_t mod = datain[0];
uint64_t ui64Key = bytes_to_num(datain + 1, 6);
// variables
uint8_t isOK = 0;
uint16_t isOK = PM3_EFATAL;
uint8_t uid[10] = {0};
uint32_t cuid = 0;
struct Crypto1State mpcs = {0, 0};
@@ -2042,14 +2044,15 @@ void MifareSetMod(uint8_t mod, uint8_t *key) {
break;
}
isOK = 1;
isOK = PM3_SUCCESS;
break;
}
crypto1_destroy(pcs);
LED_B_ON();
reply_old(CMD_ACK, isOK, 0, 0, 0, 0);
reply_ng(CMD_MIFARE_SETMOD, isOK, NULL, 0);
LED_B_OFF();
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);