#include <stdlib.h>
#include <string.h>
#include <stdint.h>
-#include "proxusb.h"
+//#include "proxusb.h"
#include "proxmark3.h"
#include "data.h"
#include "graph.h"
#define AddCrc(data,datalen) Iso15693AddCrc(data,datalen)
#define sprintUID(target,uid) Iso15693sprintUID(target,uid)
-static int CmdHelp(const char *Cmd);
-
// structure and database for uid -> tagtype lookups
typedef struct {
uint64_t uid;
*output=0; // reset outputstring
sprintf(output, "Block %2i ",blocknum);
for ( int i=1; i<resp.arg[0]-2; i++) { // data in hex
- sprintf(output+strlen(output),"%02hX ",recv[i]);
+ sprintf(output+strlen(output),"%02X ",recv[i]);
}
strcat(output," ");
for ( int i=1; i<resp.arg[0]-2; i++) { // data in cleaned ascii
hexout = (char *)malloc(resp.arg[0] * 3 + 1);
if (hexout != NULL) {
for (int i = 0; i < resp.arg[0]; i++) { // data in hex
- sprintf(&hexout[i * 3], "%02hX ", recv[i]);
+ sprintf(&hexout[i * 3], "%02X ", recv[i]);
}
PrintAndLog("%s", hexout);
free(hexout);
*/
int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdlen) {
int temp;
- uint8_t *req=c->d.asBytes, uid[8];
+ uint8_t *req=c->d.asBytes;
+ uint8_t uid[8] = {0};
uint32_t reqlen=0;
// strip
if (!(recv[0] & ISO15_RES_ERROR)) {
*output=0; // reset outputstring
for ( i=1; i<resp.arg[0]-2; i++) {
- sprintf(output+strlen(output),"%02hX ",recv[i]);
+ sprintf(output+strlen(output),"%02X ",recv[i]);
}
strcat(output,"\n\r");
strcat(output,"UID = ");
strcat(output,"\n\r");
i=10;
if (recv[1] & 0x01)
- sprintf(output+strlen(output),"DSFID supported, set to %02hX\n\r",recv[i++]);
+ sprintf(output+strlen(output),"DSFID supported, set to %02X\n\r",recv[i++]);
else
strcat(output,"DSFID not supported\n\r");
if (recv[1] & 0x02)
- sprintf(output+strlen(output),"AFI supported, set to %03hX\n\r",recv[i++]);
+ sprintf(output+strlen(output),"AFI supported, set to %03X\n\r",recv[i++]);
else
strcat(output,"AFI not supported\n\r");
if (recv[1] & 0x04) {
i+=2;
} else
strcat(output,"Tag does not provide information on memory layout\n\r");
- if (recv[1] & 0x08) sprintf(output+strlen(output),"IC reference given: %02hX\n\r",recv[i++]);
+ if (recv[1] & 0x08) sprintf(output+strlen(output),"IC reference given: %02X\n\r",recv[i++]);
else strcat(output,"IC reference not given\n\r");
if (!(recv[0] & ISO15_RES_ERROR)) {
*output=0; // reset outputstring
for ( int i=1; i<resp.arg[0]-2; i++) {
- sprintf(output+strlen(output),"%02hX ",recv[i]);
+ sprintf(output+strlen(output),"%02X ",recv[i]);
}
strcat(output," ");
for ( int i=1; i<resp.arg[0]-2; i++) {
*output=0; // reset outputstring
//sprintf(output, "Block %2i ",blocknum);
for ( int i=1; i<resp.arg[0]-2; i++) {
- sprintf(output+strlen(output),"%02hX ",recv[i]);
+ sprintf(output+strlen(output),"%02X ",recv[i]);
}
strcat(output," ");
for ( int i=1; i<resp.arg[0]-2; i++) {