RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 07:46:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
16028 commits 3 branches 14 tags 86 MiB
Commit graph

10087 commits

Author SHA1 Message Date
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
UberGuidoZ d2a7e93778
Correcting L to 1 
Signed-off-by: UberGuidoZ <57457139+UberGuidoZ@users.noreply.github.com>
 2022-08-13 13:27:56 -07:00
UberGuidoZ 5dce2d3f5a
Correcting some O to 0 
Signed-off-by: UberGuidoZ <57457139+UberGuidoZ@users.noreply.github.com>
 2022-08-13 13:25:43 -07:00
UberGuidoZ 11065e965a
Added Vigik verified by quantum-x & iGuard Simple 
Signed-off-by: UberGuidoZ <57457139+UberGuidoZ@users.noreply.github.com>
 2022-08-13 01:15:55 -07:00
kormax 5fed5a8e62 add mobile-first aids 2022-08-11 19:30:05 +03:00
kormax 5e093962bc improve ecp2 annotations to support varying length, append terminal type to annotation 2022-08-11 19:25:35 +03:00
UberGuidoZ 3e15b8f2db
Added Vigik and Blackhat keys 
Signed-off-by: UberGuidoZ <57457139+UberGuidoZ@users.noreply.github.com>
 2022-08-07 00:48:20 -07:00
iceman1001 003623e5a7 fix binary string printing. Making sure no left over data is in static array 2022-08-06 13:31:46 +02:00
iceman1001 62980b5038 refactored topaz commands. It still uses a global var with dynamic memory. Added rdbl, wrbl, view, dump commands to match rest of client 2022-08-05 22:46:59 +02:00
iceman1001 5a4b8c8224 fix #1748 - failed to take in consideration size of legic struct packet when uploading data to device 2022-08-05 15:34:16 +02:00
nvx d11999a811 Fix eload from json files failing (ie, hf mf eload -f file.json) when the dump is the full size. 
Also fixed an accidental client double free when loading dumps.
 2022-08-05 18:38:51 +10:00
iceman1001 06e54d4399 textual 2022-08-02 23:51:34 +02:00
iceman1001 88d45d641c Do not create empty dump files 2022-08-02 22:49:25 +02:00
mywalk 2459fd43ee
Fix undefined symbol when build with clang 2022-08-02 21:36:17 +02:00
George Talusan 76bc54a414 use core.search_file when searching for amiibo resources 2022-08-01 00:12:41 -04:00
Iceman 1ec4e98a3c
Merge pull request #1740 from gtalusan/emrtd-images 
add -i to hf emrtd info
 2022-07-31 17:10:57 +02:00
George Talusan 566b805357 add -i to hf emrtd info 2022-07-31 09:46:00 -04:00
iceman1001 bf81acb55b hf topaz reader - output and continuous mode support. hf topaz info - output text changes 2022-07-31 13:08:37 +02:00
iceman1001 de9be10d28 14a reader/info - now hints topaz tags better 2022-07-31 13:06:55 +02:00
George Talusan 27e24482af add comment indicating pyamiibo should be installed 2022-07-30 22:09:45 -04:00
Iceman b6f0921554
Merge pull request #1738 from gtalusan/master 
determine qmake path similar to uic/moc
 2022-07-30 21:00:27 +02:00
George Talusan 3e222397ac determine qmake path similar to uic/moc 2022-07-30 14:48:14 -04:00
iceman1001 2cfc4dc733 minor hitag adaptations 2022-07-30 20:11:39 +02:00
iceman1001 a236604716 style 2022-07-30 20:11:15 +02:00
Iceman e303293477
Merge pull request #1737 from gtalusan/master 
fix homebrew dependency detection
 2022-07-30 19:54:45 +02:00
George Talusan 6fb4723cd6 fix homebrew dependency detection 2022-07-30 12:18:43 -04:00
iceman1001 fd7216fa89 text 2022-07-30 16:52:09 +02:00
iceman1001 36ee2f082b maur keys 2022-07-30 16:51:17 +02:00
iceman1001 1df51f3875 add hf lto reader command with continious mode 2022-07-30 15:42:07 +02:00
iceman1001 ac0088791a style 2022-07-30 11:49:30 +02:00
iceman1001 02d07f16c9 prepair for extended reading for LTO 2022-07-30 11:48:37 +02:00
iceman1001 8f8f9f97ad prepping for fudan pm3 commands 2022-07-30 11:47:03 +02:00
George Talusan d89ed735b0 add hf_mfu_amiibo_restore to restore an Amiibo dump to a blank NTAG215 2022-07-28 22:05:49 -04:00
Iceman 96f977ed8a
Merge pull request #1733 from gtalusan/amiibo-sim 
add hf_mfu_amiibo_sim to simulate Amiibo binary dumps
 2022-07-26 20:38:36 +02:00
