RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-22 05:00:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

cleaning

Browse source
This commit is contained in:
iceman1001 2019-05-07 09:39:02 +02:00
parent 86aa593b1b
commit 2fca0d80b3
1 changed files with 10 additions and 5 deletions

15
common/cmd.c
View file

@ -73,7 +73,6 @@ int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
if (reply_via_fpc) { if (reply_via_fpc) {
#ifdef WITH_FPC_USART_HOST #ifdef WITH_FPC_USART_HOST
result = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD)); result = usart_writebuffer_sync((uint8_t *)&txcmd, sizeof(PacketResponseOLD));
// Dbprintf_usb("Sent %i bytes over usart", len);
#else #else
return PM3_EDEVNOTSUPP; return PM3_EDEVNOTSUPP;
#endif #endif
@ -87,8 +86,6 @@ int reply_old(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) { static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t len, bool ng) {
PacketResponseNGRaw txBufferNG; PacketResponseNGRaw txBufferNG;
size_t txBufferNGLen; size_t txBufferNGLen;
// for (size_t i = 0; i < sizeof(txBufferNG); i++)
// ((uint8_t *)&txBufferNG)[i] = 0x00;
// Compose the outgoing command frame // Compose the outgoing command frame
txBufferNG.pre.magic = RESPONSENG_PREAMBLE_MAGIC; txBufferNG.pre.magic = RESPONSENG_PREAMBLE_MAGIC;
@ -125,14 +122,12 @@ static int reply_ng_internal(uint16_t cmd, int16_t status, uint8_t *data, size_t
if (reply_via_fpc) { if (reply_via_fpc) {
#ifdef WITH_FPC_USART_HOST #ifdef WITH_FPC_USART_HOST
result = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen); result = usart_writebuffer_sync((uint8_t *)&txBufferNG, txBufferNGLen);
// Dbprintf_usb("Sent %i bytes over usart", len);
#else #else
return PM3_EDEVNOTSUPP; return PM3_EDEVNOTSUPP;
#endif #endif
} else { } else {
result = usb_write((uint8_t *)&txBufferNG, txBufferNGLen); result = usb_write((uint8_t *)&txBufferNG, txBufferNGLen);
} }
return result; return result;
} }
@ -151,27 +146,34 @@ int reply_mix(uint64_t cmd, uint64_t arg0, uint64_t arg1, uint64_t arg2, void *d
memcpy(cmddata, arg, sizeof(arg)); memcpy(cmddata, arg, sizeof(arg));
if (len && data) if (len && data)
memcpy(cmddata + sizeof(arg), data, len); memcpy(cmddata + sizeof(arg), data, len);
return reply_ng_internal(cmd, status, cmddata, len + sizeof(arg), false); return reply_ng_internal(cmd, status, cmddata, len + sizeof(arg), false);
} }
static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) { static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *data, size_t len), bool fpc) {
PacketCommandNGRaw rx_raw; PacketCommandNGRaw rx_raw;
size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble)); size_t bytes = read_ng((uint8_t *)&rx_raw.pre, sizeof(PacketCommandNGPreamble));
if (bytes == 0) if (bytes == 0)
return PM3_ENODATA; return PM3_ENODATA;
if (bytes != sizeof(PacketCommandNGPreamble)) if (bytes != sizeof(PacketCommandNGPreamble))
return PM3_EIO; return PM3_EIO;
rx->magic = rx_raw.pre.magic; rx->magic = rx_raw.pre.magic;
rx->ng = rx_raw.pre.ng; rx->ng = rx_raw.pre.ng;
uint16_t length = rx_raw.pre.length; uint16_t length = rx_raw.pre.length;
rx->cmd = rx_raw.pre.cmd; rx->cmd = rx_raw.pre.cmd;
if (rx->magic == COMMANDNG_PREAMBLE_MAGIC) { // New style NG command if (rx->magic == COMMANDNG_PREAMBLE_MAGIC) { // New style NG command
if (length > PM3_CMD_DATA_SIZE) if (length > PM3_CMD_DATA_SIZE)
return PM3_EOVFLOW; return PM3_EOVFLOW;
// Get the core and variable length payload // Get the core and variable length payload
bytes = read_ng((uint8_t *)&rx_raw.data, length); bytes = read_ng((uint8_t *)&rx_raw.data, length);
if (bytes != length) if (bytes != length)
return PM3_EIO; return PM3_EIO;
if (rx->ng) { if (rx->ng) {
memcpy(rx->data.asBytes, rx_raw.data, length); memcpy(rx->data.asBytes, rx_raw.data, length);
rx->length = length; rx->length = length;
@ -179,6 +181,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
uint64_t arg[3]; uint64_t arg[3];
if (length < sizeof(arg)) if (length < sizeof(arg))
return PM3_EIO; return PM3_EIO;
memcpy(arg, rx_raw.data, sizeof(arg)); memcpy(arg, rx_raw.data, sizeof(arg));
rx->oldarg[0] = arg[0]; rx->oldarg[0] = arg[0];
rx->oldarg[1] = arg[1]; rx->oldarg[1] = arg[1];
@ -190,6 +193,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
bytes = read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble)); bytes = read_ng((uint8_t *)&rx_raw.foopost, sizeof(PacketCommandNGPostamble));
if (bytes != sizeof(PacketCommandNGPostamble)) if (bytes != sizeof(PacketCommandNGPostamble))
return PM3_EIO; return PM3_EIO;
// Check CRC, accept MAGIC as placeholder // Check CRC, accept MAGIC as placeholder
rx->crc = rx_raw.foopost.crc; rx->crc = rx_raw.foopost.crc;
if (rx->crc != COMMANDNG_POSTAMBLE_MAGIC) { if (rx->crc != COMMANDNG_POSTAMBLE_MAGIC) {
@ -205,6 +209,7 @@ static int receive_ng_internal(PacketCommandNG *rx, uint32_t read_ng(uint8_t *da
bytes = read_ng(((uint8_t *)&rx_old) + sizeof(PacketCommandNGPreamble), sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble)); bytes = read_ng(((uint8_t *)&rx_old) + sizeof(PacketCommandNGPreamble), sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble));
if (bytes != sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble)) if (bytes != sizeof(PacketCommandOLD) - sizeof(PacketCommandNGPreamble))
return PM3_EIO; return PM3_EIO;
reply_via_fpc = fpc; reply_via_fpc = fpc;
rx->ng = false; rx->ng = false;
rx->magic = 0; rx->magic = 0;