github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

updates from make style

Browse source
This commit is contained in:
Henry Gabryjelski 2023-02-17 17:27:07 -08:00
commit 48ca513a96
8 changed files with 16 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/appmain.c
View file

@ -2684,7 +2684,7 @@ void __attribute__((noreturn)) AppMain(void) {
if (FlashInit()) { if (FlashInit()) {
uint64_t flash_uniqueID = 0; uint64_t flash_uniqueID = 0;
if (!Flash_CheckBusy(BUSY_TIMEOUT)) { // OK because firmware was built for devices with flash if (!Flash_CheckBusy(BUSY_TIMEOUT)) { // OK because firmware was built for devices with flash
Flash_UniqueID((uint8_t*)(&flash_uniqueID)); Flash_UniqueID((uint8_t *)(&flash_uniqueID));
} }
FlashStop(); FlashStop();
usb_update_serial(flash_uniqueID); usb_update_serial(flash_uniqueID);

2
bootrom/bootrom.c
View file

@ -225,7 +225,7 @@ static void flash_mode(void) {
#ifdef WITH_FLASH #ifdef WITH_FLASH
if (FlashInit()) { // checks for existence of flash also ... OK because bootrom was built for devices with flash if (FlashInit()) { // checks for existence of flash also ... OK because bootrom was built for devices with flash
uint64_t flash_uniqueID = 0; uint64_t flash_uniqueID = 0;
Flash_UniqueID((uint8_t*)&flash_uniqueID); Flash_UniqueID((uint8_t *)&flash_uniqueID);
FlashStop(); FlashStop();
usb_update_serial(flash_uniqueID); usb_update_serial(flash_uniqueID);
} }

2
client/src/cmdhficlass.c
View file

@ -1407,7 +1407,7 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
case DES: case DES:
case RFU: case RFU:
case None: case None:
// Nothing to do for None anyway... // Nothing to do for None anyway...
default: default:
continue; continue;
} }

2
common_arm/flashmem.c
View file

@ -367,7 +367,7 @@ void Flashmem_print_status(void) {
uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
Flash_UniqueID(uid); Flash_UniqueID(uid);
Dbprintf( " Unique ID............... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X"), Dbprintf(" Unique ID............... " _YELLOW_("0x%02X%02X%02X%02X%02X%02X%02X%02X"),
uid[7], uid[6], uid[5], uid[4], uid[7], uid[6], uid[5], uid[4],
uid[3], uid[2], uid[1], uid[0] uid[3], uid[2], uid[1], uid[0]
); );

46
common_arm/flashmem.h
View file

@ -112,56 +112,10 @@ uint16_t FlashSendLastByte(uint32_t data);
#ifndef AS_BOOTROM #ifndef AS_BOOTROM
// Bootrom does not require these functions.
// Wrap in #ifndef to avoid accidental bloat of bootrom
// Bootrom needs only enough to get uniqueID from flash.
// It calls three functions. Full call trees listed:
//
// FlashInit()
// |
// \____ FlashSetup()
// | \____ leaf
// |
// \____ StartTicks()
// | \____ leaf
// |
// \____ Flash_CheckBusy() [*]
// | \____ WaitUS()
// | | \____ WaitTicks()
// | | \____ leaf
// | |
// | \____ StartCountUS()
// | | \____ leaf
// | |
// | \____ GetCountUS()
// | | \____ leaf
// | |
// | \____ Flash_ReadStat1()
// | \____ FlashSendByte()
// | | \____ leaf
// | |
// | \____ FlashSendLastByte()
// | \____ FlashSendByte()
// | \____ leaf
// |
// \____ StopTicks()
// \____ leaf
//
// Flash_UniqueID()
// \____ FlashCheckBusy() (see FlashInit)
// \____ FlashSendByteByte() (see FlashInit)
// \____ FlashSendByteLastByte() (see FlashInit)
//
//
// FlashStop() [*]
void FlashmemSetSpiBaudrate(uint32_t baudrate); void FlashmemSetSpiBaudrate(uint32_t baudrate);
bool Flash_WaitIdle(void); bool Flash_WaitIdle(void);
void Flash_TransferAdresse(uint32_t address); void Flash_TransferAdresse(uint32_t address);
void Flash_WriteEnable(void); void Flash_WriteEnable(void);
bool Flash_WipeMemoryPage(uint8_t page); bool Flash_WipeMemoryPage(uint8_t page);
bool Flash_WipeMemory(void); bool Flash_WipeMemory(void);

2
common_arm/ticks.c
View file

@ -20,7 +20,7 @@
#include "proxmark3_arm.h" #include "proxmark3_arm.h"
#ifndef AS_BOOTROM #ifndef AS_BOOTROM
#include "dbprint.h" #include "dbprint.h"
#endif #endif

