RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-15 14:20:51 +08:00
Code Issues Projects Releases Packages Wiki Activity
1856 commits 3 branches 14 tags 86 MiB
Commit graph

1856 commits

This branch
This branch
All branches
Author SHA1 Message Date
iceman1001
2d2f7d1948 ADD: @marshmellow42 's changes / fixes. 2015-05-31 21:47:33 +02:00
iceman1001
7142c87e1f ADD: a script to dump a specific type of Mifare Mini tags. 2015-05-31 21:46:25 +02:00
Martin Holst Swende
6cb08550c4 Merge pull request #112 from marshmellow42/master 
combine mfu read/write commands + various bug/typo fixes
 2015-05-31 13:08:36 +02:00
marshmellow42
1c4c0b0681 add @Iceman1001 s sha1 scripting changes. 2015-05-30 21:51:15 -04:00
marshmellow42
185e038c7d fixed further typo in lf t5 wr help 
also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer
 2015-05-28 23:14:06 -04:00
marshmellow42
5b37e87a24 fix help typo 2015-05-28 22:52:41 -04:00
marshmellow42
979bba376d add offset option to data printdemodbuffer 
easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>
 2015-05-28 13:23:31 -04:00
iceman1001
95aeb706d7 CHG: @marshmellow42 changes on deviceside. 
ADD: increase debuglevel for printing a statment in ul_ev1_auth
 2015-05-27 23:23:46 +02:00
marshmellow42
e35031d2b7 MFU code cleanup - final ? 
fixed bug in debug print in MF 1k sim.
 2015-05-27 17:21:42 -04:00
marshmellow42
4973f23d3c clean up mfu device side code 
+ add xor calc to util (prep for desfire)
commented out MifareUWriteBlockCompat as it isn't used in client
currently (it is a command we could support..  but why?)
relabeled a few device side mfu functions to be clearer.
 2015-05-27 12:24:13 -04:00
Pavel Zhovner
799b2e2e9d Compiling manual for MAC OS X 2015-05-27 11:30:50 +03:00
marshmellow42
be10fe2f11 update changelog 2015-05-27 00:32:01 -04:00
marshmellow42
dcbaa2b582 @iceman1001 s lua script fix 2015-05-26 20:31:07 -04:00
iceman1001
b18948fd92 ADD: aes128_encrypt ECB in scripting.c 
ADD: aes128_decrypt ECB in scripting.c
ADD: Sha1Hex method in utils.lua
 2015-05-26 21:51:18 +02:00
marshmellow42
22342f6dfe Add clearCommandBuffer before SendCommand 
adjust output of mfu rdbl to be consistent
fix output of mfu dump in case startPage was specified. (also was
missing "i" in second print...)
 2015-05-26 10:40:23 -04:00
iceman1001
ea75b30c81 ADD: SHA1 hashes calculations in sha1.c and LUA 2015-05-26 16:12:33 +02:00
iceman1001
b69947c245 CHG: print up to 20 possible keys. 2015-05-26 11:05:57 +02:00
iceman1001
c3c241f389 CHG: moved a xor function into util.c 
CHG: added some calls to clearCommandBuffer() in /hf mfu/hf 14a sim/hf mf sim/ commands.
CHG: minor adjustments to relative pathing.
 2015-05-26 11:04:57 +02:00
iceman1001
7c60a801d6 FIX: one too many parenthesis 2015-05-25 13:16:10 +02:00
iceman1001
c068ebb78f Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/mifarecmd.c
	client/cmdhfmf.c
 2015-05-25 13:13:06 +02:00
iceman1001
46cd801c5a FIX: dumptoemul.lua removed the extra linebreak in the end, making some load commands complain. 
MOV: moved the try32/try64 attacks (mfkey32/mfkey64) into the nonce2key.c file
CHG: added @marshmellow42 changes to hf mfu dump layout.
ADD: an extra call to BigBuf_free in readcard..  just to make sure that it doesn't leak memory.
ADD: expermimental call to "try32" for "hf mf sim x".
 2015-05-25 13:10:55 +02:00
Pierre LALET
1d537ad65c Ported hf mf esave trick for unreadable UIDs to hf mf csave 
Thanks: iceman1001
 2015-05-25 11:47:27 +02:00
marshmellow42
e406dd5cc9 Merge remote-tracking branch 'upstream/master' 2015-05-24 22:31:13 -04:00
marshmellow42
79d7bcbb51 updated mfu rdbl and wrbl commands 
@iceman1001 s rdbl and wrbl cmd updates.
dump screen output adjusted
 2015-05-24 22:28:21 -04:00
Martin Holst Swende
96c4f5517e Merge pull request #107 from p-l-/fix-hfmf 
Fix filenames for hf mf cload / csave
 2015-05-24 23:10:21 +02:00
