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
marshmellow42
a98b05b71d
missed file in previous commit...
...
duh...
2015-05-19 15:03:35 -04:00
iceman1001
2c39c25c67
Minor clean ups
2015-05-13 09:06:47 +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
iceman1001
7d010c4991
chg: minor spelling change from MIFARE_ULEV1_VERS -> MIFARE_ULEV1_VERSION
2015-05-05 00:37:13 +02:00
iceman1001
11b1e2e506
ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation
2015-04-26 18:03:21 +02:00
iceman1001
0ec548dc21
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/cmdlf.c
client/cmdlft55xx.c
client/cmdlft55xx.h
client/scripts/test_t55x7_bi.lua
2015-03-24 11:45:31 +01:00
pwpiwi
16a95d76ac
fix: (issue #73 ) hf mf cload didn't work. Add more annotations for Magic Cards operation.
2015-03-09 21:36:27 +01:00
Martin Holst Swende
1defcf606f
More work on iclass full simulation, and some work on iclass tag dump parsing
2015-02-19 10:48:33 +01:00
Martin Holst Swende
b67f7ec359
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode
2015-02-18 20:02:44 +01:00
