This commit is contained in:
iceman1001 2025-05-28 20:54:05 +02:00
commit 18e4c072e7
4 changed files with 8 additions and 6 deletions

View file

@ -160,7 +160,7 @@ static uint8_t CalculateCheckSum(uint8_t data[SAFLOK_BASIC_ACCESS_BYTE_NUM]) {
} }
// Function to parse and print Saflok data // Function to parse and print Saflok data
static void ParseAndPrintSaflokData(const sector_t* sector0_info, const sector_t* sector1_info) { static void ParseAndPrintSaflokData(const sector_t *sector0_info, const sector_t *sector1_info) {
(void)sector1_info; // Not directly used for payload parsing currently (void)sector1_info; // Not directly used for payload parsing currently
if (!sector0_info) { if (!sector0_info) {
@ -4806,7 +4806,7 @@ void printKeyTableEx(size_t sectorscnt, sector_t *e_sector, uint8_t start_sector
_YELLOW_("H") ":Hardnested / " _YELLOW_("H") ":Hardnested / "
_YELLOW_("C") ":statiCnested / " _YELLOW_("C") ":statiCnested / "
_YELLOW_("A") ":keyA " _YELLOW_("A") ":keyA "
" )" " )"
); );
if (sectorscnt == 18) { if (sectorscnt == 18) {
PrintAndLogEx(INFO, "( " _MAGENTA_("*") " ) These sectors used for signature. Lays outside of user memory"); PrintAndLogEx(INFO, "( " _MAGENTA_("*") " ) These sectors used for signature. Lays outside of user memory");
@ -10568,7 +10568,7 @@ static int CmdHF14AMfBambuKeys(const char *Cmd) {
PrintAndLogEx(INFO, "-----------------------------------"); PrintAndLogEx(INFO, "-----------------------------------");
uint8_t keys[32 * 6]; uint8_t keys[32 * 6];
mfc_algo_bambu_all(uid, (void*)keys); mfc_algo_bambu_all(uid, (void *)keys);
for (int block = 0; block < 32; block++) { for (int block = 0; block < 32; block++) {
PrintAndLogEx(INFO, "%d: %012" PRIX64, block, bytes_to_num(keys + (block * 6), 6)); PrintAndLogEx(INFO, "%d: %012" PRIX64, block, bytes_to_num(keys + (block * 6), 6));

View file

@ -356,7 +356,7 @@ const static vocabulary_t vocabulary[] = {
{ 0, "hf mf fchk" }, { 0, "hf mf fchk" },
{ 1, "hf mf decrypt" }, { 1, "hf mf decrypt" },
{ 0, "hf mf supercard" }, { 0, "hf mf supercard" },
{ 1, "hf mf blgen" }, { 1, "hf mf bambukeys" },
{ 0, "hf mf auth4" }, { 0, "hf mf auth4" },
{ 1, "hf mf acl" }, { 1, "hf mf acl" },
{ 0, "hf mf dump" }, { 0, "hf mf dump" },

View file

@ -13371,6 +13371,6 @@
"metadata": { "metadata": {
"commands_extracted": 768, "commands_extracted": 768,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2025-05-27T08:11:15" "extracted_on": "2025-05-28T18:50:22"
} }
} }

View file

@ -272,7 +272,9 @@ static uint64_t **unpredictable_nested(NtpKs1List *pNKL, uint32_t keyCounts[]) {
pthread_cond_wait(&status_cond, &status_mutex); pthread_cond_wait(&status_cond, &status_mutex);
activeThreads = 0; activeThreads = 0;
for (int i = 0; i < NUM_THREADS; i++) { for (int i = 0; i < NUM_THREADS; i++) {
if (thread_status[i]) activeThreads++; if (thread_status[i]) {
activeThreads++;
}
} }
} }