Commit Graph

9964 Commits

Author SHA1 Message Date
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