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
marshmellow42
ea11861793
minor adjustments to hf mfu
2015-05-20 14:17:43 -04:00
marshmellow42
c7442b7673
Add NTAG i2c and bug fix
...
also streamlined select tag code
2015-05-20 14:06:46 -04:00
iceman1001
623db3559b
CHG: the new NTAG_i2c_1K enums, broke the uint16_t size.. Had to go up one level.
2015-05-20 19:26:11 +02:00
iceman1001
05f7accdbb
CHG: @marshmellows changes.
...
ADD: NTAG i2c 1K / NTAG i2c 2K identification.
2015-05-20 19:20:26 +02:00
marshmellow42
a383f4b708
Add ntag 210, 212, 203 and bug fix
2015-05-20 11:27:44 -04:00
iceman1001
b61e397962
ADD: NTAG_210, NTAG_212 support / identification. @marshmellow42 's idea.
2015-05-20 14:09:40 +02:00
iceman1001
e9bb4f47ee
CHG: "hf mfu info" now always tries to read the NDEF CC. (was restricted to only NTAG213,215,216 before)
2015-05-20 10:36:55 +02:00
iceman1001
593fc3c9a3
FIX: comment out a #include to reveng (my experiment)
...
ADD: Started to add a NTAG203 identification. Its a hard tag to pinpoint. Doesn't have GET_VERSION,
2015-05-19 21:45:06 +02:00
marshmellow42
a98b05b71d
missed file in previous commit...
...
duh...
2015-05-19 15:03:35 -04:00
iceman1001
0a0d9a5828
@Marshmellow42 's fixes for bigbuf.
2015-05-19 18:46:38 +02:00
marshmellow42
d7acc6403e
hf mfu dump - bigbuf allocation fix
...
some larger nfc tags can get large so set the allocation to the 4k
CARD_MEMORY_SIZE buffersize.
2015-05-19 11:30:50 -04:00
iceman1001
d26849d4ae
CHG: the device-side code for "hf 14a sim x"
...
BUG: bcc1 xored error fix in "hf mf sim"
CHG: function rename Snoop -> Sniff.
2015-05-19 08:56:53 +02:00
marshmellow42
29250969b0
@iceman1001 s comments/updates mfu cmds
2015-05-18 22:07:11 -04:00