Merge branch 'master' into master

Signed-off-by: Iceman <[email protected]>

CHANGELOG.md

@@ -4,20 +4,23 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [unreleased][unreleased]
 - Added simulation function to `hf iclass legrec` (@antiklesys)
-- Fixed symlink name in `mem spiffs tree` (@ANTodorov)
-- Fixed reported file/link names when `mem spiffs wipe` (ANTodorov)
+
+## [Orca.4.19552][2024-11-22]
+- Fixed `hf_legic.lua` - removed bit32 commands from the script (@diorch1968)
+- Fixed `mem spiffs tree` - now show correct symlink name (@ANTodorov)
+- Fixed `mem spiffs wipe` - reported file/link names is now correct  (@ANTodorov)
 - Updated atrs list (@iceman1001)
 - Added support for a new KDF (@iceman1001)
 - Added Inner range aid and mad entries (@iceman1001)
 - Changed `mem spiffs` - Use all available space in SPI flash (@ANTodorov)
-- Fixed wrong size check in MifareSim (@iceman1001)
+- Fixed `hf mf sim` - wrong size check in MifareSim (@iceman1001)
 - Fixed `hf mf sim` not to respond to authentication attempts for sectors out of bound for selected Mifare type (@piotrva)
 - Added option to build against non-default python3 with CMake as well (@doegox)
 - Added option to build against non-default python3 with Makefile (@ANTodorov)
 - Changed `hf 14a info` `hf mf info` - now detects FM1216-137 CPU cards (@iceman1001)
-- Changed `hf iclass configcard` expanding the list of available options and functionalities (@antiklesys)
+- Changed `hf iclass configcard` - expanding the list of available options and functionalities (@antiklesys)
 - Fixed `intertic.py` - missing comma in array (@iceman1001)
-- Added improved algorithm for `hf iclass legrec` leveraging reduced entropy from hash0 constraints (@antiklesys)
+- Changed `hf iclass legrec` - improved algorithm leveraging reduced entropy from hash0 constraints (@antiklesys)
 - Fixed `hf iclass configcard` when generating elite or keyroll elite configcards for Rev.C legacy readers (@antiklesys)
 - Changed `hf mf c*` - now accepts a --gdm flag to write using uscuid/gdm 20/23 alt magic wakeup (@nvx)
 - Changed `pm3_console()` - Python/Lua/C: replace `passthru` by `capture` and `quiet` (@doegox)
@@ -27,12 +30,12 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Changed `hf iclass legrec` - updated script implementation to ensure functionality (@antiklesys)
 - Added recovered iclass custom key to dictionary (@antiklesys)
 - Added support for all Hitag S response protocol mode (@douniwan5788)
-- Fixed 'hf_young.c' - flags declaration was missing a semicolon (@jakkpotts)
+- Fixed `hf_young` - flags declaration was missing a semicolon (@jakkpotts)
 - Changed `hf mf sim` - add option to allow key b to be used even if readable (@doegox)
 - Changed `data num` - outputed binary strings are now properly zero padded (@iceman1001)
 - Changed `hf iclass info` - now tries default keys and decode if legacy (@iceman1001)
 - Changed `hf iclass chk` - now loads dictionary file by default (@iceman1001)
-- Added an Makefile variable `DONT_BUILD_NATIVE` in mfd_aes_brute Makefile to easify downstream package
+- Added Makefile variable `DONT_BUILD_NATIVE` in mfd_aes_brute Makefile to easify downstream package (@Cryolitia)
 - Auto detect whether compile option `march=native` is supported for mfd_aes_brute Makefile
 - Changed `hf mf sim` - support data-first and nested reader attacks (@doegox)
 - Fixed `lf search` and `lf em 4x50 rdbl -b <blk>` does not coredump reading EM4450 tag (@ANTodorov)
