RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-24 17:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
1745 commits 3 branches 14 tags 85 MiB
Commit graph

1745 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 334cc089c9 CHG: clearing a char array before using. 2015-05-06 22:41:40 +02:00
iceman1001 aebe77905b CHG: extracted the UL_C & UL magic tests. 
ADD: a raw write command also there.
CHG: "hf mfu info" got some more love,  looks better too.
      UL_EV1 / NTAG,  only try known passwords if AUTHLIM is set to 0.
 2015-05-06 22:40:46 +02:00
marshmellow42 372a82570b MFU adj to allow 0 len returns on raw cmds 2015-05-06 10:17:39 -04:00
marshmellow42 45673b9457 MFU adjustment to allow 0 len returns from raw cmds 2015-05-06 10:16:31 -04:00
marshmellow42 abab60ae21 MFU info adjustments 2015-05-06 09:27:03 -04:00
iceman1001 74c7ff4770 CHG: @marshmellows changes to anntations. 2015-05-06 14:20:24 +02:00
iceman1001 2b03dea768 ADD: UL-EV1 signature printing. 
CHG: @marshmellows changes.
 2015-05-06 14:19:23 +02:00
iceman1001 69a2953679 FIX: nasty bug when memcpy structs.. 
ADD: @piwi's  topaz commands
 2015-05-06 09:30:48 +02:00
marshmellow42 75377d29d6 MFU - Icemans further improvements 
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
 2015-05-06 00:55:29 -04:00
iceman1001 a903be4361 CHG: "HF MFU INFO" extracted more printstatements 2015-05-05 23:26:05 +02:00
iceman1001 b9a3c8642e ADD: "HF MFU INFO" Reading and printing of UL-EV1 configuration pages. 2015-05-05 23:14:55 +02:00
iceman1001 8297860e25 CHG: making sure no buffer overflows will occure in ul_send_cmd_raw by adding responseLength parameter to all calls. 
CHG: added UL-C configurations details to be printed
 2015-05-05 22:15:02 +02:00
iceman1001 996fda30ee BUG: missing %s in printing version tagtype. Thanks @Marshmellow! 
BUG: buffer overflow when reading the Capability Container.   Thanks @Marshmellow!
 2015-05-05 13:25:54 +02:00
iceman1001 7d010c4991 chg: minor spelling change from MIFARE_ULEV1_VERS -> MIFARE_ULEV1_VERSION 2015-05-05 00:37:13 +02:00
iceman1001 cd07302754 CHG: reverted a method declaration. 2015-05-05 00:35:56 +02:00
iceman1001 74daee24b8 CHG: for the 2k3des changes 2015-05-05 00:34:20 +02:00
iceman1001 8d53ea1403 CHG: added 2k3des to ULC READCARD. 2015-05-05 00:33:07 +02:00
iceman1001 09c2a802a1 ADD: @holimans changes. 2015-05-05 00:31:02 +02:00
iceman1001 f07e76c687 CHG: minor spelling 2015-05-05 00:27:34 +02:00
iceman1001 e1c88b0965 ADD: @marshmellows changes 2015-05-05 00:26:17 +02:00
iceman1001 2c74558d71 CHG: enhanced the "hf mfu info" a lot. It can detect UL/UL-C/UL-EV1/NTAG213/NTAG215/NTAG216 
and at present it can detect if a UL-C tag is magic (uid changeable)

FOR UL it writes the first configuration pages 0-3.
For UL_C  it tests some default 3des keys,  and lock / confg bytes at pages 42-43,44-47
For UL_EV1  / NTAG  it collects the GETVERSION command and tries to read 3 counters.,  it also tries one default password of 0xFF,0xFF,0xFF,0xFF  for the EV1 /NTAG  authentication 0x1B.

FOR UL_C_MAGIC,  it tries to see if the gatherd nonces for authentication 0x1A is the same, which indicates on my tags that they are magic.

There is the @marshmellow changes to "hf mfu dump" command.

This commit needs testing, and is to be considered experimental.
 2015-05-05 00:25:10 +02:00
marshmellow42 63e1d35a07 Merge remote-tracking branch 'upstream/master' 2015-05-03 23:31:58 -04:00
marshmellow42 f9848fd647 MFU dump UL-C with key 
adding UL-C auth and keys to dump cmd
swapped endian for input of hf mfu crdbl to match output of hf mfu info
cmd and tag info app
 2015-05-03 23:17:11 -04:00
Martin Holst Swende 4b36037948 Fixes to issue #100 2015-05-03 22:09:52 +02:00
marshmellow42 b3125340f3 Icemans UL-C Auth dev side fix plus a few other ... 
... small UL fixes
 2015-05-03 15:41:11 -04:00
iceman1001 1c1c5f4cae CHG: "hf mfu crdbl" help text, got at correct length 3des key. 
CHG: Added @marshmellows fixes for "hf mfu info"
CHG: moved some debug printandlog statements around.
 2015-05-01 15:33:54 +02:00
iceman1001 062b7cb956 FIX: the HF MFU CREAD command on deviceside now can do a proper ATUTHENTICATION request with 2KEY3DES. 2015-05-01 15:29:19 +02:00
marshmellow42 7eec1204e7 fix bug in mfu cauth 2015-04-30 10:34:20 -04:00
marshmellow42 92690507ab Iceman's updates to MFU info and dump 2015-04-30 09:28:43 -04:00
iceman1001 1ec21089b2 CHG: the work in progress of making "HF MFU INFO" / "HF MFU DUMP" goes on. 
ook @marshmellows changes and remade them a bit. TagTypeUL_t behaves like a flag-enum.
     "HF MFU DUMP" now autodetects tagtype, and the deviceside should report back proper length.
 2015-04-30 10:15:52 +02:00
marshmellow42 f168b2633b MF Ultralight - Iceman's updates + mine 
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
 2015-04-29 18:27:31 -04:00
iceman1001 a8be77afd1 CHG: re-factored the "HF MFU CAUTH" command to be simpler. 
ADD:  "HF MFU INFO",  added detection of MAGIC UL-C tags and a simple loop test 5 default 3des keys.
 2015-04-29 20:24:37 +02:00
Martin Holst Swende 5023d4cea8 Merge pull request #99 from Drewgoo/patch-1 
Update README.txt
 2015-04-29 08:00:25 +02:00
Drewgoo b0c76dd2cf Update README.txt 
typo
 2015-04-28 22:47:49 -06:00
iceman1001 c8ba098a9b REM: Removed the CSETUID stub. Its implemented on the client side instead. 2015-04-28 23:34:16 +02:00
iceman1001 5e336f53d9 REM: Removed the GetVendorStr, and used the getTagInfo() instead. 2015-04-28 23:32:45 +02:00
iceman1001 5d554ea67f ADD: HF MFU SETUID, this commands helps changing the UID on a magic UL, UL-C tag. 
It reads block2,  since only one byte is going to change. Then it proceds to write block 0,1,2 with recalc BCC1, BCC2 bytes.

CHG:  HF MFU INFO, got some love in the form of detection of UL/UL-C/UL-EV1.  Took same idea from HF 14A READER.
 2015-04-28 23:31:22 +02:00
Martin Holst Swende 2b90e3e670 Merge pull request #98 from marshmellow42/master 
Iceman's fixes for #93, #96, #97
 2015-04-28 23:08:28 +02:00
marshmellow42 bdfb62b405 Iceman's script aes fix #93 
Thanks Iceman (note I did not have a tag to double test this one. :)
 2015-04-28 15:53:07 -04:00
marshmellow42 e9b8d0dd6e Iceman's mf sim 7bt UID fix from #97 2015-04-28 15:43:58 -04:00
marshmellow42 4745afb647 Iceman's Issue #96 fix 2015-04-28 15:35:23 -04:00
iceman1001 68bf87e0c5 CHG: added some sanity checks for the Ultralight-EV1 annotations, to make less false positives in the tracelog 2015-04-28 20:59:20 +02:00
iceman1001 466bc4599c CHG: fixed a better detection for Ultralight, Ultralight-C, Ultralight-EV1 tags. 
--see https://github.com/Proxmark/proxmark3/issues/96
      -- still todo,  finding a good way of detecting Magic Ultralight-C tags.
      -- thanks @marshmellow for pointing out proper UL-C tags responses is different.
 2015-04-28 20:58:18 +02:00
iceman1001 76984409b9 FIX: forgot an argument. 2015-04-26 18:06:36 +02:00
iceman1001 fab0b37968 CHG: removed linebreak in string. 2015-04-26 18:05:45 +02:00
iceman1001 984f957105 ADD: some more default keys. 2015-04-26 18:05:06 +02:00
iceman1001 c309eca94a CHG: added some linebreaks for the help output in LF. 2015-04-26 18:03:57 +02:00
iceman1001 11b1e2e506 ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation 2015-04-26 18:03:21 +02:00
iceman1001 fb2d24882e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
 2015-04-24 19:04:01 +02:00
iceman1001 add0504dea ADD: Started a "collect nonces" concept to be able to analyse the tag generated nonces. 2015-04-24 18:41:49 +02:00