Commit Graph

19652 Commits

Author SHA1 Message Date
Philippe Teuwen 67ee460137 limit hf st suggstion to st25ta, if STA 2024-12-15 15:16:07 +01:00
Philippe Teuwen a4b595c79b got DESFire Light with that pk... 2024-12-15 15:14:17 +01:00
Philippe Teuwen 571ac28229 st25ta02kb getsignature: handle locked tags 2024-12-15 14:02:52 +01:00
Philippe Teuwen c9f2c17841 relax ecdsa_publickey_ng_t, should help MacOS compilation 2024-12-14 14:53:08 +01:00
Philippe Teuwen 86de7f512c rcovered_pk: fix c/h for partial in selftests 2024-12-14 14:39:34 +01:00
Philippe Teuwen f26727eb28 Refactor originality checks. Notes:
- removed pk "NTAG424DNA, NTAG424DNATT, DESFire Light Ev2", "04B304...3B" which is a typo of "DESFire Ev2", "04B3...3A"},
- MIKRON pk currently not used because I don't know if it's for MFC, MFUL or sth else
- ST25TN pk added but currently not used, need to be implemented/tested
- ST25TV pk currently not used, need to be implemented/tested
2024-12-14 14:29:50 +01:00
Philippe Teuwen 93639e16a5 recover_pk selftests: show curve & hash 2024-12-14 02:17:39 +01:00
Philippe Teuwen 16424a83c9 recover_pk Flake8 ignore E501 2024-12-13 11:47:38 +01:00
Philippe Teuwen 0e819f75a4 UL AES alt pk 2024-12-13 10:32:07 +01:00
Iceman 118dc684e5 Merge pull request #2687 from noproto/master
Remove condition duplicated in PR #2530
2024-12-12 07:07:36 +01:00
Nathan N d965d5064e Remove duplicated condition
Signed-off-by: Nathan N <noproto@users.noreply.github.com>
2024-12-12 00:25:44 -05:00
iceman1001 9cdef9ceb4 updated the uniq.yaml workflow to be case insensitive 2024-12-11 10:09:00 +01:00
Iceman dbf50c690f Merge pull request #2686 from Willy-JL/remove-duped-keys
Remove duplicate keys
2024-12-11 08:58:30 +01:00
WillyJL 11848a521e Remove duplicate keys
Signed-off-by: WillyJL <49810075+Willy-JL@users.noreply.github.com>
2024-12-10 05:20:26 +01:00
Philippe Teuwen a13b1db49f make style 2024-12-09 15:16:46 +01:00
Philippe Teuwen 09b31b5978 hf mfp info: fix support for real 4b cards 2024-12-09 14:41:51 +01:00
Iceman e9d55ec26c Merge pull request #2684 from piotrva/flash-mifare-keys-extension
Fix: SPI flash area for Mifare keys extended from 2047 to 4095 keys - not all sectors are erased
2024-12-09 09:48:40 +01:00
Iceman b274334bc6 Merge pull request #2685 from ry4000/master
R&Y: Added BDL Go CT and CMH COTA Smartcard AIDs to aid_desfire.json
2024-12-09 09:48:08 +01:00
ry4000 6de7bd2cba R&Y: Added BDL Go CT and CMH COTA Smartcard AIDs to aid_desfire.json
Added with thanks to TheDingo8MyBaby:
- BDL Go CT AID
- CMH COTA Smartcard AID

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2024-12-08 15:14:05 +11:00
Piotr Rzeszut 0e0dcf4f4e Fix memory erase before writing keys dictionaries for SPI flash with different page number than 4 - always erase on the last page. 2024-12-07 16:48:59 +01:00
Piotr Rzeszut d46bff7582 Reverting change in Changelog.md commited by repo missynchronization. 2024-12-07 13:30:32 +01:00
Piotr Rzeszut a516c2e857 Correct list of flash pages to be erased after extenging Mifare flash dictionary area - update changelog 2024-12-07 13:14:46 +01:00
Piotr Rzeszut 88d9345bc7 Correct list of flash pages to be erased after extenging Mifare flash dictionary area 2024-12-07 13:12:01 +01:00
Iceman 461528d531 Merge pull request #2655 from onovy/master
Add new Mifare Classic keys from Momentum firmware project.
2024-12-07 05:30:35 +01:00
Iceman 92e8dea093 Merge branch 'master' into master
Signed-off-by: Iceman <iceman@iuse.se>
2024-12-07 05:18:41 +01:00
Iceman 489399c3fb Merge pull request #2683 from piotrva/flash-mifare-keys-extension
SPI flash area for Mifare keys extended from 2047 to 4095 keys
2024-12-07 05:14:25 +01:00
Piotr Rzeszut b1b10c2bea As extending SPI flash storage for Mifare need to run init_rdv4 script for a proper operation add a note under compilation instructions 2024-12-07 00:36:52 +01:00
Piotr Rzeszut 1b781aae9f Update documentation on SPI flash memory to use modern client function calls with dashes. 2024-12-07 00:35:37 +01:00
Piotr Rzeszut 565f3f1feb Extend storage allocated for Mifare keys to 4095 keys. Update documentation on the feature and memory map 2024-12-07 00:34:29 +01:00
Iceman eb12dd78a1 Merge pull request #2682 from eagle00789/patch-2
Update CHANGELOG.md
2024-12-06 05:39:17 +01:00
Iceman cced003405 Merge pull request #2681 from eagle00789/patch-1
Update mfc_default_keys.dic
2024-12-06 05:38:28 +01:00
Chris Simon 2850d2aa0f Update CHANGELOG.md
Signed-off-by: Chris Simon <info@decomputeur.nl>
2024-12-05 10:48:52 +01:00
Chris Simon b1a5df53d3 Update mfc_default_keys.dic
Added Dutch Statistics Agency