George Talusan 17ee1ba3bb add hf_mfu_amiibo_sim to simulate Amiibo binary dumps 2022-07-26 13:22:32 -04:00
iceman1001 0ba072118e calloc 2022-07-25 08:01:38 +02:00
iceman1001 6290d50564 make style 2022-07-25 08:00:30 +02:00
iceman1001 2f7083a59a text 2022-07-25 07:45:57 +02:00
iceman1001 51408c89f6 fix #1722, this should fix the breaking on OSX for apdufind. Seems u64 triggers something in memory. Passing ref to array and makeing array u32 instead 2022-07-24 11:41:25 +02:00
iceman1001 9040a1a7d7 causes extra lines in trace list. 2022-07-24 08:21:49 +02:00
iceman1001 3001e2edce fix some SE / SIO ends with 0x05 , 0x00 only 2022-07-23 18:08:33 +02:00
iceman1001 5a8d9b7954 prep mac 2022-07-23 17:39:40 +02:00
iceman1001 cb82e848cc dense format to follow previous .... style 2022-07-23 17:37:04 +02:00
nvx 0177d2185f Added more details to the annotations of hf mfdes list output 2022-07-23 22:26:25 +10:00
Tiernan 925589a214
Merge branch 'master' into feature/iclass_dump_view_suppress_repeated_blocks 2022-07-23 12:39:14 +10:00
nvx 728e6d27c7 add preference for dense output option and -z cmd flag 2022-07-23 12:37:07 +10:00
Nathaniel McHugh 8cfbe6657b Add Paxton hitag2 password 2022-07-22 21:18:51 +01:00
iceman1001 881c32e0be change - added desfire product type identification 2022-07-22 09:47:11 +02:00
Tiernan 1b8fdfd5f5
Merge branch 'master' into feature/iclass_list_keys_on_check 2022-07-22 17:13:11 +10:00
Iceman 5b435ea034
Merge pull request #1727 from nvx/bugfix/iclass_key_access 
Fixed incorrect card config bit being checked for iClass key access flag
 2022-07-22 08:44:19 +02:00
nvx 30cc57d3aa Fix some bugs in the iClass SIO detection and printing 2022-07-22 14:06:47 +10:00
nvx 1acecc29b1 Changed hf iclass view to suppress consecutive blocks with repeated contents 2022-07-22 14:01:13 +10:00
nvx eb6b170e51 Changed hf iclass list to display matched keys on the CHECK command rather than the card response, and made it check for elite keys too 2022-07-22 13:58:04 +10:00
nvx 5c5a53963a Fixed incorrect card config bit being checked for iClass key access flag 2022-07-22 13:52:09 +10:00
nvx c36395f2cc Add hf gallagher decode command 2022-07-20 17:49:54 +10:00
iceman1001 6d950e1e48 fix coverity scan 2022-07-18 22:17:53 +02:00
merlokk c8b5ddc0fc fix int 2022-07-18 16:22:52 +03:00
merlokk e33e99e268 comment 2022-07-18 14:31:42 +03:00
merlokk 7818161e95 change option 2022-07-18 14:24:21 +03:00
merlokk 8df134f11a display fix 2022-07-18 14:22:16 +03:00
merlokk 24806f70e0 add tk15 decoding 2022-07-18 14:19:37 +03:00
merlokk 60d5cf1983 get samples from graph buffer instead of reading 2022-07-18 12:48:40 +03:00
merlokk 6f35f7c878 add no-fix parameter to data load to not to change source pm3 files 2022-07-18 12:46:11 +03:00
Oleg Moiseenko 1e1b669297
Merge pull request #1717 from merlokk/tk_mmbit 
add mmbit
 2022-07-18 11:39:49 +03:00
merlokk 075c530962 fix crc 2022-07-18 10:11:13 +03:00
merlokk 29086a42ab add check in the read command 2022-07-18 09:59:13 +03:00
merlokk 4b55047c5b add mmbit 2022-07-18 09:47:15 +03:00
iceman1001 0554ec220f hf plot - now uses NG 2022-07-17 19:29:47 +02:00