iceman1001
|
f4a57e861d
|
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/iclass.c
client/loclass/cipher.c
client/loclass/fileutils.h
|
2015-02-19 11:32:11 +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 |
|
|
Martin Holst Swende
|
41524d8a39
|
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem
|
2015-02-17 22:07:40 +01:00 |
|
|
iceman1001
|
64d1b4efc9
|
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/Makefile
armsrc/appmain.c
armsrc/apps.h
armsrc/epa.c
armsrc/iclass.c
armsrc/iso14443a.c
armsrc/iso14443a.h
armsrc/iso15693.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
armsrc/string.h
armsrc/util.h
bootrom/bootrom.c
client/Makefile
client/cmddata.c
client/cmddata.h
client/cmdhf.c
client/cmdhf14a.c
client/cmdhf14b.c
client/cmdhf15.c
client/cmdhficlass.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/cmdlf.c
client/cmdlfem4x.c
client/cmdlfhid.c
client/cmdlfhitag.c
client/cmdlfio.c
client/cmdmain.c
client/data.h
client/flash.c
client/graph.c
client/graph.h
client/loclass/elite_crack.c
client/loclass/fileutils.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/lualibs/mf_default_keys.lua
client/lualibs/utils.lua
client/mifarehost.c
client/nonce2key/crapto1.c
client/proxmark3.c
client/scripting.c
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
client/scripts/tracetest.lua
common/Makefile.common
common/cmd.c
common/cmd.h
common/lfdemod.c
common/lfdemod.h
common/usb_cdc.c
common/usb_cdc.h
include/usb_cmd.h
|
2015-01-29 21:39:33 +01:00 |
|
|
Martin Holst Swende
|
d60418a05f
|
Synchronized loclass library, imported the legal warning
|
2015-01-15 16:30:05 +01:00 |
|
|
iceman1001
|
d3a22c7dfa
|
ADD: Holimans new changes in master.
|
2015-01-05 02:01:24 +01:00 |
|
|
iceman1001
|
2ae8a312e0
|
Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that the sim works.
Something about speed, the clock detection is not so good. should be 64, usually 67..
|
2014-10-27 19:46:21 +01:00 |
|
|
iceman1001
|
f38a152863
|
First check in.
|
2014-09-11 23:23:46 +02:00 |
|
|
Martin Holst Swende
|
aa41c6058a
|
Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo
|
2014-06-29 23:34:24 +02:00 |
|
Midnitesnake
|
74a3880283
|
Changes inorder for iclass dump to work correctly
|
2014-06-29 09:25:31 +01:00 |
|
|
Martin Holst Swende
|
3ad48540d4
|
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research
Conflicts:
README.txt
armsrc/apps.h
client/Makefile
client/cmdhficlass.c
client/cmdhficlass.h
|
2014-06-28 20:52:37 +02:00 |
|
penturalabs
|
fe53c0311c
|
improved calc_iclass_mac to work independant of size
|
2014-05-02 23:30:03 +01:00 |
|
Andrew Davies
|
a66fca86b9
|
Updated proxmark research with Holiman's loclass framework
|
2014-05-02 11:11:54 +01:00 |
|