summer restructuring:
* .h include only the strict minimum for their own parsing * this forces all files to include explicitment their needs and not count on far streched dependencies * this helps Makefile to rebuild only the minimum * according to this rule, most standalone .h are now gone * big app.h is gone * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway * all unrequired include were removed * split common/ into common/ (client+arm) and common_arm/ (os+bootloader) * bring zlib to common/ * bring stuff not really/not yet used in common back to armsrc/ or client/ * bring liblua into client/ * bring uart into client/ * move some portions of code around (dbprint, protocols,...) * rename unused files into *_disabled.[ch] to make it explicit * rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash * remove PrintAndLogDevice * move deprecated-hid-flasher from client to tools * Makefiles * treat deps in armsrc/ as in client/ * client: stop on warning (-Werror), same as for armsrc/ Tested on: * all standalone modes * Linux
This commit is contained in:
1 parent
b7d412d27b
commit
d19754567d
447 files changed
+2553
-2599
No files matched your search
@@ -250,7 +250,7 @@ void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_ke
|
||||
|
||||
#ifndef ON_DEVICE
|
||||
int testMAC() {
|
||||
PrintAndLogDevice(SUCCESS, "Testing MAC calculation...");
|
||||
PrintAndLogEx(SUCCESS, "Testing MAC calculation...");
|
||||
|
||||
//From the "dismantling.IClass" paper:
|
||||
uint8_t cc_nr[] = {0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 0, 0, 0};
|
||||
@@ -262,9 +262,9 @@ int testMAC() {
|
||||
doMAC(cc_nr, div_key, calculated_mac);
|
||||
|
||||
if (memcmp(calculated_mac, correct_MAC, 4) == 0) {
|
||||
PrintAndLogDevice(SUCCESS, "MAC calculation OK!");
|
||||
PrintAndLogEx(SUCCESS, "MAC calculation OK!");
|
||||
} else {
|
||||
PrintAndLogDevice(FAILED, "FAILED: MAC calculation failed:");
|
||||
PrintAndLogEx(FAILED, "FAILED: MAC calculation failed:");
|
||||
printarr(" Calculated_MAC", calculated_mac, 4);
|
||||
printarr(" Correct_MAC ", correct_MAC, 4);
|
||||
return 1;
|
||||
|
||||
Reference in new issue
Block a user