mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-14 18:48:13 -07:00
rename few CMD_* to get some less diversity
This commit is contained in:
Philippe Teuwen
parent
cbf5c717f7
commit
a0a232a985
71 changed files with 687 additions and 687 deletions
238
armsrc/appmain.c
238
armsrc/appmain.c
|
|
@ -756,25 +756,25 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
reply_via_usb = false;
|
||||
break;
|
||||
#ifdef WITH_LF
|
||||
case CMD_SET_LF_T55XX_CONFIG: {
|
||||
case CMD_LF_T55XX_SET_CONFIG: {
|
||||
setT55xxConfig(packet->oldarg[0], (t55xx_configurations_t *) packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_SET_LF_SAMPLING_CONFIG: {
|
||||
case CMD_LF_SAMPLING_SET_CONFIG: {
|
||||
setSamplingConfig((sample_config *) packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K: {
|
||||
case CMD_LF_ACQ_RAW_ADC: {
|
||||
struct p {
|
||||
uint8_t silent;
|
||||
uint32_t samples;
|
||||
} PACKED;
|
||||
struct p *payload = (struct p *)packet->data.asBytes;
|
||||
uint32_t bits = SampleLF(payload->silent, payload->samples);
|
||||
reply_ng(CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, PM3_SUCCESS, (uint8_t *)&bits, sizeof(bits));
|
||||
reply_ng(CMD_LF_ACQ_RAW_ADC, PM3_SUCCESS, (uint8_t *)&bits, sizeof(bits));
|
||||
break;
|
||||
}
|
||||
case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K: {
|
||||
case CMD_LF_MOD_THEN_ACQ_RAW_ADC: {
|
||||
struct p {
|
||||
uint32_t delay;
|
||||
uint16_t ones;
|
||||
|
|
@ -784,67 +784,67 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
ModThenAcquireRawAdcSamples125k(payload->delay, payload->zeros, payload->ones, packet->data.asBytes + 8);
|
||||
break;
|
||||
}
|
||||
case CMD_LF_SNIFF_RAW_ADC_SAMPLES: {
|
||||
case CMD_LF_SNIFF_RAW_ADC: {
|
||||
uint32_t bits = SniffLF();
|
||||
reply_mix(CMD_ACK, bits, 0, 0, 0, 0);
|
||||
break;
|
||||
}
|
||||
case CMD_HID_DEMOD_FSK: {
|
||||
case CMD_LF_HID_DEMOD: {
|
||||
uint32_t high, low;
|
||||
CmdHIDdemodFSK(packet->oldarg[0], &high, &low, 1);
|
||||
break;
|
||||
}
|
||||
case CMD_HID_SIM_TAG: {
|
||||
case CMD_LF_HID_SIMULATE: {
|
||||
CmdHIDsimTAG(packet->oldarg[0], packet->oldarg[1], 1);
|
||||
break;
|
||||
}
|
||||
case CMD_FSK_SIM_TAG: {
|
||||
case CMD_LF_FSK_SIMULATE: {
|
||||
lf_fsksim_t *payload = (lf_fsksim_t *)packet->data.asBytes;
|
||||
CmdFSKsimTAG(payload->fchigh, payload->fclow, payload->separator, payload->clock, packet->length - sizeof(lf_fsksim_t), payload->data, true);
|
||||
break;
|
||||
}
|
||||
case CMD_ASK_SIM_TAG: {
|
||||
case CMD_LF_ASK_SIMULATE: {
|
||||
lf_asksim_t *payload = (lf_asksim_t *)packet->data.asBytes;
|
||||
CmdASKsimTAG(payload->encoding, payload->invert, payload->separator, payload->clock, packet->length - sizeof(lf_asksim_t), payload->data, true);
|
||||
break;
|
||||
}
|
||||
case CMD_PSK_SIM_TAG: {
|
||||
case CMD_LF_PSK_SIMULATE: {
|
||||
lf_psksim_t *payload = (lf_psksim_t *)packet->data.asBytes;
|
||||
CmdPSKsimTag(payload->carrier, payload->invert, payload->clock, packet->length - sizeof(lf_psksim_t), payload->data, true);
|
||||
break;
|
||||
}
|
||||
case CMD_HID_CLONE_TAG: {
|
||||
case CMD_LF_HID_CLONE: {
|
||||
CopyHIDtoT55x7(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_IO_DEMOD_FSK: {
|
||||
case CMD_LF_IO_DEMOD: {
|
||||
uint32_t high, low;
|
||||
CmdIOdemodFSK(packet->oldarg[0], &high, &low, 1);
|
||||
break;
|
||||
}
|
||||
case CMD_IO_CLONE_TAG: {
|
||||
case CMD_LF_IO_CLONE: {
|
||||
CopyIOtoT55x7(packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
case CMD_EM410X_DEMOD: {
|
||||
case CMD_LF_EM410X_DEMOD: {
|
||||
uint32_t high;
|
||||
uint64_t low;
|
||||
CmdEM410xdemod(packet->oldarg[0], &high, &low, 1);
|
||||
break;
|
||||
}
|
||||
case CMD_EM410X_WRITE_TAG: {
|
||||
case CMD_LF_EM410X_WRITE: {
|
||||
WriteEM410x(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
|
||||
break;
|
||||
}
|
||||
case CMD_READ_TI_TYPE: {
|
||||
case CMD_LF_TI_READ: {
|
||||
ReadTItag();
|
||||
break;
|
||||
}
|
||||
case CMD_WRITE_TI_TYPE: {
|
||||
case CMD_LF_TI_WRITE: {
|
||||
WriteTItag(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
|
||||
break;
|
||||
}
|
||||
case CMD_SIMULATE_TAG_125K: {
|
||||
case CMD_LF_SIMULATE: {
|
||||
LED_A_ON();
|
||||
struct p {
|
||||
uint16_t len;
|
||||
|
|
@ -853,7 +853,7 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
struct p *payload = (struct p *)packet->data.asBytes;
|
||||
// length, start gap, led control
|
||||
SimulateTagLowFrequency(payload->len, payload->gap, 1);
|
||||
reply_ng(CMD_SIMULATE_TAG_125K, PM3_EOPABORTED, NULL, 0);
|
||||
reply_ng(CMD_LF_SIMULATE, PM3_EOPABORTED, NULL, 0);
|
||||
LED_A_OFF();
|
||||
break;
|
||||
}
|
||||
|
|
@ -861,18 +861,18 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
SimulateTagLowFrequencyBidir(packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
case CMD_INDALA_CLONE_TAG: {
|
||||
case CMD_LF_INDALA_CLONE: {
|
||||
CopyIndala64toT55x7(packet->data.asDwords[0], packet->data.asDwords[1]);
|
||||
break;
|
||||
}
|
||||
case CMD_INDALA_CLONE_TAG_L: {
|
||||
case CMD_LF_INDALA224_CLONE: {
|
||||
CopyIndala224toT55x7(
|
||||
packet->data.asDwords[0], packet->data.asDwords[1], packet->data.asDwords[2], packet->data.asDwords[3],
|
||||
packet->data.asDwords[4], packet->data.asDwords[5], packet->data.asDwords[6]
|
||||
);
|
||||
break;
|
||||
}
|
||||
case CMD_T55XX_READ_BLOCK: {
|
||||
case CMD_LF_T55XX_READBL: {
|
||||
struct p {
|
||||
uint32_t password;
|
||||
uint8_t blockno;
|
||||
|
|
@ -884,28 +884,28 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
T55xxReadBlock(payload->page, payload->pwdmode, false, payload->blockno, payload->password, payload->downlink_mode);
|
||||
break;
|
||||
}
|
||||
case CMD_T55XX_WRITE_BLOCK: {
|
||||
case CMD_LF_T55XX_WRITEBL: {
|
||||
// uses NG format
|
||||
T55xxWriteBlock(packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_T55XX_WAKEUP: {
|
||||
case CMD_LF_T55XX_WAKEUP: {
|
||||
T55xxWakeUp(packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
case CMD_T55XX_RESET_READ: {
|
||||
case CMD_LF_T55XX_RESET_READ: {
|
||||
T55xxResetRead(packet->data.asBytes[0] & 0xff);
|
||||
break;
|
||||
}
|
||||
case CMD_T55XX_CHKPWDS: {
|
||||
case CMD_LF_T55XX_CHK_PWDS: {
|
||||
T55xx_ChkPwds(packet->data.asBytes[0] & 0xff);
|
||||
break;
|
||||
}
|
||||
case CMD_PCF7931_READ: {
|
||||
case CMD_LF_PCF7931_READ: {
|
||||
ReadPCF7931();
|
||||
break;
|
||||
}
|
||||
case CMD_PCF7931_WRITE: {
|
||||
case CMD_LF_PCF7931_WRITE: {
|
||||
WritePCF7931(
|
||||
packet->data.asBytes[0], packet->data.asBytes[1], packet->data.asBytes[2], packet->data.asBytes[3],
|
||||
packet->data.asBytes[4], packet->data.asBytes[5], packet->data.asBytes[6], packet->data.asBytes[9],
|
||||
|
|
@ -916,7 +916,7 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
);
|
||||
break;
|
||||
}
|
||||
case CMD_EM4X_READ_WORD: {
|
||||
case CMD_LF_EM4X_READWORD: {
|
||||
struct p {
|
||||
uint32_t password;
|
||||
uint8_t address;
|
||||
|
|
@ -926,7 +926,7 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
EM4xReadWord(payload->address, payload->password, payload->usepwd);
|
||||
break;
|
||||
}
|
||||
case CMD_EM4X_WRITE_WORD: {
|
||||
case CMD_LF_EM4X_WRITEWORD: {
|
||||
struct p {
|
||||
uint32_t password;
|
||||
uint32_t data;
|
||||
|
|
@ -937,48 +937,48 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
EM4xWriteWord(payload->address, payload->data, payload->password, payload->usepwd);
|
||||
break;
|
||||
}
|
||||
case CMD_AWID_DEMOD_FSK: {
|
||||
case CMD_LF_AWID_DEMOD: {
|
||||
uint32_t high, low;
|
||||
// Set realtime AWID demodulation
|
||||
CmdAWIDdemodFSK(packet->oldarg[0], &high, &low, 1);
|
||||
break;
|
||||
}
|
||||
case CMD_VIKING_CLONE_TAG: {
|
||||
case CMD_LF_VIKING_CLONE: {
|
||||
CopyVikingtoT55xx(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
|
||||
break;
|
||||
}
|
||||
case CMD_COTAG: {
|
||||
case CMD_LF_COTAG_READ: {
|
||||
Cotag(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WITH_HITAG
|
||||
case CMD_SNIFF_HITAG: { // Eavesdrop Hitag tag, args = type
|
||||
case CMD_LF_HITAG_SNIFF: { // Eavesdrop Hitag tag, args = type
|
||||
SniffHitag();
|
||||
break;
|
||||
}
|
||||
case CMD_SIMULATE_HITAG: { // Simulate Hitag tag, args = memory content
|
||||
case CMD_LF_HITAG_SIMULATE: { // Simulate Hitag tag, args = memory content
|
||||
SimulateHitagTag((bool)packet->oldarg[0], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_READER_HITAG: { // Reader for Hitag tags, args = type and function
|
||||
case CMD_LF_HITAG_READER: { // Reader for Hitag tags, args = type and function
|
||||
ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_SIMULATE_HITAG_S: { // Simulate Hitag s tag, args = memory content
|
||||
case CMD_LF_HITAGS_SIMULATE: { // Simulate Hitag s tag, args = memory content
|
||||
SimulateHitagSTag((bool)packet->oldarg[0], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_TEST_HITAGS_TRACES: { // Tests every challenge within the given file
|
||||
case CMD_LF_HITAGS_TEST_TRACES: { // Tests every challenge within the given file
|
||||
check_challenges((bool)packet->oldarg[0], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_READ_HITAG_S: { //Reader for only Hitag S tags, args = key or challenge
|
||||
case CMD_LF_HITAGS_READ: { //Reader for only Hitag S tags, args = key or challenge
|
||||
ReadHitagS((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_WR_HITAG_S: { //writer for Hitag tags args=data to write,page and key or challenge
|
||||
case CMD_LF_HITAGS_WRITE: { //writer for Hitag tags args=data to write,page and key or challenge
|
||||
if ((hitag_function)packet->oldarg[0] < 10) {
|
||||
WritePageHitagS((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes, packet->oldarg[2]);
|
||||
} else {
|
||||
|
|
@ -989,50 +989,50 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
#endif
|
||||
|
||||
#ifdef WITH_ISO15693
|
||||
case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693: {
|
||||
case CMD_HF_ISO15693_ACQ_RAW_ADC: {
|
||||
AcquireRawAdcSamplesIso15693();
|
||||
break;
|
||||
}
|
||||
case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693: {
|
||||
case CMD_HF_ISO15693_RAWADC: {
|
||||
RecordRawAdcSamplesIso15693();
|
||||
break;
|
||||
}
|
||||
case CMD_ISO_15693_COMMAND: {
|
||||
case CMD_HF_ISO15693_COMMAND: {
|
||||
DirectTag15693Command(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_ISO_15693_FIND_AFI: {
|
||||
case CMD_HF_ISO15693_FINDAFI: {
|
||||
BruteforceIso15693Afi(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_READER_ISO_15693: {
|
||||
case CMD_HF_ISO15693_READER: {
|
||||
ReaderIso15693(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_SIMTAG_ISO_15693: {
|
||||
case CMD_HF_ISO15693_SIMULATE: {
|
||||
SimTagIso15693(packet->oldarg[0], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WITH_LEGICRF
|
||||
case CMD_SIMULATE_TAG_LEGIC_RF: {
|
||||
case CMD_HF_LEGIC_SIMULATE: {
|
||||
LegicRfSimulate(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_WRITER_LEGIC_RF: {
|
||||
case CMD_HF_LEGIC_WRITER: {
|
||||
LegicRfWriter(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_READER_LEGIC_RF: {
|
||||
case CMD_HF_LEGIC_READER: {
|
||||
LegicRfReader(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
|
||||
break;
|
||||
}
|
||||
case CMD_LEGIC_INFO: {
|
||||
case CMD_HF_LEGIC_INFO: {
|
||||
LegicRfInfo();
|
||||
break;
|
||||
}
|
||||
case CMD_LEGIC_ESET: {
|
||||
case CMD_HF_LEGIC_ESET: {
|
||||
//-----------------------------------------------------------------------------
|
||||
// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
|
||||
// involved in dealing with emulator memory. But if it is called later, it might
|
||||
|
|
@ -1047,19 +1047,19 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
#endif
|
||||
|
||||
#ifdef WITH_ISO14443b
|
||||
case CMD_READ_SRI_TAG: {
|
||||
case CMD_HF_SRI_READ: {
|
||||
ReadSTMemoryIso14443b(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_SNIFF_ISO_14443B: {
|
||||
case CMD_HF_ISO14443B_SNIFF: {
|
||||
SniffIso14443b();
|
||||
break;
|
||||
}
|
||||
case CMD_SIMULATE_TAG_ISO_14443B: {
|
||||
case CMD_HF_ISO14443B_SIMULATE: {
|
||||
SimulateIso14443bTag(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_ISO_14443B_COMMAND: {
|
||||
case CMD_HF_ISO14443B_COMMAND: {
|
||||
//SendRawCommand14443B(packet->oldarg[0],packet->oldarg[1],packet->oldarg[2],packet->data.asBytes);
|
||||
SendRawCommand14443B_Ex(packet);
|
||||
break;
|
||||
|
|
@ -1067,34 +1067,34 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
#endif
|
||||
|
||||
#ifdef WITH_FELICA
|
||||
case CMD_FELICA_COMMAND: {
|
||||
case CMD_HF_FELICA_COMMAND: {
|
||||
felica_sendraw(packet);
|
||||
break;
|
||||
}
|
||||
case CMD_FELICA_LITE_SIM: {
|
||||
case CMD_HF_FELICALITE_SIMULATE: {
|
||||
felica_sim_lite(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_FELICA_SNIFF: {
|
||||
case CMD_HF_FELICA_SNIFF: {
|
||||
felica_sniff(packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
case CMD_FELICA_LITE_DUMP: {
|
||||
case CMD_HF_FELICALITE_DUMP: {
|
||||
felica_dump_lite_s();
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WITH_ISO14443a
|
||||
case CMD_SNIFF_ISO_14443a: {
|
||||
case CMD_HF_ISO14443A_SNIFF: {
|
||||
SniffIso14443a(packet->data.asBytes[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_READER_ISO_14443a: {
|
||||
case CMD_HF_ISO14443A_READER: {
|
||||
ReaderIso14443a(packet);
|
||||
break;
|
||||
}
|
||||
case CMD_SIMULATE_TAG_ISO_14443a: {
|
||||
case CMD_HF_ISO14443A_SIMULATE: {
|
||||
struct p {
|
||||
uint8_t tagtype;
|
||||
uint8_t flags;
|
||||
|
|
@ -1104,80 +1104,80 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
SimulateIso14443aTag(payload->tagtype, payload->flags, payload->uid); // ## Simulate iso14443a tag - pass tag type & UID
|
||||
break;
|
||||
}
|
||||
case CMD_ANTIFUZZ_ISO_14443a: {
|
||||
case CMD_HF_ISO14443A_ANTIFUZZ: {
|
||||
iso14443a_antifuzz(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_EPA_PACE_COLLECT_NONCE: {
|
||||
case CMD_HF_EPA_COLLECT_NONCE: {
|
||||
EPA_PACE_Collect_Nonce(packet);
|
||||
break;
|
||||
}
|
||||
case CMD_EPA_PACE_REPLAY: {
|
||||
case CMD_HF_EPA_REPLAY: {
|
||||
EPA_PACE_Replay(packet);
|
||||
break;
|
||||
}
|
||||
case CMD_READER_MIFARE: {
|
||||
case CMD_HF_MIFARE_READER: {
|
||||
ReaderMifare(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_READBL: {
|
||||
case CMD_HF_MIFARE_READBL: {
|
||||
mf_readblock_t *payload = (mf_readblock_t *)packet->data.asBytes;
|
||||
MifareReadBlock(payload->blockno, payload->keytype, payload->key);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFAREU_READBL: {
|
||||
case CMD_HF_MIFAREU_READBL: {
|
||||
MifareUReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFAREUC_AUTH: {
|
||||
case CMD_HF_MIFAREUC_AUTH: {
|
||||
MifareUC_Auth(packet->oldarg[0], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFAREU_READCARD: {
|
||||
case CMD_HF_MIFAREU_READCARD: {
|
||||
MifareUReadCard(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFAREUC_SETPWD: {
|
||||
case CMD_HF_MIFAREUC_SETPWD: {
|
||||
MifareUSetPwd(packet->oldarg[0], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_READSC: {
|
||||
case CMD_HF_MIFARE_READSC: {
|
||||
MifareReadSector(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_WRITEBL: {
|
||||
case CMD_HF_MIFARE_WRITEBL: {
|
||||
MifareWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
//case CMD_MIFAREU_WRITEBL_COMPAT: {
|
||||
//case CMD_HF_MIFAREU_WRITEBL_COMPAT: {
|
||||
//MifareUWriteBlockCompat(packet->oldarg[0], packet->data.asBytes);
|
||||
//break;
|
||||
//}
|
||||
case CMD_MIFAREU_WRITEBL: {
|
||||
case CMD_HF_MIFAREU_WRITEBL: {
|
||||
MifareUWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES: {
|
||||
case CMD_HF_MIFARE_ACQ_ENCRYPTED_NONCES: {
|
||||
MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_ACQUIRE_NONCES: {
|
||||
case CMD_HF_MIFARE_ACQ_NONCES: {
|
||||
MifareAcquireNonces(packet->oldarg[0], packet->oldarg[2]);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_NESTED: {
|
||||
case CMD_HF_MIFARE_NESTED: {
|
||||
MifareNested(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_CHKKEYS: {
|
||||
case CMD_HF_MIFARE_CHKKEYS: {
|
||||
MifareChkKeys(packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_CHKKEYS_FAST: {
|
||||
case CMD_HF_MIFARE_CHKKEYS_FAST: {
|
||||
MifareChkKeys_fast(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_SIMULATE_MIFARE_CARD: {
|
||||
case CMD_HF_MIFARE_SIMULATE: {
|
||||
struct p {
|
||||
uint16_t flags;
|
||||
uint8_t exitAfter;
|
||||
|
|
@ -1194,12 +1194,12 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
reply_ng(CMD_SET_DBGMODE, PM3_SUCCESS, NULL, 0);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_EML_MEMCLR: {
|
||||
case CMD_HF_MIFARE_EML_MEMCLR: {
|
||||
MifareEMemClr();
|
||||
reply_ng(CMD_MIFARE_EML_MEMCLR, PM3_SUCCESS, NULL, 0);
|
||||
reply_ng(CMD_HF_MIFARE_EML_MEMCLR, PM3_SUCCESS, NULL, 0);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_EML_MEMSET: {
|
||||
case CMD_HF_MIFARE_EML_MEMSET: {
|
||||
struct p {
|
||||
uint8_t blockno;
|
||||
uint8_t blockcnt;
|
||||
|
|
@ -1210,7 +1210,7 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
MifareEMemSet(payload->blockno, payload->blockcnt, payload->blockwidth, payload->data);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_EML_MEMGET: {
|
||||
case CMD_HF_MIFARE_EML_MEMGET: {
|
||||
struct p {
|
||||
uint8_t blockno;
|
||||
uint8_t blockcnt;
|
||||
|
|
@ -1219,71 +1219,71 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
MifareEMemGet(payload->blockno, payload->blockcnt);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_EML_CARDLOAD: {
|
||||
case CMD_HF_MIFARE_EML_LOAD: {
|
||||
MifareECardLoad(packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
// Work with "magic Chinese" card
|
||||
case CMD_MIFARE_CSETBLOCK: {
|
||||
case CMD_HF_MIFARE_CSETBL: {
|
||||
MifareCSetBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_CGETBLOCK: {
|
||||
case CMD_HF_MIFARE_CGETBL: {
|
||||
MifareCGetBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_CIDENT: {
|
||||
case CMD_HF_MIFARE_CIDENT: {
|
||||
MifareCIdent();
|
||||
break;
|
||||
}
|
||||
// mifare sniffer
|
||||
// case CMD_MIFARE_SNIFFER: {
|
||||
// case CMD_HF_MIFARE_SNIFF: {
|
||||
// SniffMifare(packet->oldarg[0]);
|
||||
// break;
|
||||
// }
|
||||
case CMD_MIFARE_SETMOD: {
|
||||
case CMD_HF_MIFARE_SETMOD: {
|
||||
MifareSetMod(packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
//mifare desfire
|
||||
case CMD_MIFARE_DESFIRE_READBL: {
|
||||
case CMD_HF_DESFIRE_READBL: {
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_DESFIRE_WRITEBL: {
|
||||
case CMD_HF_DESFIRE_WRITEBL: {
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_DESFIRE_AUTH1: {
|
||||
case CMD_HF_DESFIRE_AUTH1: {
|
||||
MifareDES_Auth1(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_DESFIRE_AUTH2: {
|
||||
case CMD_HF_DESFIRE_AUTH2: {
|
||||
//MifareDES_Auth2(packet->oldarg[0],packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_DES_READER: {
|
||||
case CMD_HF_DESFIRE_READER: {
|
||||
//readermifaredes(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_DESFIRE_INFO: {
|
||||
case CMD_HF_DESFIRE_INFO: {
|
||||
MifareDesfireGetInformation();
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_DESFIRE: {
|
||||
case CMD_HF_DESFIRE_COMMAND: {
|
||||
MifareSendCommand(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_COLLECT_NONCES: {
|
||||
case CMD_HF_MIFARE_COLLECT_NONCES: {
|
||||
break;
|
||||
}
|
||||
case CMD_MIFARE_NACK_DETECT: {
|
||||
case CMD_HF_MIFARE_NACK_DETECT: {
|
||||
DetectNACKbug();
|
||||
break;
|
||||
}
|
||||
case CMD_THINFILM_READ: {
|
||||
case CMD_HF_THINFILM_READ: {
|
||||
ReadThinFilm();
|
||||
break;
|
||||
}
|
||||
case CMD_SIMULATE_TAG_THINFILM: {
|
||||
case CMD_HF_THINFILM_SIMULATE: {
|
||||
SimulateThinFilm(packet->data.asBytes, packet->length);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1291,60 +1291,60 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
|
||||
#ifdef WITH_ICLASS
|
||||
// Makes use of ISO14443a FPGA Firmware
|
||||
case CMD_SNIFF_ICLASS: {
|
||||
case CMD_HF_ICLASS_SNIFF: {
|
||||
SniffIClass();
|
||||
break;
|
||||
}
|
||||
case CMD_SIMULATE_TAG_ICLASS: {
|
||||
case CMD_HF_ICLASS_SIMULATE: {
|
||||
SimulateIClass(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_READER_ICLASS: {
|
||||
case CMD_HF_ICLASS_READER: {
|
||||
ReaderIClass(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_READER_ICLASS_REPLAY: {
|
||||
case CMD_HF_ICLASS_REPLAY: {
|
||||
ReaderIClass_Replay(packet->oldarg[0], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_ICLASS_EML_MEMSET: {
|
||||
case CMD_HF_ICLASS_EML_MEMSET: {
|
||||
//iceman, should call FPGADOWNLOAD before, since it corrupts BigBuf
|
||||
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
|
||||
emlSet(packet->data.asBytes, packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
case CMD_ICLASS_WRITEBLOCK: {
|
||||
case CMD_HF_ICLASS_WRITEBL: {
|
||||
iClass_WriteBlock(packet->oldarg[0], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_ICLASS_READCHECK: { // auth step 1
|
||||
case CMD_HF_ICLASS_READCHECK: { // auth step 1
|
||||
iClass_ReadCheck(packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
case CMD_ICLASS_READBLOCK: {
|
||||
case CMD_HF_ICLASS_READBL: {
|
||||
iClass_ReadBlk(packet->oldarg[0]);
|
||||
break;
|
||||
}
|
||||
case CMD_ICLASS_AUTHENTICATION: { //check
|
||||
case CMD_HF_ICLASS_AUTH: { //check
|
||||
iClass_Authentication(packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_ICLASS_CHECK_KEYS: {
|
||||
case CMD_HF_ICLASS_CHKKEYS: {
|
||||
iClass_Authentication_fast(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
case CMD_ICLASS_DUMP: {
|
||||
case CMD_HF_ICLASS_DUMP: {
|
||||
iClass_Dump(packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
case CMD_ICLASS_CLONE: {
|
||||
case CMD_HF_ICLASS_CLONE: {
|
||||
iClass_Clone(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WITH_HFSNIFF
|
||||
case CMD_HF_SNIFFER: {
|
||||
case CMD_HF_SNIFF: {
|
||||
HfSniff(packet->oldarg[0], packet->oldarg[1]);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1546,7 +1546,7 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
break;
|
||||
}
|
||||
#ifdef WITH_LF
|
||||
case CMD_UPLOAD_SIM_SAMPLES_125K: {
|
||||
case CMD_LF_UPLOAD_SIM_SAMPLES: {
|
||||
// iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
|
||||
// to be able to use this one for uploading data to device
|
||||
// flag =
|
||||
|
|
@ -1568,7 +1568,7 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
|
||||
uint8_t *mem = BigBuf_get_addr();
|
||||
memcpy(mem + payload->offset, &payload->data, PM3_CMD_DATA_SIZE - 3);
|
||||
reply_ng(CMD_UPLOAD_SIM_SAMPLES_125K, PM3_SUCCESS, NULL, 0);
|
||||
reply_ng(CMD_LF_UPLOAD_SIM_SAMPLES, PM3_SUCCESS, NULL, 0);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1836,7 +1836,7 @@ static void PacketReceived(PacketCommandNG *packet) {
|
|||
break;
|
||||
}
|
||||
#endif
|
||||
case CMD_SET_LF_DIVISOR: {
|
||||
case CMD_LF_SET_DIVISOR: {
|
||||
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, packet->data.asBytes[0]);
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue