RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 23:36:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
16514 commits 3 branches 14 tags 85 MiB
Commit graph

10354 commits

Author SHA1 Message Date
Iceman ed21af641a
Merge pull request #1872 from zebbe-94/master 
Fix typo in smart info
 2023-01-22 16:48:24 +01:00
wh201906 239a8646b2 Fix the wrong sample count when bps!=8 2023-01-22 15:38:09 +00:00
colonelborkmundus af00fde250 additional 1k keys, fresh from the oven 2023-01-22 02:36:19 -05:00
Self Not Found f05c6a1f72 Fix the types of parameters in BitstreamOut_t 
BitstreamOut_t in client/src/loclass/cipherutils.h
is also used in client/src/cmddata.c for decimatioin,
but uint8_t is too small for such application
 2023-01-22 07:15:47 +00:00
iceman1001 7c6aa66aa2 tesla auth challenge exchange 2023-01-21 21:20:22 +01:00
iceman1001 f9a65505de added tesla info command, with some of the data that is available. Needed to fix the apdu chaining and a sneaky bug in get_sw since the apdu response was larger then 256 2023-01-21 20:04:27 +01:00
colonelborkmundus cc0e5477dd added more keys, removed accidental dupes 2023-01-18 15:25:25 -05:00
colonelborkmundus de3514dc84 added more keys 2023-01-18 13:53:08 -05:00
colonelborkmundus 88d242d10a yo dawg i heard you like keys so i added more keys 2023-01-18 13:36:50 -05:00
colonelborkmundus dbe53506b5 added additional keys to graduate hotel card 2023-01-18 12:52:10 -05:00
colonelborkmundus d96cef2b50 modified: client/dictionaries/mfc_default_keys.dic 2023-01-18 11:36:07 -05:00
Krzysztof Zdulski e1c8c977c2
Check is sector is readable before attempting to read 2023-01-18 14:41:57 +01:00
iceman1001 e1902ffa96 The Hack ID by Unicorn Team EM4100 emulator uses a VD/ID format in decimal 2023-01-18 03:47:14 +01:00
Jean-Michel Picod 3a7af55724 Fix python initialization to have SWIG work 2023-01-16 19:57:42 +01:00
zebbe94 ee8759bc8b fix typo 2023-01-16 01:06:12 +01:00
Krzysztof Zdulski 8f2362e7b0
Fix mifare classic dump when block cannot be read 2023-01-15 16:33:32 +01:00
iceman1001 875b1a0aed annotate new magic command (WIP) 2023-01-15 12:27:34 +01:00
Philippe Teuwen c2546d35f8 experimental_lib/CMakeLists missing files 2023-01-15 02:40:58 +01:00
Philippe Teuwen 30ae0bf521 make style 2023-01-15 02:24:46 +01:00
Philippe Teuwen 951d6cd218 cppcheck uninitialized vars 2023-01-15 02:23:19 +01:00
Philippe Teuwen 048291dcb3 cppcheck: can add const on some params 2023-01-15 02:23:19 +01:00
Philippe Teuwen 0a19c3e891 cppcheck remove redundant continue as last loop statement 2023-01-15 02:23:19 +01:00
Philippe Teuwen eb23028514 cppcheck: add test to avoid dereferncing null pointer 2023-01-15 02:23:19 +01:00
Philippe Teuwen c2eb6395e2 cppcheck clarify boolean result used in bitwise operation 2023-01-15 02:23:19 +01:00
Philippe Teuwen 127aebd8b0 cppcheck fix uninitialized variable 2023-01-15 02:23:19 +01:00
Philippe Teuwen b8458322e1 cppcheck fix null pointer dereference 2023-01-15 02:23:19 +01:00
Philippe Teuwen 857f0c0d9b cppcheck fix returnNonBoolInBooleanFunction 2023-01-15 02:23:19 +01:00
Philippe Teuwen 8ac8e3d7d0 reduce variable scopes 2023-01-15 02:23:19 +01:00
Philippe Teuwen 2d58c109ba ksx6924: use ARRAYLEN 2023-01-14 23:39:07 +01:00
Philippe Teuwen 0e1ea167a4 vigik: use mfc_vigik_t in API and remove warning about increased alignment 2023-01-14 23:32:35 +01:00
Philippe Teuwen 46f8b522ca t55: remove cast and warning about increase alignment requirement 2023-01-14 23:05:46 +01:00
Philippe Teuwen 04bab85557 fileutils: replace casts by union and remove warning about increase alignment requirement 2023-01-14 23:02:06 +01:00
Philippe Teuwen 6a576701c7 Topaz dump: remove unnecessary casts increasing required alignment and add dump size check 2023-01-14 22:40:05 +01:00
Philippe Teuwen c9984985fd make miscchecks 2023-01-14 22:23:40 +01:00
Philippe Teuwen 5d5d9d9be0 make style 2023-01-14 22:22:04 +01:00
iceman1001 35d1bebf08 changed the "path" param to "dir" and added some more help text samples, for binary files, we now check for lower case ".bin" too 2023-01-14 18:46:49 +01:00
Iceman b86cc085ff
Merge pull request #1867 from RfidResearchGroup/Paradox_Clone_FC_CN 
Add fc/cn to Paradox clone
 2023-01-14 18:13:37 +01:00
iceman1001 67b340d838 swapped to ISO7816 defines 2023-01-14 12:26:30 +01:00
iceman1001 d3b78e0cf2 swapped to defines 2023-01-14 12:21:48 +01:00
iceman1001 6597d14e10 swapped to defines 2023-01-14 12:17:10 +01:00
iceman1001 e74a025a27 added some more ISO7816 error return codes, swapped to defines in 14a.c 2023-01-14 12:10:48 +01:00
iceman1001 8c315716d3 swapped to defines instead to see if older GCC supports it 2023-01-14 12:04:45 +01:00
mwalker33 224a83527f Update cmdlfparadox.c 
Add FC/CN to clone for paradox
 2023-01-14 18:16:09 +11:00
iceman1001 73a80fb07d hf mf wrbl, restore - changed the logic of --force param. It is now used to override warnings about BLOCK0 and bad ACL block data and allow the user to write it regardless of its consequences.\n You can easily brick sectors on genuine or Gen2 cards.\n Be aware, here be dragons! 2023-01-10 22:08:59 +01:00
George Talusan 90b1cb7954
fix off-by-1 when removing header in hf_mfu_amiibo_restore 2023-01-09 10:35:15 -05:00
iceman1001 f2185b3933 use strcat instead of strncat, we are adding same as we removed 2023-01-09 00:48:42 +01:00
iceman1001 5289308545 missing a bracket 2023-01-09 00:03:46 +01:00
iceman1001 df05e28923 added a fingerprint test for OTP algos 2023-01-08 21:54:46 +01:00
iceman1001 19dd580b3b adapt file path checks 2023-01-08 21:52:30 +01:00
iceman1001 d1aa57ac5d update text 2023-01-08 19:31:22 +01:00
iceman1001 82d4b31942 renamed to follow name convention 2023-01-08 19:30:55 +01:00
iceman1001 2206271ba3 renamed script to follow name convention 2023-01-08 19:29:02 +01:00
iceman1001 ab3a8f4121 fix helptext 2023-01-08 19:27:41 +01:00
Iceman 171f9d4fcd
Merge pull request #1847 from wh201906/fix-flash-suggest 
Fix the steps when updating from old version
 2023-01-08 13:27:04 +01:00
iceman1001 fd39493cac cppcheck fixes 2023-01-06 23:57:02 +01:00
iceman1001 9888eef8dc changed hf mf wrbl and view command to look for strict readonly ACL in the data. 2023-01-06 23:53:25 +01:00
Jean-Michel Picod 16410b064d Fix format string to please CodeQL 2023-01-06 22:06:07 +01:00
Jean-Michel Picod a7980d8e8a Use a typed constant and see if that makes CodeQL happy :) 2023-01-06 21:52:26 +01:00
Jean-Michel Picod 15b541c2ea Add command piv authsign 2023-01-06 21:36:08 +01:00
Jean-Michel Picod efc685864a Add PIV command to scan all data containers on a PIV card. 2023-01-06 21:23:22 +01:00
Jean-Michel Picod 663fd4efc9 Remove unused error code. 
Will be added back for the PIN check command
 2023-01-06 18:28:53 +01:00
Jean-Michel Picod 6e084d82d5 First two PIV commands 2023-01-06 18:19:31 +01:00
Jean-Michel Picod 80a4698a7f Initial rework on TLV to avoid mem leaks 2023-01-06 13:03:10 +01:00
Self Not Found b2d03e8c30
Merge branch 'RfidResearchGroup:master' into fix-flash-suggest 2023-01-06 14:20:48 +08:00
nvx 4180635218 Add --shallow option to hf iclass reader commands to do shallow (ASK) reader modulation instead of OOK. 2023-01-04 23:59:03 +10:00
iceman1001 53808f2c7f sanity checks and style 2022-12-31 23:07:54 +01:00
iceman1001 d6af860136 adapt path separator to handle WIN32 backslash. 2022-12-31 22:30:07 +01:00
iceman1001 e77781e621 only mark CRC bytes if we have 3 or more bytes, and increase the line buffer since ansi colors eats chars 2022-12-31 10:04:30 +01:00
Iceman 259ad97004
Merge branch 'master' into feature/better_nxp_15693_identification 
Signed-off-by: Iceman <iceman@iuse.se>
 2022-12-30 09:52:15 +01:00
Hanno Heinrichs 9e0fe3ca36 Fix stack-based buffer overflow in "lf em 4x05 sniff" command 2022-12-29 13:55:24 +01:00
nvx e44f847474 Improved NXP SLI/SLIX series tag identification 2022-12-29 22:37:50 +10:00
iceman1001 08930766cb fix potential NULL array printing 2022-12-23 20:05:45 +01:00
iceman1001 d998fabe2f add aid to resource file 2022-12-23 20:01:04 +01:00
Self Not Found 1f7d3d85a7
Fix the steps when updating from old version 
When updating from a old version on Windows, the `pm3-flash-all` always
fails even after updating the bootloader. This is because it detects 
the hardware by the serial number "ICEMAN", which only appears after 
flashing the fullimage.
 2022-12-22 12:24:20 +08:00
Jean-Michel Picod 4375f5b91e Avoid memory leaks with Python <3.10 2022-12-20 15:32:38 +01:00
Nitraiolo 96d8528a0a Inverted condition in python check so it defaults to new code now. 2022-12-18 09:45:46 +01:00
Nitraiolo 997e5aac3e Fix py_args[] population 2022-12-17 21:49:04 +01:00
Nitraiolo 912d9be2d1 Added major version into compile condition of cmdscript 2022-12-17 20:12:12 +01:00
Nitraiolo 0d2e86f99c Conditional build of cmdscript to allow compilation with old python 
versions (<3.10.x)
 2022-12-17 15:26:36 +01:00
iceman1001 b14730d57c fix codeql #155 - narrow type with wide type comparison in loop 2022-12-10 03:32:18 +01:00
Jean-Michel Picod 0083e0ae13 Fix embedded python not working with Proxspace. 2022-12-09 21:58:28 +01:00
iceman1001 15a848f9bb remove old file 2022-12-09 07:46:41 +01:00
iceman1001 e364d7e03d add updated sim module firmware v4.13, this is breaking change for smart category commands 2022-12-09 07:36:02 +01:00
Jean-Michel Picod b487961cbd Moved to non-deprecated API to init Python intepreter 2022-12-06 18:07:10 +01:00
iceman1001 53b2909f04 prepping for sim module firmware upgrade file 2022-12-05 22:32:40 +01:00
Jean-Michel Picod 5bd6379b5b Move message to debug 2022-12-05 22:05:23 +01:00
Iceman 9f589fed9a
Merge pull request #1830 from jmichelp/master 
Smartcard module firmware 4.12
 2022-12-05 20:28:25 +01:00
Jean-Michel Picod c23c2b2aef Rollback the firmware part 2022-12-05 20:05:28 +01:00
Jean-Michel Picod 83e6b223c4 Adapt ARM code to comply with SIM module firmware 4.12 2022-12-05 19:35:11 +01:00
Jean-Michel Picod 89702a4e6e Add SIM module firmware 4.12 from Sentinel 2022-12-05 19:33:41 +01:00
iceman1001 38cb327991 fix #1829 Py_SetProgramName is deprecated, but was optional in our code. 2022-12-05 19:28:42 +01:00
Iceman 8502736e2c
Merge pull request #1828 from jmichelp/master 
Fixing some ISO7816-4 logic.
 2022-12-05 19:26:55 +01:00
Iceman 989b830ae3
Merge pull request #1827 from DidierA/magic_32 
Consider different behavior of some Gen4 cards. Should fix #1822
 2022-12-05 19:25:59 +01:00
Jean-Michel Picod b70320d47d Fixing some ISO7816-4 logic. 
- Fixing overflow in BigBuffer if requesting to much data
- Fixing integer wrapping with the SIM module by capping APDU data
  length
- Fixing chaining logic which was loosing previously received data
 2022-12-05 10:54:38 +01:00
DidierA 2f4167ee74 Consider different behavior of some Gen4 cards. Should fix #1822 2022-12-05 01:02:36 +01:00
iceman1001 b557291a00 print sectors for mifare 2022-12-04 19:28:22 +01:00
iceman1001 d170f68a00 fix compilation error, and more debug statements 2022-12-04 15:34:35 +01:00
iceman1001 37100a8a18 fix compilation error 2022-12-04 15:15:24 +01:00
Iceman ce3ca0e7d1
Merge pull request #1825 from natmchugh/master 
Get the hitag2 dump command working as per docs
 2022-12-04 13:45:57 +01:00
iceman1001 9af951c22b fix compiling 2022-12-04 09:27:13 +01:00
iceman1001 e3a6f8fe27 look up vigik service code 2022-12-03 21:11:29 +01:00
iceman1001 e4339bd846 wip - testing of a vigik annotater 2022-12-03 20:30:13 +01:00
iceman1001 80505ca268 vigik has some more 491x 2022-12-03 20:12:58 +01:00
iceman1001 a6c09505ce change token for !crc -> !! and added colors to it 2022-12-03 12:35:22 +01:00
nvx 4962752472 Fix trace list -r (relative times) not working unless the -u (microseconds) flag was also provided. 
Also makes the `--frame` option respect microseconds and relative times as well.
 2022-12-02 20:13:13 +10:00
Nat McHugh cfc72fb5f1 Fix the dump command hitag2 2022-11-30 15:49:39 +00:00
E.Nigma 417a6076cb Add keys 2022-11-29 09:34:32 +01:00
iceman1001 c88c3bc4f2 maur keys 2022-11-25 17:30:05 +01:00
Iceman f9aa183382
Merge pull request #1821 from DidierA/gen4_ident 
Add Magic Gen4 GTU detection
 2022-11-25 17:23:19 +01:00
DidierA c54db094cd hf_mf_ultimatecard: '-w 0' now formats whole Mifare classic 4k 2022-11-25 10:16:24 +01:00
DidierA 9a0427d4d2 Add Magic Gen4 GTU detection and symbols for Gen4 GTU protocol. 2022-11-25 10:13:33 +01:00
Iceman 2453d9bc81
Merge pull request #1820 from jmichelp/master 
Fix overflow in SPI memory when writing default key dictionnaries.
 2022-11-25 07:21:09 +01:00
Iceman f3642c1a6e
Merge pull request #1819 from toucan12/ksx6924 
Add initialization command response interpretation on the ksx6924 (Tmoney) card
 2022-11-24 03:52:43 +01:00
Iceman bad56a74ff
Merge pull request #1818 from DidierA/hf_mfu_esave 
use calloc(), not malloc()
 2022-11-24 03:48:08 +01:00
Jean-Michel Picod 1adec4dfb2 Fix overflow in SPI memory when writing default key dictionnaries. 
Boundaries were defined in the memory layout but weren't enforced
by the client, causing an overflow when trying to load a
dictionnary that was too big.
It's too hard to enforce it on the ARM side as the command is a
generic write.
Now that limits are defined, also outputs them as part of the
`hw status` command.
 2022-11-24 03:16:58 +01:00
Geonyeob Kim 878d123a78 parse the hf ksx6924 init response 2022-11-24 00:59:42 +09:00
Geonyeob Kim 0890884cd5 textual 2022-11-24 00:57:13 +09:00
Geonyeob Kim 864b632a19 typo 2022-11-24 00:54:47 +09:00
DidierA d4f08abec3 Change calloc() so it passes Widnows build test 
Code compiles under linux (not tested yet, I have no proxmark available right now)
Previous commit fails windows build test with:

src/cmdhfmfu.c: In function 'CmdHF14AMfuESave':
src/cmdhfmfu.c:4220:19: error: array subscript 'mfu_dump_t[0]' is partly outside array bounds of 'mfu_dump_t[0]' [-Werror=array-bounds]
 4220 |         end = dump->pages ;
      |                   ^~
In function 'GetMfuDumpFromEMul',
    inlined from 'CmdHF14AMfuESave' at src/cmdhfmfu.c:4202:15:
src/cmdhfmfu.c:4105:21: note: object of size 1076 allocated by 'calloc'
 4105 |     uint8_t *dump = calloc(MFU_MAX_BYTES + MFU_DUMP_PREFIX_LENGTH, sizeof(uint8_t));
      |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 2022-11-23 11:40:56 +01:00
flamebarke 75ef73dd57
Update hf_i2c_plus_2k_utils.lua 
Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
 2022-11-23 09:09:37 +08:00
Shain Lakin 5458618053 Added new script for modifying user memory in sector 0 and 1 on the NTAG I2C PLUS 2K tag. 
Can also be used to dump a sector to disk, and write a file to a sector.
 2022-11-23 08:58:03 +08:00
DidierA 182d167aad use calloc() 2022-11-21 22:05:24 +01:00
Iceman 1527677bc4
Merge pull request #1815 from DidierA/hf_mfu_esave 
Add hf mfu esave
 2022-11-21 21:29:05 +01:00
DidierA b857205504 Add hf mf gsave 2022-11-21 19:18:14 +01:00
DidierA 584e0ad833 Added hf mfu esave 2022-11-21 01:05:48 +01:00
iceman1001 b36eaac3bf Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-11-20 16:49:41 +01:00
iceman1001 5b790afe43 renamed param dict / f for more consistency overall 2022-11-20 16:48:20 +01:00
iceman1001 317ddf42bc style 2022-11-20 16:47:49 +01:00
iceman1001 4dfcd44edd return default value when arg is not enforced with u32_1 2022-11-20 16:43:12 +01:00
iceman1001 4fb096966e extra checks for argument parsing of ints. And some text updates. There are other int parsing but they are checked with mandatory param int1 2022-11-20 16:34:45 +01:00
DidierA 9dbd6e5f23 change help text to fit screen 2022-11-20 15:31:58 +01:00
DidierA 1d00ef797c hf 14a sim, hf mfu sim: add hint for Ultralitgh EV1 2022-11-20 01:26:42 +01:00
DidierA f828a727c9 Fix: hf 14a sim parsing args was taking tag type as number of reads if no -n option given 2022-11-20 01:01:11 +01:00
iceman1001 971452f817 renamed luascript 2022-11-16 18:16:39 +01:00
Shain Lakin 789e338c4f Renamed to hf_mfu_ntag 
Modified CHANGELOG.md
 2022-11-16 14:14:50 +08:00
Shain Lakin 6381a19243 Rename to hf_mfu_next.lua 
Add entry to changelog.md
 2022-11-16 14:10:45 +08:00
flamebarke dd8110871d Create hf_mfu_next.lua 
Add to CHANGELOG.md
Rename to hf_mfu_ntag.lua

Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
 2022-11-16 14:08:11 +08:00
iceman1001 6c163fa262 added a check for static encrypted nonces when collecting encrypted nonces for hardnested to run. Will abort the collection if detected. 2022-11-15 07:07:26 +01:00
DidierA da1ce30533 hf mf gview, gload : 2x speed 
on Gen4 GTU cards, a select was made before each read or write command.
This commit adds a flag parameter to the read and write commands,
and gload and gview commands use this flag to tell when to select and end.

The trace buffer also contains the complete operation instead of the last
blokc read/write.

Speed gain:
`time ./proxmark3 -p /dev/ttyACM0 -c 'hf mf gview --4k'`
before: about 20s, now: about 7s

`time ./proxmark3 -p /dev/ttyACM0 -c 'hf mf gload --4k -f ../../../dumps/4k.bin'`
before: about 23s, now: about 10s
 2022-11-13 01:37:52 +01:00
Didier Arenzana 2f49b2c8cf
Merge branch 'RfidResearchGroup:master' into hf_mf_gen4_rewrite 2022-11-13 00:46:07 +01:00
iceman1001 c393b0caca adapted hardnested and autopwn to detect MFC Ev1 cards and use the known sector key in the key recovery vectors 2022-11-12 09:39:28 +01:00
iceman1001 bde4e8d754 test.2 2022-11-12 07:16:02 +01:00
iceman1001 c74e095dc9 test.. 2022-11-12 07:12:41 +01:00
iceman1001 d465c5a921 a test thingy 2022-11-12 06:32:08 +01:00
iceman1001 9353f8ce9a fix coverity CID #402839, resource leak 2022-11-11 23:51:30 +01:00
iceman1001 dbb5e6d4c1 fix coverity CID #402836, #402837, #402838 2022-11-11 23:49:49 +01:00
iceman1001 64b13679d7 some default ones 2022-11-11 03:39:31 +01:00
DidierA 885911c469 Rewrite of magic Gen4 GTU commands : refactor and speed 2022-11-09 15:49:07 +01:00
elcuervo c8f8685819
Adds some context for both Argentina and Uruguay keys 2022-11-08 10:07:07 -03:00
DidierA 3ac9c61cbf Fix read oob in data diff 2022-11-08 02:04:13 +01:00
DidierA 4f2d86558e correct wrong type in formatting function 2022-11-05 20:20:01 +01:00
DidierA 876abf2818 Add hf mf gload, ggetblk, gsetblk 2022-11-05 19:40:38 +01:00
iceman1001 42b48fec85 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-11-04 21:11:06 +01:00
iceman1001 4b54c79104 fix a square bracket missing in trace list -c when annotating crc bytes. Added color support for crc bytes and square brackets when no ansi colors is supported 2022-11-04 21:10:47 +01:00
Jean-Michel Picod 32d47cb6a4 Fix prolematic return codes in mifare. 
Parts of the code returned positive values for error codes, which
could result in the client exiting (return value 2).
 2022-11-04 11:06:59 +01:00
iceman1001 3f6859d3ab maur key 2022-11-02 20:44:44 +01:00
iceman1001 97263ab3b1 fixed to get UID from even partial trace lists if 9320 exists 2022-11-02 19:27:03 +01:00
iceman1001 fe11c1876f hf mf dump - if keyA failed to read, zero out its key to indicate in dumped file that the key is unknown. 2022-11-02 15:01:46 +01:00
iceman1001 fede61296b fix return types to follow our style better. 14a/mf needs more love 2022-11-02 14:34:07 +01:00
Jean-Michel Picod b768f8e1a3 Fix comment and unreachable boundary. 2022-10-31 20:28:35 +01:00
Jean-Michel Picod cee55d43ee Modified logic to also try key B on MF cards. 
In configurations where keyA is unknown but ACLs are configured to allow
all blocks to be read by keyB the command `hf mf dump` was failing.
This commit attempts to fix this behavior by trying keyA first and
swapping for keyB if half of the allowed tries failed.
 2022-10-31 20:13:09 +01:00
iceman1001 d4b71a1774 modified lf indala sim to also accept facility code and card number 2022-10-30 16:29:50 +01:00
iceman1001 a89983d1b3 text 2022-10-30 08:54:33 +01:00
iceman1001 043fed0103 added lf indala brute command. Based on lf hid brute, can go up and down in cardnumbers 2022-10-30 08:54:13 +01:00
iceman1001 063e2da49d Revert "Release v4.15864 - Radium" 
This reverts commit 93ca7b4f6e.
 2022-10-29 01:34:05 +02:00
iceman1001 93ca7b4f6e Release v4.15864 - Radium 2022-10-29 01:34:05 +02:00
iceman1001 3f92d5ee67 style 2022-10-29 01:26:12 +02:00
Noah Clements af8e84d711
Fixed "Residency Permit" Output 
Bug discovered while scanning Swedish Residency Permit, resulted in document type of "German Residency Permit".
Fixed for better accuracy.

Signed-off-by: Noah Clements <noah.clements@unb.ca>
 2022-10-27 16:56:51 -03:00
iceman1001 ba225905d3 changed "mf eload" / "iclass eload" to be able to transfer a file from SPIFFS to EMULATOR memory. Original idea from @natesales 2022-10-26 06:57:21 +02:00
iceman1001 5b90ea8117 skeleton code found at https://github.com/ZRD-Saar/proxmark3 2022-10-25 07:56:57 +02:00
iceman1001 a1633f9323 length? 2022-10-24 19:11:53 +02:00
iceman1001 417f1b515d style 2022-10-24 18:52:24 +02:00
iceman1001 5280ada054 bug fix, added 0xFE in the wrong place 2022-10-24 18:49:40 +02:00
iceman1001 8d24e105ea text 2022-10-24 18:49:08 +02:00
iceman1001 2025c8480a added "hf 14a ndefwrite" - writes ndef to type4a tag 2022-10-24 18:48:56 +02:00
iceman1001 8940982c85 changed "hf mfdes lsapp" to print dfname regardless if it is not a genuine strign 2022-10-23 18:45:20 +02:00
iceman1001 e1ae1cdd26 style 2022-10-23 03:20:24 +02:00
iceman1001 2627f3b3b9 the ndef printing is now more dense and it honors verbose output 2022-10-23 02:59:27 +02:00
iceman1001 69fd1ac889 now skips non ndef formmated sectors 2022-10-23 02:17:49 +02:00
iceman1001 ac29a893cf fix hf md ndefread, to correctly skip non ndef formatted sectors 2022-10-23 02:15:47 +02:00
iceman1001 a2c4682d18 Change "hf mf ndefwrite" added option to fix bad ndef records by adding a correct block and a terminator block 2022-10-22 19:51:33 +02:00
iceman1001 17470a3720 keeping inside the arrays 2022-10-22 19:02:18 +02:00
iceman1001 6a74c8fc96 be more lenient with parsing ndef 2022-10-20 17:35:57 +02:00
iceman1001 d3248a7059 make style 2022-10-20 17:35:24 +02:00
iceman1001 76f793c9af added hf mf ndefwrite command. to write a ndef record to mifare tag 2022-10-20 17:34:46 +02:00
iceman1001 9e9d8ddbde style 2022-10-20 17:31:23 +02:00
iceman1001 acb6fcb970 changed "hf mf cwipe" - add a genuine block0 2022-10-20 17:31:01 +02:00
iceman1001 98de0f434b style 2022-10-20 17:30:03 +02:00
iceman1001 f9d0649fe1 text 2022-10-16 18:30:15 +02:00
iceman1001 04f4863dd4 fix label can only be part of a statement and a declaration is not a statement 2022-10-16 18:10:14 +02:00
Iceman bf28e36cd9
Merge pull request #1797 from alisander/master 
Update cmdlfhitag.c
 2022-10-16 18:02:07 +02:00
iceman1001 71f96ba1e7 make style 2022-10-16 17:56:12 +02:00
iceman1001 2d25716704 verify that there is a card on the proxmark before continuing 2022-10-16 17:52:10 +02:00
iceman1001 eff967923f changed hf mf cwipe with genuine data 2022-10-16 17:48:13 +02:00
iceman1001 885a43aadb added a new command to format a MFC tag as NFC with NDEF empty message 2022-10-16 17:45:46 +02:00
Alisander be1c5305f8
Update cmdlfhitag.c 
correct issue where only 4 or 6 key are used. 

Signed-off-by: Alisander <alessandro@lisi.cc>
 2022-10-16 14:26:51 +02:00
Iceman a0e275acca
Merge pull request #1781 from DidierA/fix-srt512-uid 
print_sr_blocks(): don't assume uid is at begining of dump
 2022-10-15 16:33:32 +02:00
amec0e eba98a5577
Clean up of t55xx_default_pwds 
Removed 1 whitespace, grouped some keys, uppercased keys and moved line comments to above the keys. Duplicate checked after and all is good, just another little spring clean (wasn't much I'll admit that)

Signed-off-by: amec0e <88857687+amec0e@users.noreply.github.com>
 2022-10-05 23:07:19 +01:00
amec0e 4120e2fe91
Updated mfc_default_keys 
Removed extra whitespaces, Uppercased all the keys, Grouped keys where grouping was possible, removed extra line comments (and some for example "data from..."), moved line comments to above the key.

Hopefully this little spring clean will help in the future when checking for duplicates, please do check this thoroughly and make sure it is okay.

Signed-off-by: amec0e <88857687+amec0e@users.noreply.github.com>
 2022-10-04 00:12:48 +01:00
amec0e 1e54a65f02
Removed another duplicate 
L628 same as L1747

Signed-off-by: amec0e <88857687+amec0e@users.noreply.github.com>
 2022-09-30 14:40:28 +01:00
iceman1001 1e508d2f23 remove another duplicate and keep some comments 2022-09-29 21:18:32 +02:00
Iceman 1abe5aa91d
Merge pull request #1787 from amec0e/master 
Removed Duplicates from default dictonaries.
 2022-09-29 21:13:20 +02:00
elcuervo 350e2a81ca
Adds Uruguay shared key 2022-09-29 15:46:15 -03:00
amec0e 0bae139adf
Removed duplicate entries 
L550 same as L1544, L548 same as L1550, L632 same as L1749

Signed-off-by: amec0e <88857687+amec0e@users.noreply.github.com>
 2022-09-29 15:32:41 +01:00
amec0e b82a8c288f
Removed Duplicates from t55xx_default_pwds 
L73 is the same as L152 and L13 is the same as L42

Signed-off-by: amec0e <88857687+amec0e@users.noreply.github.com>
 2022-09-29 15:06:24 +01:00
iceman1001 ba1def2409 added well used keys 2022-09-23 04:12:51 +02:00
Equip 161731971f
Update mfc_default_keys.dic 
moved 199404281970 and 199404281998 to #66 after discovering they're universal keys for this brand of reader which are over 90% of the uk's student accommodation and housing resource access control so they're very common :) thanks
 2022-09-22 21:24:09 +01:00
DidierA 3e582b246a print_sr_blocks(): don't assume uid is at begining of dump 2022-09-20 23:01:25 +02:00
Iceman bf143219a0
Merge pull request #1779 from DidierA/fix-srt512-dump 
Fix dump of SRT512 tag
 2022-09-20 09:07:43 +02:00
Iceman ec5afd00ad
Update cmdlfparadox.c 
printing an used variable

Signed-off-by: Iceman <iceman@iuse.se>
 2022-09-20 09:07:25 +02:00
DidierA c145c4b78b Fix dump of SRT512 tag 2022-09-20 01:52:53 +02:00
David Bryan a92942423a updated key with a new static key recovered 2022-09-09 13:20:04 -07:00
David Bryan cb16edc845 adding keys recoved 2022-09-09 13:11:53 -07:00
iceman1001 fa5e69ceef fix coveriy 2022-09-09 20:27:49 +02:00
iceman1001 fbc9e3f631 p2p identification 2022-09-09 19:01:16 +02:00
Markus Walter 69100e0e04 Use printf options to output variable width segments. 2022-09-06 11:00:47 +02:00
Markus Walter b49201ea6e Use pm3_save_dump() for storing to disk. 2022-09-06 10:00:43 +02:00
Markus Walter f511333b4d Fix linter complaint. 2022-09-05 11:13:18 +02:00
Markus Walter 42eafc5e93 Merge branch 'master' into iso15693-improvements 2022-09-05 10:56:32 +02:00
Markus Walter de99fee83c Add commands hf 15 eview and hf 15 esave. 2022-09-05 10:36:31 +02:00
Markus Walter 7cc47eebba Accept eml and json files for hf 15 eload. 2022-09-05 10:36:02 +02:00
iceman1001 7a831fc94e CID 398738, missing init 2022-09-03 11:23:44 +02:00
iceman1001 1a3aa7eb02 missing var 2022-09-03 11:23:01 +02:00
iceman1001 eaebf46961 CID 398739 , init of array w structs 2022-09-03 10:51:45 +02:00
iceman1001 0f96bcff05 CID 398740, init a struct 2022-09-03 10:51:45 +02:00
mwalker33 e0eeafe27f mdu ndef error 
Patch to stop buffer overflow on ndef read from card
Typo fix in change log.
 2022-09-02 22:35:48 +10:00
iceman1001 41f36199aa format string 2022-09-02 05:34:47 +02:00
Iceman b82feee002
Merge pull request #1766 from markus-oehme-pg40/iso15693-emulation 
ISO15693 emulation
 2022-09-02 05:29:16 +02:00
Markus Walter d79bd5b6b8 Switch hf 15 sim to use image in emulator memory. 2022-09-01 18:53:31 +02:00
Markus Walter 03fa757395 Implement hf 15 eload command to move image dump to emulator. 2022-09-01 18:52:57 +02:00
Iceman 429139f174
Merge pull request #1765 from mwalker33/spiffs 
Prep spiffs for bigger data files
 2022-09-01 05:22:35 +02:00
Markus Walter eef1ce9c33 Enhance simulation of ISO15693 devices. 
This adds the following things:
- support for reading multiple blocks,
- configurable block size,
- ability to provide a memory image.
 2022-08-31 12:25:22 +02:00
mwalker33 d8c18e6db8 Prep spiffs for bigger data files 
- added spiffs check after flase wipe to force it to update its status
- added spiffs write and append to write in 8192 byte chunks to allow spiffs space to be freed in time.
- fixed spiffs dump to correctly handle issues if it could not allocate bugbuff space.
 2022-08-31 18:51:39 +10:00
Rick Farina (Zero_Chaos) 07c6871861
do not use LD if you aren't using ld 
All the uses of LD actually wanted g++, so just use CXX and remove an
unused LD define

Closes: https://github.com/pentoo/pentoo-overlay/issues/1259
Fixes: https://github.com/RfidResearchGroup/proxmark3/pull/1758
 2022-08-29 21:04:03 -04:00
iceman1001 bebfe0ad2f allow data load to load binary files as raw signal from device (@mwalker33) 2022-08-28 12:23:26 +02:00
iceman1001 e18194028b style 2022-08-24 07:25:10 +02:00
iceman1001 811f76785d textual 2022-08-22 12:25:25 +02:00
iceman1001 c27264e4c4 text 2022-08-22 05:49:47 +02:00
iceman1001 6eaff873ba remove debug statements 2022-08-21 11:12:11 +02:00
iceman1001 b6908ab9c7 need an even better check if we got anything 2022-08-21 11:01:30 +02:00
iceman1001 38a664f00c lets see if this still detects sentinels 2022-08-21 09:40:36 +02:00
iceman1001 28449aa580 hf mf mad - detect and decode of HID PACS 2022-08-21 09:40:06 +02:00
iceman1001 643f77996a hf mf mad - should be available offline too. Added some checks to quit if no device present 2022-08-21 00:52:53 +02:00
iceman1001 ab3e988441 test of PR 1756 2022-08-20 23:20:28 +02:00
iceman1001 ec403485b6 init vars 2022-08-20 13:09:43 +02:00
iceman1001 4a31ce1656 hf mfdes mad textual 2022-08-20 13:08:24 +02:00
iceman1001 5a6440f298 fix double param name 2022-08-18 23:16:08 +02:00
Michael Micsen Johannessen Wehus a80680d7a0 Added script to simulate HID mifare credentials 
Only supports H10301
 2022-08-17 01:24:38 +01:00
Iceman 76fefacbc4
Merge pull request #1752 from kormax/mobile-aids 
Improve ECP annotation, add mobile AIDs
 2022-08-15 20:17:05 +02:00
UberGuidoZ 1103f69b96
Removed dupes, added more keys, fixed some HEX o/L 
Signed-off-by: UberGuidoZ <57457139+UberGuidoZ@users.noreply.github.com>
 2022-08-13 21:21:32 -07:00