Signed-off-by: Chris Simon <info@decomputeur.nl>
2024-12-05 10:45:49 +01:00
Iceman 587761fdf0 Merge pull request #2680 from Eltrick/new-keys
Add facility static hotel key
2024-12-05 06:22:30 +01:00
Iceman c849a06a0b Merge pull request #2679 from nvx/d40_crypto_fix
fis MF3ICD40 (D40) secure channel crypto
2024-12-05 06:21:49 +01:00
Lucifer Voeltner 5bfd1239ae Add new facility static hotel key 2024-12-05 10:41:26 +07:00
nvx 34b2a3175f fis MF3ICD40 (D40) secure channel crypto 2024-12-04 22:21:22 +10:00
Philippe Teuwen 87266654f7 MIFARE Plus 4b UID: fix signature check 2024-12-04 08:19:17 +01:00
Iceman 3454992bc8 Merge pull request #2673 from nvx/fix_trace_namme
fix pacs data in example trace filename
2024-12-03 16:56:57 +01:00
Iceman 69e407e8d5 Merge pull request #2666 from piotrva/hf-mf-ultimatecard-script-auto-set-maxblock
Automatically set maximum r/w block for preset configurations of Mifare Classic in hf_mf_ultimatecard.lua, add presets for 2k variants.
2024-12-03 16:26:13 +01:00
Iceman 8079153ee6 Merge branch 'master' into hf-mf-ultimatecard-script-auto-set-maxblock
Signed-off-by: Iceman <iceman@iuse.se>
2024-12-03 16:26:01 +01:00
Iceman 7e072dc976 Merge pull request #2670 from ANTodorov/smart_spi_detect
rework to use smart SPI flash detection
2024-12-03 16:24:37 +01:00
Iceman 4cd914ad95 Merge branch 'master' into smart_spi_detect
Signed-off-by: Iceman <iceman@iuse.se>
2024-12-03 16:23:56 +01:00
Iceman 692235beb0 Merge pull request #2678 from libin-ka/master
Add Proxmark3 Ultimate  FPGA   xc2s50-5-tq144.ucf  files
2024-12-03 16:20:49 +01:00
Iceman 3727f63781 Merge pull request #2677 from ry4000/master
R&Y: Updated DEN MyRide AID in aid_desfire.json
2024-12-03 16:20:10 +01:00
Iceman dca915808c Merge pull request #2676 from Eltrick/g3-apdu-help
modify 'hf mf gen3blk' help to comply with the sak change
2024-12-03 16:19:42 +01:00
Iceman db4844e889 Merge pull request #2675 from Nya0/hts-dump
added "lf hitag hts dump" command
2024-12-03 16:19:10 +01:00
libin-ka 537a9f0171 Add files via upload
Add Proxmark3 Ultimate  FPGA   xc2s50-5-tq144.ucf  files

Signed-off-by: libin-ka <46210417+libin-ka@users.noreply.github.com>
2024-12-03 21:04:50 +08:00
ry4000 2950d78703 R&Y: Updated DEN MyRide AID in aid_desfire.json
- Updated Vendor to its legal name (Masabi Ltd)
- Added a standardised description to identify the AID as being issued by Masabi Ltd for its Justride platform.

Thank you.

-R&Y.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2024-12-03 22:51:29 +11:00
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