@@ -46,14 +49,14 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Added `hf 14b setuid` - set uid on magic 14b tag (@iceman1001)
 - Changed `hf 14b info` - now detect Tiananxin (@iceman1001)
 - Fixed `lf em 410x brute` - better filehandling and memory handling (@iceman1001)
-- Changed split PacketResponseNG status into status and reason(@douniwan5788)
-- add a helper script to decode JEDEC data `script run spi_flash_decode` (@ANTodorov)
-- show SPI flash JEDEC Manufacturer ID and Device ID in `hw status` output (@ANTodorov)
-- Improved `hf iclass configcards` to support generating config cards using a different key than the default k0 as the card's key (@antiklesys)
+- Changed split PacketResponseNG status into status and reason (@douniwan5788)
+- Added `spi_flash_decode.py` - helper script to decode JEDEC data (@ANTodorov)
+- Changed `hw status` - now show SPI flash JEDEC Manufacturer ID and Device ID in output (@ANTodorov)
+- Changed `hf iclass configcards` to support generating config cards using a different key than the default k0 as the card's key (@antiklesys)
 - Added maur keys (@iceman1001)
 - Fixed `hf mfu pwdgen` for the 7 byte UID (@ANTodorov)
 - Added `hf iclass unhash` command to reverse an iclass diversified key to hash0 pre-images (@antiklesys)
-- Added crypto1 support to `hf 14a raw` (@doegox)
+- Changed `hf 14a raw` - now supports crypto  (@doegox)
 - Changed `hw version` command to print LUA and Python versions (@jmichelp)
 - Updated LUA to v5.4.7 which adds utf-8 support (@jmichelp)
 - Moved `lf hitag sim --hts` -> `lf hitag hts sim` (@douniwan5788)
@@ -71,11 +74,11 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Added detection for FM11NT021 (@iceman1001)
 - Added detection of a magic NTAG 215 (@iceman1001)
 - Fixed hardnested on AVX512F #2410 (@xianglin1998)
-- Added `hf 14a aidsim` - simulates a PICC (like `14a sim`), and allows you to respond to specific AIDs and getData responses (@evildaemond)
+- Added `hf 14a aidsim` - simulates a PICC and allows you to respond to specific AIDs and getData responses (@evildaemond)
 - Fixed arguments for `SimulateIso14443aTag` and `SimulateIso14443aInit` in `hf_young.c`, `hf_aveful.c`, `hf_msdsal.c`, `hf_cardhopper.c`, `hf_reblay.c`, `hf_tcprst.c` and `hf_craftbyte.c` (@archi)
 - Added `mf_backdoor_dump.py` script that dumps FM11RF08S and similar (Mifare Classic 1k) tag data that can be directly read by known backdoor keys. (@Aptimex)
 - Added keys for Metro Q transit cards in Huston, TX. (@Anarchothulhu)
-- Add new Mifare Classic keys from MifareClassicTool and Flipper projects. (@onovy)
+- Added keys from MifareClassicTool and Flipper projects. (@onovy)
 
 ## [Backdoor.4.18994][2024-09-10]
 - Changed flashing messages to be less scary (@iceman1001)

client/luascripts/hf_legic.lua

@@ -499,7 +499,7 @@ end
 function segmentsToTag(bytes, tag)
   if(#bytes>23) then
     local start=23
-    local i=-1   
+    local i=-1
     if (istable(tag)) then
       repeat
         i=i+1
@@ -1768,7 +1768,7 @@ function getSegmentData(bytes, start, index)
       -- wrp (write proteted) = byte 2
       segment.WRP = tonumber(bytes[start+2],16)
       -- wrc (write control) - bit 4-6 of byte 3
-            --segment.WRC = bbit("0x"..bytes[start+3],4,3)      
+            --segment.WRC = bbit("0x"..bytes[start+3],4,3)
       segment.WRC = (tonumber(bytes[start+3], 16) >> 4) & 0x07
       -- rd (read disabled) - bit 7 of byte 3
             --segment.RD = bbit("0x"..bytes[start+3],7,1)