Pierre LALET
292fe72535 Fix filenames for hf mf cload / csave 2015-05-24 22:43:08 +02:00
iceman1001
7444d916c6 FIX: hf mfu dump, now reads correct memory from device-side. 
CHG: hf mfu dump - output data styled :)
 2015-05-24 21:51:44 +02:00
iceman1001
d23f3f2c9a FIX: ELOAD/ESAVE/CLOAD/CSAVE filename bufferoverflow, and filename generation if UID not readable. 
Thanks @p-l-
ref: 0b14440dce
 2015-05-24 21:50:15 +02:00
Martin Holst Swende
cae00c59ff Merge pull request #106 from p-l-/fix-hfmfeload 
Fix filenames for hf mf esave / eload
 2015-05-24 21:32:11 +02:00
Pierre LALET
0b14440dce Fix filenames for hf mf esave / eload 2015-05-24 20:14:22 +02:00
Martin Holst Swende
f0eaac9aca Merge pull request #102 from marshmellow42/master 
fix mfu dump getbigbuffer bug
 2015-05-24 07:22:09 +02:00
marshmellow42
0ce03d9ab0 fix mfu dump getbigbuffer bug 
Thanks @iceman1001 for catching my oops, and fixing it :)
 2015-05-23 22:35:50 -04:00
iceman1001
ce432659f2 Adjustments after the big merge from PM3 master. 2015-05-23 08:38:46 +02:00
iceman1001
bcf61bd34a Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h
 2015-05-23 08:16:40 +02:00
Martin Holst Swende
86724c17c9 Merge pull request #101 from marshmellow42/master 
hf mfu updates + hf search + bug fixes
 2015-05-22 21:55:34 +02:00
marshmellow42
012c0761bd hf mfu minor output adjustments 
dump key placed properly for EV1 and NTAGs

config pages for ntags corrected in printout

note on config that PWD and PACK cannot
actually be read from memory  (probably could just delete them (other
than it shows what memory block they are stored in for changing...)
 2015-05-22 13:17:51 -04:00
marshmellow42
8f2e50b4c5 mfu info authkeyptr fix 
didn't follow @iceman1001 s l parameter changes fully...  fixed now..
:)
 2015-05-22 07:29:18 -04:00
iceman1001
a7e7cd419a FIX: camelcase on a variable caused some issues. 2015-05-22 08:48:23 +02:00
marshmellow42
06561c34ef fix to dump cmd print keys. 
add l option to info cmd.
add ascii print to dump (screen only)
other minor clean up
 2015-05-22 00:15:57 -04:00
iceman1001
2491a25235 FIX; the "L" optional parameter for swapping endianess on used authentication key. It is now implemented for following commands. 
"HF MFU INFO"
"HF MFU DUMP"
"HF MFU RDBL"
"HF MFU WRBL"

CHG;  I commented away the option to add the key to the dump, since it is not written in big-endian, like the data is on ULC. This needs to be addressed before it comes back. I like the idea of having keys inside the dumps on the correct places.
 2015-05-21 23:17:01 +02:00
marshmellow42
efd193519c hf mfu bug fixes, and help text fixes 2015-05-21 11:17:01 -04:00
iceman1001
f605970307 FIX: call the wrong usage_hf_mfu method. 
CHG: minor help text changes.
 2015-05-20 23:52:56 +02:00
iceman1001
fff69a1e34 CHG: Merged the "hf mfu rdbl" and "hf mfu crdbl" commands into "hf mfu rdbl". One read command. 
CHG:  Merged the "hf mfu wrbl" and "hf mfu cwrbl" commands into "hf mfu wrbl". One write command.

Both new commands implement a help, authentication (0x1A/0x1B) for ULC and the rest,
 2015-05-20 23:44:11 +02:00
marshmellow42
1c429594a1 further mfu info updates 
needed to auth select when a command failed for locked tags.
some output cleanups from @iceman1001
 2015-05-20 16:47:40 -04:00
iceman1001
329f5cf2a5 CHG: making sure all outputs follow the same pattern in "hf mfu info" 2015-05-20 22:04:40 +02:00
iceman1001
c81a80dc96 FIX: made the authentication part a bit clearer. It now uses two booleans to seperate which type of authentication was requested from user. 2015-05-20 21:44:22 +02:00
marshmellow42
cd87ee9133 finish NTAG i2c +... 
thanks iceman
 2015-05-20 15:42:58 -04:00
marshmellow42
46fcd738e0 finish NTAG i2c +... 
thanks @iceman1001
 2015-05-20 15:41:48 -04:00
iceman1001
1fa96198bb ADD: @marshmellow42 latest fixes, 
CHG: change name to fancey "NTAG I²C 1K"
 2015-05-20 21:03:58 +02:00
marshmellow42
8241872c47 ULEV1_48 had the wrong max block 2015-05-20 14:22:26 -04:00