14
common_arm/usb_cdc.c
View file

@ -405,16 +405,16 @@ void usb_update_serial(uint64_t newSerialNumber) {
// Descriptor is, effectively, initially identical to non-unique serial // Descriptor is, effectively, initially identical to non-unique serial
// number because it reports the shorter length in the first byte. // number because it reports the shorter length in the first byte.
// Convert uniqueID's eight bytes to 16 unicode characters in the // Convert uniqueID's eight bytes to 16 unicode characters in the
// descriptor and, finally, update the descriptor's length, which // descriptor and, finally, update the descriptor's length, which
// causes the serial number to become visible. // causes the serial number to become visible.
for (uint8_t i = 0; i < 8; i++) { for (uint8_t i = 0; i < 8; i++) {
// order of nibbles chosen to match display order from `hw status` // order of nibbles chosen to match display order from `hw status`
uint8_t nibble1 = (newSerialNumber >> ((8*i) + 4)) & 0xFu; // bitmasks [0xF0, 0xF000, 0xF00000, ... 0xF000000000000000] uint8_t nibble1 = (newSerialNumber >> ((8 * i) + 4)) & 0xFu; // bitmasks [0xF0, 0xF000, 0xF00000, ... 0xF000000000000000]
uint8_t nibble2 = (newSerialNumber >> ((8*i) + 0)) & 0xFu; // bitmasks [0x0F, 0x0F00, 0x0F0000, ... 0x0F00000000000000] uint8_t nibble2 = (newSerialNumber >> ((8 * i) + 0)) & 0xFu; // bitmasks [0x0F, 0x0F00, 0x0F0000, ... 0x0F00000000000000]
char c1 = nibble1 < 10 ? '0' + nibble1 : 'A' + (nibble1-10); char c1 = nibble1 < 10 ? '0' + nibble1 : 'A' + (nibble1 - 10);
char c2 = nibble2 < 10 ? '0' + nibble2 : 'A' + (nibble2-10); char c2 = nibble2 < 10 ? '0' + nibble2 : 'A' + (nibble2 - 10);
StrSerialNumber[46-(4*i)] = c1; // [ 46, 42, .., 22, 18 ] StrSerialNumber[46 - (4 * i)] = c1; // [ 46, 42, .., 22, 18 ]
StrSerialNumber[48-(4*i)] = c2; // [ 48, 44, .., 24, 20 ] StrSerialNumber[48 - (4 * i)] = c2; // [ 48, 44, .., 24, 20 ]
} }
StrSerialNumber[0] = USB_STRING_DESCRIPTOR_SERIAL_NUMBER_LENGTH; StrSerialNumber[0] = USB_STRING_DESCRIPTOR_SERIAL_NUMBER_LENGTH;
} }

9
doc/commands.json
View file

@ -3099,10 +3099,9 @@
"--fc <dec> facility code", "--fc <dec> facility code",
"--cn <dec> card number", "--cn <dec> card number",
"-w, --wiegand <format> see `wiegand list` for available formats", "-w, --wiegand <format> see `wiegand list` for available formats",
"--shallow use shallow (ASK) reader modulation instead of OOK", "--shallow use shallow (ASK) reader modulation instead of OOK"
"-v verbose (print encoded blocks)"
], ],
"usage": "hf iclass encode [-hv] [--bin <bin>] --ki <dec> [--credit] [--elite] [--raw] [--enckey <hex>] [--fc <dec>] [--cn <dec>] [-w <format>] [--shallow]" "usage": "hf iclass encode [-h] [--bin <bin>] --ki <dec> [--credit] [--elite] [--raw] [--enckey <hex>] [--fc <dec>] [--cn <dec>] [-w <format>] [--shallow]"
}, },
"hf iclass encrypt": { "hf iclass encrypt": {
"command": "hf iclass encrypt", "command": "hf iclass encrypt",
@ -11507,7 +11506,7 @@
}, },
"script help": { "script help": {
"command": "script help", "command": "script help",
"description": "This is a feature to run Lua/Cmd scripts. You can place scripts within the luascripts/cmdscripts folders. --------------------------------------------------------------------------------------- script list available offline: yes", "description": "This is a feature to run Lua/Cmd/Python scripts. You can place scripts within the luascripts/cmdscripts/pyscripts folders. --------------------------------------------------------------------------------------- script list available offline: yes",
"notes": [], "notes": [],
"offline": true, "offline": true,
"options": [], "options": [],
@ -11904,6 +11903,6 @@
"metadata": { "metadata": {
"commands_extracted": 749, "commands_extracted": 749,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-02-11T10:42:29" "extracted_on": "2023-02-18T01:26:44"
} }
} }