Commit Graph

19538 Commits

Author SHA1 Message Date
iceman1001 f1e6cd8a4c style 2024-11-21 00:38:02 +01:00
Iceman 84f491776b Merge pull request #2647 from ry4000/master
Added PACS AID and Updated PT AID
2024-11-21 00:36:53 +01:00
iceman1001 effb9f4030 update atrs list 2024-11-21 00:36:24 +01:00
ry4000 266afd19a9 Added PACS AID and Updated PT AID
- Added MOBOTIX AID.
- Updated JFK OMNY AID to add BMW Digital Key as an alternative AID use.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2024-11-21 10:15:21 +11:00
iceman1001 ab676287d2 fix breaking builds 2024-11-20 23:48:14 +01:00
iceman1001 2ad635ce57 style 2024-11-20 23:32:02 +01:00
iceman1001 0a7ebcf3e3 text 2024-11-20 23:13:42 +01:00
Iceman 7e041cc585 Merge pull request #2643 from ANTodorov/spi_flash_v2
refactor spi flash detection
2024-11-20 15:48:17 +01: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
Philippe Teuwen d3e02092f7 Makefile: display firmware size 2024-11-20 11:13:53 +01:00
iceman1001 dd6d9ea5ee forget to update cmake 2024-11-20 09:44:05 +01:00
iceman1001 86e8792f34 minor textual changes \n and added support for bambu kdf. 2024-11-20 01:49:45 +01:00
Iceman 328c0b5f07 Merge pull request #2645 from onovy/master
Add new Mifare Classic keys from MifareClassicTool project
2024-11-19 23:13:03 +01:00
Ondřej Nový d6c966ac4b Add new Mifare Classic keys from Flipper project 2024-11-19 22:57:48 +01:00
Ondřej Nový e205829af2 Add new Mifare Classic keys from MifareClassicTool project. 2024-11-19 22:45:28 +01:00
Iceman 381440f31f Merge pull request #2644 from Anarchothulhu/master
Added keys to mfc_default_keys.dic from Metro Q cards from Huston, TX.
2024-11-19 18:11:26 +01:00
Korin 5c9783cdc4 Removing duplicate keys. 2024-11-19 10:08:36 -07:00
Korin a54a59998b Updating CHANGELOG.md to reflect added keys. 2024-11-19 09:50:06 -07:00
Korin 18805ccb01 Added keys to mfc_default_keys.dic from Metro Q cards from Huston, TX. 2024-11-19 09:38:16 -07:00
Iceman ef43a94d8f Merge pull request #2641 from ry4000/master
Updated Inner Range AID and Added PT AIDs
2024-11-19 10:46:13 +01:00
ANTodorov f3fa732062 refactor spi flash detection 2024-11-19 09:35:26 +02:00
ry4000 3c6d126706 Update aid_desfire.json
Fixed typo

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2024-11-19 08:43:45 +11:00
ry4000 ea7ace0ad2 Update Inner Range AID and Added PT AIDs aid_desfire.json
- Updated Inner Range AID's
 - Vendor to include company's legal name
 - Name for stylisation
- Added DEN MyRide
- Added GDL Mi Movilidad

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2024-11-19 08:43:26 +11:00
Iceman fced857f1f Merge pull request #2639 from ANTodorov/fix_unknown_flash
fix failed spi flash detection
2024-11-18 17:21:12 +01:00
iceman1001 024f7c507f updated with a inner range AU entry 2024-11-18 16:58:15 +01: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
Iceman 52c46db3db Merge pull request #2638 from ANTodorov/use_all_flash
use all spi flash v0.1
2024-11-18 09:45:42 +01: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
Philippe Teuwen c9e751d27d darkside: fix backdoor support 2024-11-17 00:23:06 +01:00
Philippe Teuwen 6c8a4972b1 mfd_aes_brute: fix deprecated flags warning & stop showinfo photobombing 2024-11-15 23:04:32 +01:00
iceman1001 3907be8017 fixing the other loop types 2024-11-15 19:28:36 +01:00
iceman1001 669644ce1b fix warning 2024-11-15 17:46:35 +01:00
iceman1001 801c4a15e1 returns 0xFFFF but we assign it to 0xFF.. better to make it clear 2024-11-15 14:58:33 +01:00
iceman1001 2e4d02abc0 len was another type, so to make sure... 2024-11-15 14:58:06 +01:00
iceman1001 37383d86b9 adding of larger than uint8_t value in available gets truncated 2024-11-15 14:51:54 +01:00
iceman1001 3a3ea75d12 style 2024-11-15 14:28:14 +01:00
iceman1001 51ecdeb511 now uses the correct realloc pattern with testing the reallocated pointer before assigning 2024-11-15 14:10:34 +01:00
iceman1001 d398576fc7 the 14a sim had a wrong size check of the irats pointer instead of actual size. Only way around it was to add the length at function call 2024-11-15 13:27:39 +01:00
Iceman cd96bcfa68 Merge pull request #2636 from piotrva/hf-mf-sim-no-answer-sec-out-of-range
Do not respond to mifare simulation sectors out of bounds
2024-11-15 13:20:34 +01:00
Piotr Rzeszut a9c10c872e Changed max sector for AUTH to be executed only once and result cached in local variable 2024-11-15 13:13:48 +01:00
Piotr Rzeszut 606c3ac0de Update changelog to include information about fix for hf mf sim command not to respond for auth attempts out of bounds 2024-11-15 02:39:19 +01:00
Piotr Rzeszut 18db45b00e mifare simulation: do not respond for authentication attempts for sectors out of range for selected mifare type
Resolves #2635
2024-11-15 02:32:20 +01:00
iceman1001 133fe505f6 remove debug 2024-11-14 22:14:41 +01: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