mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-07-16 02:03:00 -07:00
refactor flashing code into flash.h, so we can share it between platforms
This commit is contained in:
parent
204c85958c
commit
6e4d4ee609
5 changed files with 357 additions and 623 deletions
|
@ -4,7 +4,7 @@ WINCC=c:\mingw\bin\gcc
|
|||
|
||||
LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
|
||||
LDFLAGS = $(COMMON_FLAGS)
|
||||
CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS)
|
||||
CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g3
|
||||
|
||||
WINLIBS = -lgdi32 -lsetupapi
|
||||
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
|
||||
|
@ -41,8 +41,8 @@ all: $(BINS)
|
|||
all-static: LDLIBS:=-static $(LDLIBS)
|
||||
all-static: snooper cli flasher
|
||||
|
||||
prox.exe: prox.c wingui.c command.c
|
||||
$(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c $(WINLIBS)
|
||||
prox.exe: prox.c wingui.c command.c flash.c
|
||||
$(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c flash.c $(WINLIBS)
|
||||
|
||||
proxmark3: LDLIBS+=$(QTLDLIBS)
|
||||
proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
|
||||
|
@ -53,7 +53,7 @@ snooper: snooper.o gui.o command.o usb.o guidummy.o
|
|||
|
||||
cli: cli.o gui.o command.o usb.o guidummy.o
|
||||
|
||||
flasher: flasher.o usb.o
|
||||
flasher: flash.o flasher.o usb.o
|
||||
|
||||
proxguiqt.moc.cpp: proxguiqt.h
|
||||
$(MOC) -o$@ $^
|
||||
|
|
326
client/flash.c
Normal file
326
client/flash.c
Normal file
|
@ -0,0 +1,326 @@
|
|||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#include <setupapi.h>
|
||||
#include <ctype.h>
|
||||
#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
|
||||
BOOL UsbConnect(void);
|
||||
#else
|
||||
#include <usb.h>
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <strings.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "prox.h"
|
||||
#ifndef WIN32
|
||||
#include "proxmark3.h"
|
||||
#endif
|
||||
#include "flash.h"
|
||||
|
||||
static uint32_t ExpectedAddr;
|
||||
static uint8_t QueuedToSend[256];
|
||||
static bool AllWritten;
|
||||
#define PHYSICAL_FLASH_START 0x100000
|
||||
|
||||
void WaitForAck(void) {
|
||||
UsbCommand ack;
|
||||
ReceiveCommand(&ack);
|
||||
if(ack.cmd != CMD_ACK) {
|
||||
printf("bad ACK\n");
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
struct partition partitions[] = {
|
||||
{0x100000, 0x102000, 1, "bootrom"},
|
||||
{0x102000, 0x110000, 0, "fpga"},
|
||||
{0x110000, 0x140000, 0, "os"},
|
||||
{0, 0, 0, NULL},
|
||||
};
|
||||
|
||||
/* If translate is set, subtract PHYSICAL_FLASH_START to translate for old
|
||||
* bootroms.
|
||||
*/
|
||||
void FlushPrevious(int translate)
|
||||
{
|
||||
UsbCommand c;
|
||||
memset(&c, 0, sizeof(c));
|
||||
|
||||
printf("expected = %08x flush, ", ExpectedAddr);
|
||||
|
||||
int i;
|
||||
for(i = 0; i < 240; i += 48) {
|
||||
c.cmd = CMD_SETUP_WRITE;
|
||||
memcpy(c.d.asBytes, QueuedToSend+i, 48);
|
||||
c.arg[0] = (i/4);
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
}
|
||||
|
||||
c.cmd = CMD_FINISH_WRITE;
|
||||
c.arg[0] = (ExpectedAddr-1) & (~255);
|
||||
if(translate) {
|
||||
c.arg[0] -= PHYSICAL_FLASH_START;
|
||||
}
|
||||
printf("c.arg[0] = %08x\r", c.arg[0]);
|
||||
memcpy(c.d.asBytes, QueuedToSend+240, 16);
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
|
||||
AllWritten = true;
|
||||
}
|
||||
|
||||
/* Where must be between start_addr (inclusive) and end_addr (exclusive).
|
||||
*/
|
||||
void GotByte(uint32_t where, uint8_t which, int start_addr, int end_addr, int translate)
|
||||
{
|
||||
AllWritten = false;
|
||||
|
||||
if(where < start_addr || where >= end_addr) {
|
||||
printf("bad: got byte at %08x, outside of range %08x-%08x\n", where, start_addr, end_addr);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if(where != ExpectedAddr) {
|
||||
printf("bad: got at %08x, expected at %08x\n", where, ExpectedAddr);
|
||||
exit(-1);
|
||||
}
|
||||
QueuedToSend[where & 255] = which;
|
||||
ExpectedAddr++;
|
||||
|
||||
if((where & 255) == 255) {
|
||||
// we have completed a full page
|
||||
FlushPrevious(translate);
|
||||
}
|
||||
}
|
||||
|
||||
int HexVal(int c)
|
||||
{
|
||||
c = tolower(c);
|
||||
if(c >= '0' && c <= '9') {
|
||||
return c - '0';
|
||||
} else if(c >= 'a' && c <= 'f') {
|
||||
return (c - 'a') + 10;
|
||||
} else {
|
||||
printf("bad hex digit '%c'\n", c);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t HexByte(char *s)
|
||||
{
|
||||
return (HexVal(s[0]) << 4) | HexVal(s[1]);
|
||||
}
|
||||
|
||||
void LoadFlashFromSRecords(const char *file, int start_addr, int end_addr, int translate)
|
||||
{
|
||||
ExpectedAddr = start_addr;
|
||||
|
||||
FILE *f = fopen(file, "r");
|
||||
if(!f) {
|
||||
printf("couldn't open file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
char line[512];
|
||||
while(fgets(line, sizeof(line), f)) {
|
||||
if(memcmp(line, "S3", 2)==0) {
|
||||
char *s = line + 2;
|
||||
int len = HexByte(s) - 5;
|
||||
s += 2;
|
||||
|
||||
char addrStr[9];
|
||||
memcpy(addrStr, s, 8);
|
||||
addrStr[8] = '\0';
|
||||
uint32_t addr;
|
||||
sscanf(addrStr, "%x", &addr);
|
||||
s += 8;
|
||||
|
||||
/* Accept files that are located at PHYSICAL_FLASH_START, and files that are located at 0 */
|
||||
if(addr < PHYSICAL_FLASH_START)
|
||||
addr += PHYSICAL_FLASH_START;
|
||||
|
||||
int i;
|
||||
for(i = 0; i < len; i++) {
|
||||
while((addr+i) > ExpectedAddr) {
|
||||
GotByte(ExpectedAddr, 0xff, start_addr, end_addr, translate);
|
||||
}
|
||||
GotByte(addr+i, HexByte(s), start_addr, end_addr, translate);
|
||||
s += 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!AllWritten) FlushPrevious(translate);
|
||||
|
||||
fclose(f);
|
||||
printf("\ndone.\n");
|
||||
}
|
||||
|
||||
int PrepareFlash(struct partition *p, const char *filename, unsigned int state)
|
||||
{
|
||||
int translate = 0;
|
||||
if(state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
|
||||
UsbCommand c;
|
||||
c.cmd = CMD_START_FLASH;
|
||||
c.arg[0] = p->start;
|
||||
c.arg[1] = p->end;
|
||||
|
||||
/* Only send magic when flashing bootrom */
|
||||
if(p->precious) {
|
||||
c.arg[2] = START_FLASH_MAGIC;
|
||||
} else {
|
||||
c.arg[2] = 0;
|
||||
}
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
translate = 0;
|
||||
} else {
|
||||
fprintf(stderr, "Warning: Your bootloader does not understand the new START_FLASH command\n");
|
||||
fprintf(stderr, " It is recommended that you update your bootloader\n\n");
|
||||
translate = 1;
|
||||
}
|
||||
|
||||
LoadFlashFromSRecords(filename, p->start, p->end, translate);
|
||||
return 1;
|
||||
}
|
||||
|
||||
unsigned int GetProxmarkState(void)
|
||||
{
|
||||
unsigned int state = 0;
|
||||
|
||||
UsbCommand c;
|
||||
c.cmd = CMD_DEVICE_INFO;
|
||||
SendCommand(&c);
|
||||
|
||||
UsbCommand resp;
|
||||
ReceiveCommand(&resp);
|
||||
/* Three cases:
|
||||
* 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
|
||||
* 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
|
||||
* 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
|
||||
*/
|
||||
|
||||
switch(resp.cmd) {
|
||||
case CMD_ACK:
|
||||
state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
|
||||
break;
|
||||
case CMD_DEBUG_PRINT_STRING:
|
||||
state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
|
||||
break;
|
||||
case CMD_DEVICE_INFO:
|
||||
state = resp.arg[0];
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "Couldn't get proxmark state, bad response type: 0x%04X\n", resp.cmd);
|
||||
exit(-1);
|
||||
break;
|
||||
}
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
unsigned int EnterFlashState(void)
|
||||
{
|
||||
unsigned int state = GetProxmarkState();
|
||||
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) {
|
||||
/* Already in flash state, we're done. */
|
||||
return state;
|
||||
}
|
||||
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
|
||||
fprintf(stderr,"Entering flash-mode...\n");
|
||||
UsbCommand c;
|
||||
bzero(&c, sizeof(c));
|
||||
|
||||
if( (state & DEVICE_INFO_FLAG_BOOTROM_PRESENT) && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT) ) {
|
||||
/* New style handover: Send CMD_START_FLASH, which will reset the board and
|
||||
* enter the bootrom on the next boot.
|
||||
*/
|
||||
c.cmd = CMD_START_FLASH;
|
||||
SendCommand(&c);
|
||||
fprintf(stderr,"(You don't have to do anything. Press and release the button only if you want to abort)\n");
|
||||
fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
|
||||
} else {
|
||||
/* Old style handover: Ask the user to press the button, then reset the board */
|
||||
c.cmd = CMD_HARDWARE_RESET;
|
||||
SendCommand(&c);
|
||||
fprintf(stderr,"(Press and hold down button NOW if your bootloader requires it)\n");
|
||||
fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
Sleep(1000);
|
||||
while(!UsbConnect()) { Sleep(1000); }
|
||||
#else
|
||||
CloseProxmark();
|
||||
sleep(1);
|
||||
|
||||
while(!(devh=OpenProxmark(0))) { sleep(1); }
|
||||
#endif
|
||||
fprintf(stderr,"Found.\n");
|
||||
|
||||
return GetProxmarkState();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* On first call, have *offset = -1, *length = 0; */
|
||||
int find_next_area(const char *str, int *offset, int *length)
|
||||
{
|
||||
if(*str == '\0') return 0;
|
||||
if((*offset >= 0) && str[*offset + *length] == '\0') return 0;
|
||||
*offset += 1 + *length;
|
||||
|
||||
char *next_comma = strchr(str + *offset, ',');
|
||||
if(next_comma == NULL) {
|
||||
*length = strlen(str) - *offset;
|
||||
} else {
|
||||
*length = next_comma-(str+*offset);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
void do_flash(char **argv) {
|
||||
unsigned int state = EnterFlashState();
|
||||
|
||||
if (!(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM)) {
|
||||
fprintf(stderr, "Proxmark would not enter flash state, abort\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
int offset=-1, length=0;
|
||||
int current_area = 0;
|
||||
while(find_next_area(argv[1], &offset, &length)) {
|
||||
int i;
|
||||
struct partition *p = NULL;
|
||||
for (i=0; i<sizeof(partitions)/sizeof(partitions[0]); i++) {
|
||||
if (strncmp(partitions[i].name, argv[1] + offset, length) == 0) {
|
||||
/* Check if the name matches the bootrom partition, and if so, require "bootrom" to
|
||||
* be written in full. The other names may be abbreviated.
|
||||
*/
|
||||
if(!partitions[i].precious || (strlen(partitions[i].name) == length))
|
||||
p = &partitions[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(p == NULL) {
|
||||
fprintf(stderr, "Warning: area name '");
|
||||
fwrite(argv[1]+offset, length, 1, stderr);
|
||||
fprintf(stderr, "' unknown, ignored\n");
|
||||
} else {
|
||||
fprintf(stderr, "Flashing %s from %s\n", p->name, argv[2+current_area]);
|
||||
PrepareFlash(p, argv[2+current_area], state);
|
||||
}
|
||||
current_area++;
|
||||
}
|
||||
}
|
15
client/flash.h
Normal file
15
client/flash.h
Normal file
|
@ -0,0 +1,15 @@
|
|||
struct partition {
|
||||
int start;
|
||||
int end;
|
||||
int precious;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
void FlushPrevious(int translate);
|
||||
void GotByte(uint32_t where, uint8_t which, int start_addr, int end_addr, int translate);
|
||||
unsigned int EnterFlashState(void);
|
||||
int PrepareFlash(struct partition *p, const char *filename, unsigned int state);
|
||||
int find_next_area(const char *str, int *offset, int *length);
|
||||
|
||||
#define PHYSICAL_FLASH_START 0x100000
|
||||
void do_flash(char **argv);
|
316
client/flasher.c
316
client/flasher.c
|
@ -11,264 +11,11 @@
|
|||
|
||||
#include "prox.h"
|
||||
#include "proxmark3.h"
|
||||
#include "flash.h"
|
||||
|
||||
static uint32_t ExpectedAddr;
|
||||
static uint8_t QueuedToSend[256];
|
||||
static bool AllWritten;
|
||||
#define PHYSICAL_FLASH_START 0x100000
|
||||
unsigned int current_command = CMD_UNKNOWN;
|
||||
|
||||
void WaitForAck(void) {
|
||||
UsbCommand ack;
|
||||
ReceiveCommand(&ack);
|
||||
if(ack.cmd != CMD_ACK) {
|
||||
printf("bad ACK\n");
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
struct partition {
|
||||
int start;
|
||||
int end;
|
||||
int precious;
|
||||
const char *name;
|
||||
};
|
||||
struct partition partitions[] = {
|
||||
{0x100000, 0x102000, 1, "bootrom"},
|
||||
{0x102000, 0x110000, 0, "fpga"},
|
||||
{0x110000, 0x140000, 0, "os"},
|
||||
};
|
||||
|
||||
/* If translate is set, subtract PHYSICAL_FLASH_START to translate for old
|
||||
* bootroms.
|
||||
*/
|
||||
static void FlushPrevious(int translate)
|
||||
{
|
||||
UsbCommand c;
|
||||
memset(&c, 0, sizeof(c));
|
||||
|
||||
printf("expected = %08x flush, ", ExpectedAddr);
|
||||
|
||||
int i;
|
||||
for(i = 0; i < 240; i += 48) {
|
||||
c.cmd = CMD_SETUP_WRITE;
|
||||
memcpy(c.d.asBytes, QueuedToSend+i, 48);
|
||||
c.arg[0] = (i/4);
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
}
|
||||
|
||||
c.cmd = CMD_FINISH_WRITE;
|
||||
c.arg[0] = (ExpectedAddr-1) & (~255);
|
||||
if(translate) {
|
||||
c.arg[0] -= PHYSICAL_FLASH_START;
|
||||
}
|
||||
printf("c.arg[0] = %08x\r", c.arg[0]);
|
||||
memcpy(c.d.asBytes, QueuedToSend+240, 16);
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
|
||||
AllWritten = true;
|
||||
}
|
||||
|
||||
/* Where must be between start_addr (inclusive) and end_addr (exclusive).
|
||||
*/
|
||||
static void GotByte(uint32_t where, uint8_t which, int start_addr, int end_addr, int translate)
|
||||
{
|
||||
AllWritten = false;
|
||||
|
||||
if(where < start_addr || where >= end_addr) {
|
||||
printf("bad: got byte at %08x, outside of range %08x-%08x\n", where, start_addr, end_addr);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if(where != ExpectedAddr) {
|
||||
printf("bad: got at %08x, expected at %08x\n", where, ExpectedAddr);
|
||||
exit(-1);
|
||||
}
|
||||
QueuedToSend[where & 255] = which;
|
||||
ExpectedAddr++;
|
||||
|
||||
if((where & 255) == 255) {
|
||||
// we have completed a full page
|
||||
FlushPrevious(translate);
|
||||
}
|
||||
}
|
||||
|
||||
static int HexVal(int c)
|
||||
{
|
||||
c = tolower(c);
|
||||
if(c >= '0' && c <= '9') {
|
||||
return c - '0';
|
||||
} else if(c >= 'a' && c <= 'f') {
|
||||
return (c - 'a') + 10;
|
||||
} else {
|
||||
printf("bad hex digit '%c'\n", c);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
static uint8_t HexByte(char *s)
|
||||
{
|
||||
return (HexVal(s[0]) << 4) | HexVal(s[1]);
|
||||
}
|
||||
|
||||
static void LoadFlashFromSRecords(const char *file, int start_addr, int end_addr, int translate)
|
||||
{
|
||||
ExpectedAddr = start_addr;
|
||||
|
||||
FILE *f = fopen(file, "r");
|
||||
if(!f) {
|
||||
printf("couldn't open file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
char line[512];
|
||||
while(fgets(line, sizeof(line), f)) {
|
||||
if(memcmp(line, "S3", 2)==0) {
|
||||
char *s = line + 2;
|
||||
int len = HexByte(s) - 5;
|
||||
s += 2;
|
||||
|
||||
char addrStr[9];
|
||||
memcpy(addrStr, s, 8);
|
||||
addrStr[8] = '\0';
|
||||
uint32_t addr;
|
||||
sscanf(addrStr, "%x", &addr);
|
||||
s += 8;
|
||||
|
||||
/* Accept files that are located at PHYSICAL_FLASH_START, and files that are located at 0 */
|
||||
if(addr < PHYSICAL_FLASH_START)
|
||||
addr += PHYSICAL_FLASH_START;
|
||||
|
||||
int i;
|
||||
for(i = 0; i < len; i++) {
|
||||
while((addr+i) > ExpectedAddr) {
|
||||
GotByte(ExpectedAddr, 0xff, start_addr, end_addr, translate);
|
||||
}
|
||||
GotByte(addr+i, HexByte(s), start_addr, end_addr, translate);
|
||||
s += 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!AllWritten) FlushPrevious(translate);
|
||||
|
||||
fclose(f);
|
||||
printf("\ndone.\n");
|
||||
}
|
||||
|
||||
static int PrepareFlash(struct partition *p, const char *filename, unsigned int state)
|
||||
{
|
||||
int translate = 0;
|
||||
if(state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
|
||||
UsbCommand c;
|
||||
c.cmd = CMD_START_FLASH;
|
||||
c.arg[0] = p->start;
|
||||
c.arg[1] = p->end;
|
||||
|
||||
/* Only send magic when flashing bootrom */
|
||||
if(p->precious) {
|
||||
c.arg[2] = START_FLASH_MAGIC;
|
||||
} else {
|
||||
c.arg[2] = 0;
|
||||
}
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
translate = 0;
|
||||
} else {
|
||||
fprintf(stderr, "Warning: Your bootloader does not understand the new START_FLASH command\n");
|
||||
fprintf(stderr, " It is recommended that you update your bootloader\n\n");
|
||||
translate = 1;
|
||||
}
|
||||
|
||||
LoadFlashFromSRecords(filename, p->start, p->end, translate);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static unsigned int GetProxmarkState(void)
|
||||
{
|
||||
unsigned int state = 0;
|
||||
|
||||
UsbCommand c;
|
||||
c.cmd = CMD_DEVICE_INFO;
|
||||
SendCommand(&c);
|
||||
|
||||
UsbCommand resp;
|
||||
ReceiveCommand(&resp);
|
||||
/* Three cases:
|
||||
* 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
|
||||
* 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
|
||||
* 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
|
||||
*/
|
||||
|
||||
switch(resp.cmd) {
|
||||
case CMD_ACK:
|
||||
state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
|
||||
break;
|
||||
case CMD_DEBUG_PRINT_STRING:
|
||||
state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
|
||||
break;
|
||||
case CMD_DEVICE_INFO:
|
||||
state = resp.arg[0];
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "Couldn't get proxmark state, bad response type: 0x%04X\n", resp.cmd);
|
||||
exit(-1);
|
||||
break;
|
||||
}
|
||||
|
||||
#if 0
|
||||
if(state & DEVICE_INFO_FLAG_BOOTROM_PRESENT) printf("New bootrom present\n");
|
||||
if(state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT) printf("New osimage present\n");
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) printf("Currently in bootrom\n");
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) printf("Currently in OS\n");
|
||||
#endif
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
static unsigned int EnterFlashState(void)
|
||||
{
|
||||
unsigned int state = GetProxmarkState();
|
||||
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) {
|
||||
/* Already in flash state, we're done. */
|
||||
return state;
|
||||
}
|
||||
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
|
||||
fprintf(stderr,"Entering flash-mode...\n");
|
||||
UsbCommand c;
|
||||
bzero(&c, sizeof(c));
|
||||
|
||||
if( (state & DEVICE_INFO_FLAG_BOOTROM_PRESENT) && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT) ) {
|
||||
/* New style handover: Send CMD_START_FLASH, which will reset the board and
|
||||
* enter the bootrom on the next boot.
|
||||
*/
|
||||
c.cmd = CMD_START_FLASH;
|
||||
SendCommand(&c);
|
||||
fprintf(stderr,"(You don't have to do anything. Press and release the button only if you want to abort)\n");
|
||||
fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
|
||||
} else {
|
||||
/* Old style handover: Ask the user to press the button, then reset the board */
|
||||
c.cmd = CMD_HARDWARE_RESET;
|
||||
SendCommand(&c);
|
||||
fprintf(stderr,"(Press and hold down button NOW if your bootloader requires it)\n");
|
||||
fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
|
||||
}
|
||||
|
||||
CloseProxmark();
|
||||
sleep(1);
|
||||
|
||||
while(!(devh=OpenProxmark(0))) { sleep(1); }
|
||||
fprintf(stderr,"Found.\n");
|
||||
|
||||
return GetProxmarkState();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
extern struct partition partitions[];
|
||||
|
||||
static void usage(char **argv)
|
||||
{
|
||||
|
@ -276,30 +23,16 @@ static void usage(char **argv)
|
|||
fprintf(stderr, "Usage: %s areas image [image [image]]\n", argv[0]);
|
||||
fprintf(stderr, " areas is a comma-separated list of areas to flash, with no spaces\n");
|
||||
fprintf(stderr, " Known areas are:");
|
||||
for(i=0; i<(sizeof(partitions)/sizeof(partitions[0])); i++) {
|
||||
|
||||
for(i=0; partitions[i].name != NULL; i++) {
|
||||
fprintf(stderr, " %s", partitions[i].name);
|
||||
}
|
||||
|
||||
fprintf(stderr, "\n");
|
||||
fprintf(stderr, " image is the path to the corresponding image\n\n");
|
||||
fprintf(stderr, "Example: %s os,fpga path/to/osimage.s19 path/to/fpgaimage.s19\n", argv[0]);
|
||||
}
|
||||
|
||||
/* On first call, have *offset = -1, *length = 0; */
|
||||
static int find_next_area(const char *str, int *offset, int *length)
|
||||
{
|
||||
if(*str == '\0') return 0;
|
||||
if((*offset >= 0) && str[*offset + *length] == '\0') return 0;
|
||||
*offset += 1 + *length;
|
||||
|
||||
char *next_comma = strchr(str + *offset, ',');
|
||||
if(next_comma == NULL) {
|
||||
*length = strlen(str) - *offset;
|
||||
} else {
|
||||
*length = next_comma-(str+*offset);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
if(argc < 2) {
|
||||
usage(argv);
|
||||
|
@ -321,44 +54,9 @@ int main(int argc, char **argv) {
|
|||
while(!(devh=OpenProxmark(0))) { sleep(1); }
|
||||
fprintf(stderr,"Found.\n");
|
||||
|
||||
unsigned int state = EnterFlashState();
|
||||
do_flash(argv);
|
||||
|
||||
if( !(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) ) {
|
||||
fprintf(stderr, "Proxmark would not enter flash state, abort\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
offset=-1; length=0;
|
||||
int current_area = 0;
|
||||
while(find_next_area(argv[1], &offset, &length)) {
|
||||
int i;
|
||||
struct partition *p = NULL;
|
||||
for(i=0; i<sizeof(partitions)/sizeof(partitions[0]); i++) {
|
||||
if(strncmp(partitions[i].name, argv[1] + offset, length) == 0) {
|
||||
/* Check if the name matches the bootrom partition, and if so, require "bootrom" to
|
||||
* be written in full. The other names may be abbreviated.
|
||||
*/
|
||||
if(!partitions[i].precious || (strlen(partitions[i].name) == length)) {
|
||||
p = &partitions[i];
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(p == NULL) {
|
||||
fprintf(stderr, "Warning: area name '");
|
||||
fwrite(argv[1]+offset, length, 1, stderr);
|
||||
fprintf(stderr, "' unknown, ignored\n");
|
||||
} else {
|
||||
fprintf(stderr, "Flashing %s from %s\n", p->name, argv[2+current_area]);
|
||||
PrepareFlash(p, argv[2+current_area], state);
|
||||
}
|
||||
current_area++;
|
||||
}
|
||||
|
||||
UsbCommand c;
|
||||
bzero(&c, sizeof(c));
|
||||
c.cmd = CMD_HARDWARE_RESET;
|
||||
UsbCommand c = {CMD_HARDWARE_RESET};
|
||||
SendCommand(&c);
|
||||
|
||||
CloseProxmark();
|
||||
|
|
315
client/prox.c
315
client/prox.c
|
@ -10,6 +10,7 @@
|
|||
//}
|
||||
|
||||
#include "prox.h"
|
||||
#include "flash.h"
|
||||
|
||||
#define OUR_VID 0x9ac4
|
||||
#define OUR_PID 0x4b8f
|
||||
|
@ -18,6 +19,7 @@
|
|||
int offline = 0;
|
||||
HANDLE UsbHandle;
|
||||
extern unsigned int current_command;
|
||||
extern struct partition partitions[];
|
||||
|
||||
static void ShowError(void)
|
||||
{
|
||||
|
@ -27,7 +29,7 @@ static void ShowError(void)
|
|||
printf("ERROR: %s", buf);
|
||||
}
|
||||
|
||||
static BOOL UsbConnect(void)
|
||||
BOOL UsbConnect(void)
|
||||
{
|
||||
typedef void (__stdcall *GetGuidProc)(GUID *);
|
||||
typedef BOOLEAN (__stdcall *GetAttrProc)(HANDLE, HIDD_ATTRIBUTES *);
|
||||
|
@ -216,263 +218,6 @@ void SendCommand(UsbCommand *c)
|
|||
current_command = c->cmd;
|
||||
}
|
||||
|
||||
void WaitForAck(void) {
|
||||
UsbCommand ack;
|
||||
ReceiveCommand(&ack);
|
||||
if(ack.cmd != CMD_ACK) {
|
||||
printf("bad ACK\n");
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
static unsigned int ExpectedAddr;
|
||||
static BYTE QueuedToSend[256];
|
||||
static BOOL AllWritten;
|
||||
#define PHYSICAL_FLASH_START 0x100000
|
||||
|
||||
struct partition {
|
||||
int start;
|
||||
int end;
|
||||
int precious;
|
||||
const char *name;
|
||||
};
|
||||
struct partition partitions[] = {
|
||||
{0x100000, 0x102000, 1, "bootrom"},
|
||||
{0x102000, 0x110000, 0, "fpga"},
|
||||
{0x110000, 0x140000, 0, "os"},
|
||||
};
|
||||
|
||||
/* If translate is set, subtract PHYSICAL_FLASH_START to translate for old
|
||||
* bootroms.
|
||||
*/
|
||||
static void FlushPrevious(int translate)
|
||||
{
|
||||
UsbCommand c;
|
||||
memset(&c, 0, sizeof(c));
|
||||
|
||||
// printf("expected = %08x flush, ", ExpectedAddr);
|
||||
|
||||
int i;
|
||||
for(i = 0; i < 240; i += 48) {
|
||||
c.cmd = CMD_SETUP_WRITE;
|
||||
memcpy(c.d.asBytes, QueuedToSend+i, 48);
|
||||
c.arg[0] = (i/4);
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
}
|
||||
|
||||
c.cmd = CMD_FINISH_WRITE;
|
||||
c.arg[0] = (ExpectedAddr-1) & (~255);
|
||||
if(translate) {
|
||||
c.arg[0] -= PHYSICAL_FLASH_START;
|
||||
}
|
||||
printf("Flashing address: %08x\r", c.arg[0]);
|
||||
memcpy(c.d.asBytes, QueuedToSend+240, 16);
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
|
||||
AllWritten = TRUE;
|
||||
}
|
||||
|
||||
/* Where must be between start_addr (inclusive) and end_addr (exclusive).
|
||||
*/
|
||||
static void GotByte(int where, BYTE which, int start_addr, int end_addr, int translate)
|
||||
{
|
||||
AllWritten = FALSE;
|
||||
|
||||
if(where < start_addr || where >= end_addr) {
|
||||
printf("bad: got byte at %08x, outside of range %08x-%08x\n", where, start_addr, end_addr);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if(where != ExpectedAddr) {
|
||||
printf("bad: got at %08x, expected at %08x\n", where, ExpectedAddr);
|
||||
exit(-1);
|
||||
}
|
||||
QueuedToSend[where & 255] = which;
|
||||
ExpectedAddr++;
|
||||
|
||||
if((where & 255) == 255) {
|
||||
// we have completed a full page
|
||||
FlushPrevious(translate);
|
||||
}
|
||||
}
|
||||
|
||||
static int HexVal(int c)
|
||||
{
|
||||
c = tolower(c);
|
||||
if(c >= '0' && c <= '9') {
|
||||
return c - '0';
|
||||
} else if(c >= 'a' && c <= 'f') {
|
||||
return (c - 'a') + 10;
|
||||
} else {
|
||||
printf("bad hex digit '%c'\n", c);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
static BYTE HexByte(char *s)
|
||||
{
|
||||
return (HexVal(s[0]) << 4) | HexVal(s[1]);
|
||||
}
|
||||
|
||||
static void LoadFlashFromSRecords(const char *file, int start_addr, int end_addr, int translate)
|
||||
{
|
||||
ExpectedAddr = start_addr;
|
||||
|
||||
FILE *f = fopen(file, "r");
|
||||
if(!f) {
|
||||
printf("couldn't open file\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
char line[512];
|
||||
while(fgets(line, sizeof(line), f)) {
|
||||
if(memcmp(line, "S3", 2)==0) {
|
||||
char *s = line + 2;
|
||||
int len = HexByte(s) - 5;
|
||||
s += 2;
|
||||
|
||||
char addrStr[9];
|
||||
memcpy(addrStr, s, 8);
|
||||
addrStr[8] = '\0';
|
||||
unsigned int addr;
|
||||
sscanf(addrStr, "%x", &addr);
|
||||
s += 8;
|
||||
|
||||
/* Accept files that are located at PHYSICAL_FLASH_START, and files that are located at 0 */
|
||||
if(addr < PHYSICAL_FLASH_START)
|
||||
addr += PHYSICAL_FLASH_START;
|
||||
|
||||
int i;
|
||||
for(i = 0; i < len; i++) {
|
||||
while((addr+i) > ExpectedAddr) {
|
||||
GotByte(ExpectedAddr, 0xff, start_addr, end_addr, translate);
|
||||
}
|
||||
GotByte(addr+i, HexByte(s), start_addr, end_addr, translate);
|
||||
s += 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!AllWritten) FlushPrevious(translate);
|
||||
|
||||
fclose(f);
|
||||
printf("\ndone.\n");
|
||||
}
|
||||
|
||||
static int PrepareFlash(struct partition *p, const char *filename, unsigned int state)
|
||||
{
|
||||
int translate = 0;
|
||||
if(state & DEVICE_INFO_FLAG_UNDERSTANDS_START_FLASH) {
|
||||
UsbCommand c;
|
||||
c.cmd = CMD_START_FLASH;
|
||||
c.arg[0] = p->start;
|
||||
c.arg[1] = p->end;
|
||||
|
||||
/* Only send magic when flashing bootrom */
|
||||
if(p->precious) {
|
||||
c.arg[2] = START_FLASH_MAGIC;
|
||||
} else {
|
||||
c.arg[2] = 0;
|
||||
}
|
||||
SendCommand(&c);
|
||||
WaitForAck();
|
||||
translate = 0;
|
||||
} else {
|
||||
fprintf(stderr, "Warning: Your bootloader does not understand the new START_FLASH command\n");
|
||||
fprintf(stderr, " It is recommended that you update your bootloader\n\n");
|
||||
translate = 1;
|
||||
}
|
||||
|
||||
LoadFlashFromSRecords(filename, p->start, p->end, translate);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static unsigned int GetProxmarkState(void)
|
||||
{
|
||||
unsigned int state = 0;
|
||||
|
||||
UsbCommand c;
|
||||
c.cmd = CMD_DEVICE_INFO;
|
||||
SendCommand(&c);
|
||||
|
||||
UsbCommand resp;
|
||||
ReceiveCommand(&resp);
|
||||
/* Three cases:
|
||||
* 1. The old bootrom code will ignore CMD_DEVICE_INFO, but respond with an ACK
|
||||
* 2. The old os code will respond with CMD_DEBUG_PRINT_STRING and "unknown command"
|
||||
* 3. The new bootrom and os codes will respond with CMD_DEVICE_INFO and flags
|
||||
*/
|
||||
|
||||
switch(resp.cmd) {
|
||||
case CMD_ACK:
|
||||
state = DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM;
|
||||
break;
|
||||
case CMD_DEBUG_PRINT_STRING:
|
||||
state = DEVICE_INFO_FLAG_CURRENT_MODE_OS;
|
||||
break;
|
||||
case CMD_DEVICE_INFO:
|
||||
state = resp.arg[0];
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "Couldn't get proxmark state, bad response type: 0x%04X\n", resp.cmd);
|
||||
exit(-1);
|
||||
break;
|
||||
}
|
||||
|
||||
#if 0
|
||||
if(state & DEVICE_INFO_FLAG_BOOTROM_PRESENT) printf("New bootrom present\n");
|
||||
if(state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT) printf("New osimage present\n");
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) printf("Currently in bootrom\n");
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) printf("Currently in OS\n");
|
||||
#endif
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
static unsigned int EnterFlashState(void)
|
||||
{
|
||||
unsigned int state = GetProxmarkState();
|
||||
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) {
|
||||
/* Already in flash state, we're done. */
|
||||
return state;
|
||||
}
|
||||
|
||||
if(state & DEVICE_INFO_FLAG_CURRENT_MODE_OS) {
|
||||
fprintf(stderr,"Entering flash-mode...\n");
|
||||
UsbCommand c;
|
||||
bzero(&c, sizeof(c));
|
||||
|
||||
if( (state & DEVICE_INFO_FLAG_BOOTROM_PRESENT) && (state & DEVICE_INFO_FLAG_OSIMAGE_PRESENT) ) {
|
||||
/* New style handover: Send CMD_START_FLASH, which will reset the board and
|
||||
* enter the bootrom on the next boot.
|
||||
*/
|
||||
c.cmd = CMD_START_FLASH;
|
||||
SendCommand(&c);
|
||||
fprintf(stderr,"(You don't have to do anything. Press and release the button only if you want to abort)\n");
|
||||
fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
|
||||
} else {
|
||||
/* Old style handover: Ask the user to press the button, then reset the board */
|
||||
c.cmd = CMD_HARDWARE_RESET;
|
||||
SendCommand(&c);
|
||||
fprintf(stderr,"(Press and hold down button NOW if your bootloader requires it)\n");
|
||||
fprintf(stderr,"Waiting for Proxmark to reappear on USB... ");
|
||||
}
|
||||
|
||||
|
||||
Sleep(1000);
|
||||
|
||||
while(!UsbConnect()) { Sleep(1000); }
|
||||
fprintf(stderr,"Found.\n");
|
||||
|
||||
return GetProxmarkState();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void usage(char **argv)
|
||||
{
|
||||
int i;
|
||||
|
@ -480,29 +225,13 @@ static void usage(char **argv)
|
|||
printf(" %s offline\n", argv[0]);
|
||||
printf(" %s areas file.s19\n", argv[0]);
|
||||
printf(" Known areas are:");
|
||||
for(i=0; i<(sizeof(partitions)/sizeof(partitions[0])); i++) {
|
||||
for(i=0; partitions[i].name != NULL; i++) {
|
||||
fprintf(stderr, " %s", partitions[i].name);
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
/* On first call, have *offset = -1, *length = 0; */
|
||||
static int find_next_area(char *str, int *offset, int *length)
|
||||
{
|
||||
if(*str == '\0') return 0;
|
||||
if((*offset >= 0) && str[*offset + *length] == '\0') return 0;
|
||||
*offset += 1 + *length;
|
||||
|
||||
char *next_comma = strchr(str + *offset, ',');
|
||||
if(next_comma == NULL) {
|
||||
*length = strlen(str) - *offset;
|
||||
} else {
|
||||
*length = next_comma-(str+*offset);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int i = 0;
|
||||
|
@ -547,40 +276,6 @@ int main(int argc, char **argv)
|
|||
exit(-1);
|
||||
}
|
||||
|
||||
unsigned int state = EnterFlashState();
|
||||
|
||||
if( !(state & DEVICE_INFO_FLAG_CURRENT_MODE_BOOTROM) ) {
|
||||
fprintf(stderr, "Proxmark would not enter flash state, abort\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
offset=-1; length=0;
|
||||
int current_area = 0;
|
||||
while(find_next_area(argv[1], &offset, &length)) {
|
||||
int i;
|
||||
struct partition *p = NULL;
|
||||
for(i=0; i<sizeof(partitions)/sizeof(partitions[0]); i++) {
|
||||
if(strncmp(partitions[i].name, argv[1] + offset, length) == 0) {
|
||||
/* Check if the name matches the bootrom partition, and if so, require "bootrom" to
|
||||
* be written in full. The other names may be abbreviated.
|
||||
*/
|
||||
if(!partitions[i].precious || (strlen(partitions[i].name) == length)) {
|
||||
p = &partitions[i];
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(p == NULL) {
|
||||
fprintf(stderr, "Warning: area name '");
|
||||
fwrite(argv[1]+offset, length, 1, stderr);
|
||||
fprintf(stderr, "' unknown, ignored\n");
|
||||
} else {
|
||||
fprintf(stderr, "Flashing %s from %s\n", p->name, argv[2+current_area]);
|
||||
PrepareFlash(p, argv[2+current_area], state);
|
||||
}
|
||||
current_area++;
|
||||
}
|
||||
|
||||
do_flash(argv);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue