Commit Graph
24 Commits
Author SHA1 Message Date
ANTodorov bd803ce8fd rework to use smart SPI flash detection
Check JEDEC ID is in range between 0x0001 ... 0xFFFE,
Compare the output from 0x90 and 0x9F,
Then the size from the JEDEC ID

Otherwise fall-back to 256 kB

Extend the spi_flash_decode.py to handle more (known) SPI flash ICs
2024-12-03 09:40:57 +02:00
ANTodorov 639f16ba3b added JEDEC information for SPI flash W25Q64JV
added some "extrapolated" but logical matches by Manufacturer/Device ID only

some reordering
2024-11-28 11:04:32 +02:00
ANTodorov 99d5a72879 fixed symlink name in mem spiffs tree
the used strtok(...,".")` is cutting the name to the first dot
linkname.txt.lnk -> linkname

with the fix it is
linkname.txt.lnk -> linkname.txt
2024-11-21 14:28:39 +02:00
ANTodorov 7b99bfa3d6 fix reported file/link names when mem spiffs wipe 2024-11-21 12:31:48 +02:00
ANTodorov 76aaef96cc rework addressing the review comments
Reverted 'mfr_id' to 'manufacturer_id'
Moved devices table definition to flashmem.h
Single global variable 'spi_flash_pages64k'
The local structure holding the actual device data is used in firmware.c only

difference in code:
```
   text    data     bss     dec     hex filename
 223189  138560    6067  367816   59cc8 ./armsrc/obj/fullimage.elf <-- c9e751d darkside: fix backdoor support

 223437  138624    6075  368136   59e08 ./armsrc/obj/fullimage.elf <-- this commit
 ======================================
   +248     +64      +8    +320
```
2024-11-20 14:10:02 +02:00
Anton Todorov 3b6530cb92 Merge branch 'RfidResearchGroup:master' into spi_flash_v2 2024-11-20 13:41:57 +02:00
ANTodorov f3fa732062 refactor spi flash detection 2024-11-19 09:35:26 +02:00
ANTodorov 68e354d7ef fix failed spi flash detection
fallback to 4 pages when SPI IC is unknown
some code styling
remove some unused code
2024-11-18 11:45:21 +02:00
ANTodorov 51a94d6d51 restore config page (the last page) protection from wiping 2024-11-17 23:56:40 +02:00
ANTodorov 597bfd6d19 fix signature offset in a log message too
hopefully last one (tm)
2024-11-17 22:38:59 +02:00
ANTodorov d49e1f6af6 remove unused definition 2024-11-17 22:16:43 +02:00
ANTodorov 861c7efd26 fix missing offsets
the data was written, but it should be readable too...
2024-11-17 22:16:35 +02:00
ANTodorov 34e317a9df address review comments 2024-11-17 22:07:58 +02:00
ANTodorov 48ec109a1e use all spi flash v0.1
* introduced a new communication command CMD_FLASHMEM_PAGES64K to get the number of 64k pages
* "the last page" is a special, holding the dicts and some other stuff, relocated to there
* raised timeout when wiping a mem page (W25Q16 looks a bit slower than W25X20BV)
* loop all pages in Flash_WipeMemory()
2024-11-17 19:03:15 +02:00
Anton Todorov b6fc000405 revert opensuse-leap docker to default Python 3.6
forgot to revert the opensuse-leap/Dockerfile changes when reworking commit https://github.com/RfidResearchGroup/proxmark3/commit/39c846ada4832a874a1744bc45851b385857f6cb


Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
2024-11-14 16:24:48 +01:00
ANTodorov f3e9a79ca4 add option to build against non-default python3 package 2024-11-14 09:01:41 +01:00
ANTodorov 71b354043e fix em4x50_read function
affected `lf search` and `lf em 4x50 rdbl -b <blk>`
2024-10-16 19:10:41 +03:00
Anton Todorov bdaa6d2852 Update spi_flash_decode.py
add some more SPI devices

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
2024-10-16 16:36:36 +03:00
ANTodorov f0862c9ee2 add a helper script to decode SPI flash JEDEC data
Signed-off-by: ANTodorov <ANTodorov@users.noreply.github.com>
2024-10-02 19:33:27 +03:00
ANTodorov 7ffab48e77 show SPI flash JEDEC data
Signed-off-by: ANTodorov <ANTodorov@users.noreply.github.com>
2024-10-02 14:11:34 +03:00
Anton Todorov 26fe583a80 hf mfu pwdgen with 4byte uid should adapt to 7 byte
Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
2024-09-30 16:56:14 +03:00
Anton Todorov 047039aed7 Update CHANGELOG.md
add line for the `hf mfu pwdgen` fix

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
2024-09-30 16:30:57 +03:00
Anton Todorov 0733754968 fix hf mfu pwdgen for 7 byte uid
The last 3 bytes of the 7 byte uid are zeroed out
Tested with the example from the forum http://www.proxmark.org/forum/viewtopic.php?pid=44238#p44238

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
2024-09-30 16:25:00 +03:00
Anton Todorov 6781dadc30 emv: display the transaction time as HH:MM:SS
in the transaction log

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
2023-08-06 14:27:58 +03:00