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: validating we got a full usbcommand (512b)

Browse source
This commit is contained in:
iceman1001 2017-10-11 12:48:04 +02:00
commit 1cca109429
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
armsrc/appmain.c
View file

@ -307,6 +307,9 @@ void SendVersion(void) {
FpgaGatherVersion(FPGA_BITSTREAM_HF, temp, sizeof(temp)); FpgaGatherVersion(FPGA_BITSTREAM_HF, temp, sizeof(temp));
strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1); strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
FpgaGatherVersion(FPGA_BITSTREAM_NFC, temp, sizeof(temp));
strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
// Send Chip ID and used flash memory // Send Chip ID and used flash memory
uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start; uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
uint32_t compressed_data_section_size = common_area.arg1; uint32_t compressed_data_section_size = common_area.arg1;
@ -1090,9 +1093,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
usb_disable(); usb_disable();
SpinDelay(2000); SpinDelay(2000);
AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST; AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
for(;;) {
// We're going to reset, and the bootrom will take control. // We're going to reset, and the bootrom will take control.
} for(;;) {}
break; break;
case CMD_START_FLASH: case CMD_START_FLASH:
@ -1101,7 +1103,8 @@ void UsbPacketReceived(uint8_t *packet, int len) {
} }
usb_disable(); usb_disable();
AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST; AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
for(;;); // We're going to flash, and the bootrom will take control.
for(;;) {}
break; break;
case CMD_DEVICE_INFO: { case CMD_DEVICE_INFO: {
@ -1158,15 +1161,21 @@ void __attribute__((noreturn)) AppMain(void) {
#endif #endif
byte_t rx[sizeof(UsbCommand)]; byte_t rx[sizeof(UsbCommand)];
size_t rx_len; size_t rx_len = 0;
for(;;) { for(;;) {
// Check if there is a usb packet available
if ( usb_poll_validate_length() ) { if ( usb_poll_validate_length() ) {
// Try to retrieve the available command frame
rx_len = usb_read(rx, sizeof(UsbCommand)); rx_len = usb_read(rx, sizeof(UsbCommand));
if (rx_len) // Check if the transfer was complete
if (rx_len == sizeof(UsbCommand))
UsbPacketReceived(rx, rx_len); UsbPacketReceived(rx, rx_len);
} }
WDT_HIT(); WDT_HIT();
// Press button for one second to enter a possible standalone mode // Press button for one second to enter a possible standalone mode