dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrate PrintfAndLog() to PrintAndLogDevice()

Browse Source
This commit is contained in:
Brian Pow
2018-02-22 22:59:55 +08:00
parent 668b44ba26
commit a4fa0144eb
8 changed files with 107 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/loclass/cipherutils.c
View File

@@ -169,7 +169,7 @@ void printarr(char * name, uint8_t* arr, int len)
cx += snprintf(output+cx,outsize-cx,"0x%02x,",*(arr+i));//5 bytes per byte
}
cx += snprintf(output+cx,outsize-cx,"};");
PrintfAndLog(output);
PrintAndLogDevice(NORMAL, output);
free(output);
}
@@ -187,7 +187,7 @@ void printvar(char * name, uint8_t* arr, int len)
cx += snprintf(output+cx,outsize-cx,"%02x",*(arr+i));//2 bytes per byte
}
PrintfAndLog(output);
PrintAndLogDevice(NORMAL, output);
free(output);
}
@@ -207,7 +207,7 @@ void printarr_human_readable(char * title, uint8_t* arr, int len)
cx += snprintf(output+cx,outsize-cx,"\n%02x| ", i );
cx += snprintf(output+cx,outsize-cx, "%02x ",*(arr+i));
}
PrintfAndLog(output);
PrintAndLogDevice(NORMAL, output);
free(output);
}
@@ -231,14 +231,14 @@ int testBitStream()
}
if(memcmp(input, output, sizeof(input)) == 0)
{
PrintfAndLog(" Bitstream test 1 ok");
PrintAndLogDevice(SUCCESS, " Bitstream test 1 ok");
}else
{
PrintfAndLog(" Bitstream test 1 failed");
PrintAndLogDevice(FAILED, " Bitstream test 1 failed");
uint8_t i;
for(i = 0 ; i < sizeof(input) ; i++)
{
PrintfAndLog(" IN %02x, OUT %02x", input[i], output[i]);
PrintAndLogDevice(NORMAL, " IN %02x, OUT %02x", input[i], output[i]);
}
return 1;
}
@@ -265,14 +265,14 @@ int testReversedBitstream()
}
if(memcmp(input, output, sizeof(input)) == 0)
{
PrintfAndLog(" Bitstream test 2 ok");
PrintAndLogDevice(SUCCESS, " Bitstream test 2 ok");
}else
{
PrintfAndLog(" Bitstream test 2 failed");
PrintAndLogDevice(FAILED, " Bitstream test 2 failed");
uint8_t i;
for(i = 0 ; i < sizeof(input) ; i++)
{
PrintfAndLog(" IN %02x, MIDDLE: %02x, OUT %02x", input[i],reverse[i], output[i]);
PrintAndLogDevice(NORMAL, " IN %02x, MIDDLE: %02x, OUT %02x", input[i],reverse[i], output[i]);
}
return 1;
}
@@ -282,7 +282,7 @@ int testReversedBitstream()
int testCipherUtils(void)
{
PrintfAndLog("[+] Testing some internals...");
PrintAndLogDevice(INFO, "Testing some internals...");
int retval = 0;
retval |= testBitStream();
retval |= testReversedBitstream();