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

..

obj

Add obj/.dummy for clients that don't track empty dirs

2010-02-20 21:20:47 +00:00

aes.c

ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.

2015-01-13 23:18:04 +01:00

aes.h

ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.

2015-01-13 23:18:04 +01:00

appmain.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

apps.h

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

BigBuf.c

BigBuf and tracing rework: allow much longer traces in in hf commands

2015-01-28 07:18:51 +01:00

BigBuf.h

BigBuf and tracing rework: allow much longer traces in in hf commands

2015-01-28 07:18:51 +01:00

crapto1.c

Reverted some minor things, altered other things to get it to compile cleanly

2015-01-08 17:51:52 +01:00

crapto1.h

1. Mifare read block command

2011-05-26 12:55:15 +00:00

crypto1.c

1. Mifare read block command

2011-05-26 12:55:15 +00:00

des.c

ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.

2015-01-13 23:18:04 +01:00

des.h

ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.

2015-01-13 23:18:04 +01:00

desfire_crypto.c

FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works.

2015-01-04 22:49:54 +01:00

desfire_crypto.h

chg: LF t55xx trace

2014-10-06 19:42:50 +02:00

desfire_key.c

chg: LF t55xx trace

2014-10-06 19:42:50 +02:00

desfire_key.h

chg: LF t55xx trace

2014-10-06 19:42:50 +02:00

epa.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

epa.h

Basic support for EAC documents (e.g. German Identification Card)

2012-08-28 21:39:50 +00:00

fonts.c

Add license headers to armsrc/bootrom/common stuff

2010-02-21 00:12:52 +00:00

fonts.h

Add license headers to armsrc/bootrom/common stuff

2010-02-21 00:12:52 +00:00

fpgaloader.c

First check in.

2014-09-11 23:23:46 +02:00

hitag2.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

iclass.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

iso14443.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

iso14443a.c

BigBuf and tracing rework: allow much longer traces in in hf commands

2015-01-28 07:18:51 +01:00

iso14443a.h

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

iso15693.c

Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces.

2015-01-27 22:25:55 +01:00

LCD.c

First check in.

2014-09-11 23:23:46 +02:00

LCD.h

Add license headers to armsrc/bootrom/common stuff

2010-02-21 00:12:52 +00:00

ldscript

THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand.

2014-06-20 01:02:59 +02:00

legicrf.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

legicrf.h

legic write/simulate [Anon]

2010-05-06 11:24:01 +00:00

lfops.c

fix hid prox standalone bug

2015-01-28 12:55:04 -05:00

Makefile

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

mifarecmd.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

mifarecmd.h

First check in.

2014-09-11 23:23:46 +02:00

mifaredesfire.c

ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2,

2015-01-07 17:42:57 +01:00

mifaredesfire.h

chg: LF t55xx trace

2014-10-06 19:42:50 +02:00

mifaresniff.c

BigBuf and tracing rework: allow much longer traces in in hf commands

2015-01-28 07:18:51 +01:00

mifaresniff.h

Applied Holiman's fixes for iclass.c and CSNs

2014-12-17 20:33:21 +01:00

mifareutil.c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

2015-01-29 21:39:33 +01:00

mifareutil.h

BigBuf and tracing rework: allow much longer traces in in hf commands

2015-01-28 07:18:51 +01:00

printf.c

Split str* and mem* into string.[ch]

2010-02-21 00:10:28 +00:00

printf.h

Fix a couple of warnings

2010-02-24 20:34:13 +00:00

start.c

First check in.

2014-09-11 23:23:46 +02:00

stdint.h

Some random cleanup

2010-02-21 00:13:08 +00:00

string.c

ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.

2015-01-07 21:06:15 +01:00

string.h

ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.

2015-01-07 21:06:15 +01:00

util.c

CHG: minor code clean up in ArmSrc.

2015-01-08 00:08:33 +01:00

util.h

ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC.

2015-01-13 23:18:04 +01:00