dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,449 Commits 7 Branches 1 Tag
77533e21ae07c5156682dfd7139ceedd99b04c39
Commit Graph

176 Commits

Author SHA1 Message Date
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
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
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
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
iceman1001
e7e9508883 @Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses bigbuffer now, and can dump NTAG216 :) 
Consistency on the client-side code "hf mfu".  looks nice.
 2015-05-18 20:58:33 +02:00
marshmellow42
9d87eb6650 MF ultralight code cleanup 2015-05-18 13:11:00 -04:00
marshmellow42
8258f40969 Iceman1001 s MFU clean up 
cleaned up MF UL_C auth code device side.
 2015-05-17 20:49:25 -04:00
iceman1001
4d2e4eea58 CHG: the "HF MFU" authentication changes. 
CHG: name change from "hf 14a snoop"  ->  "hf 14a sniff"..
 2015-05-16 15:34:01 +02:00
marshmellow42
75377d29d6 MFU - Icemans further improvements 
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
 2015-05-06 00:55:29 -04:00
iceman1001
74daee24b8 CHG: for the 2k3des changes 2015-05-05 00:34:20 +02:00
marshmellow42
f168b2633b MF Ultralight - Iceman's updates + mine 
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
 2015-04-29 18:27:31 -04:00
iceman1001
c8ba098a9b REM: Removed the CSETUID stub. Its implemented on the client side instead. 2015-04-28 23:34:16 +02:00
iceman1001
76984409b9 FIX: forgot an argument. 2015-04-26 18:06:36 +02:00
iceman1001
add0504dea ADD: Started a "collect nonces" concept to be able to analyse the tag generated nonces. 2015-04-24 18:41:49 +02:00
iceman1001
aa60d1560e NEW: HF MFU SETPWD - set password to a Ultralight C tag. 
NEW: HF MFU SETUID - set UID to a magic UL / UL-C tag.   *not implemented*
CHG: minor alignment for "Hf list" output.
CHG: removed unneeded function parameters to the ultralight commands
CHG: the const MAX_MIFARE_FRAME_SIZE is changed to MAX_FRAME_SIZE in the ultralight commands since the UL-Ev1 can have bigger frames than 18bytes.
CHG: adding DES support for the Ultralight-c read commands on deviceside.
 2015-03-30 16:24:03 +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
marshmellow42
1fbf895616 lf updates 
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar -  for biphase demods
improve detectclock a for strong antennas
 2015-03-23 16:29:50 -04:00
iceman1001
12d708fec1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
 2015-03-10 09:18:35 +01:00
marshmellow42
872e3d4d6f NEW lf simpsk 2015-02-21 21:36:02 -05:00
marshmellow42
abd6112fc4 Revert "Revert "lf simask, lf simfsk and bug fixes"" 
This reverts commit e396001c47.
 2015-02-19 21:35:34 -05:00
marshmellow42
e396001c47 Revert "lf simask, lf simfsk and bug fixes" 
This reverts commit fb0c84c3df.
 2015-02-19 21:22:05 -05:00
marshmellow42
fb0c84c3df lf simask, lf simfsk and bug fixes 2015-02-19 21:21:11 -05:00
iceman1001
d716ca2fc1 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
 2015-02-16 18:59:44 +01:00
Martin Holst Swende
e80aeb9695 Started iclass emulator support on device side. Not functional yet 2015-02-14 21:30:26 +01:00
iceman1001
4ecde0e1ff Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/iclass.c
 2015-02-10 21:53:16 +01:00
Martin Holst Swende
61972abbdd Merge branch 'master' into GenericTracing 
Conflicts:
	armsrc/iso14443a.c
 2015-02-10 21:25:14 +01:00
iceman1001
1e3a799d47 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-02-10 09:01:31 +01:00
iceman1001
2b61c24212 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c
 2015-02-10 08:58:14 +01:00
Martin Holst Swende
3000dc4e7e Generic tracing; removed iso14a_XX-functions, removed traceLen as global varible 2015-02-07 20:49:40 +01:00
pwpiwi
3b692427ac Bugfix hw tune, hf tune: voltage measures were VERY wrong 
Modified hw detectreader: display reader field strength in mV units and to be less phony
 2015-02-07 10:14:49 +01:00
Martin Holst Swende
7d5ebac993 Merge branch 'master' into GenericTracing 
Conflicts:
	armsrc/iso14443.c
	armsrc/iso14443a.c
	client/cmdhf.c
	client/cmdhf14b.c
 2015-02-06 08:41:02 +01:00
Martin Holst Swende
0644d5e3a3 Merged with master 2015-01-31 18:21:38 +01:00
Martin Holst Swende
31abe49fd3 Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call 2015-01-30 23:03:44 +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
f6d9fb173f Added client-side support for recording longer samples, fixed last (?) issues on device-side 2015-01-29 00:57:22 +01:00
pwpiwi
f71f4deb8f BigBuf and tracing rework: allow much longer traces in in hf commands 
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
  e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
 2015-01-28 07:18:51 +01:00
pwpiwi
117d9ec25c Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces. 2015-01-27 22:25:55 +01:00
Martin Holst Swende
9e8255d4e9 Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory 2015-01-21 23:53:40 +01:00
Martin Holst Swende
f164662363 Merge branch 'master' of https://github.com/iceman1001/ForPm3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
 2015-01-15 21:50:03 +01:00
iceman1001
a631936e84 ADD: Midnitesnaks's & Pentura labs Ultralight-c modifications in ARMSRC. 
ADD:  des.c  ,  aes.c  in ARMSRC
 2015-01-13 23:18:04 +01:00
Martin Holst Swende
31d1caa526 Reverted some minor things, altered other things to get it to compile cleanly 2015-01-08 17:51:52 +01:00
iceman1001
787b5bd8a4 CHG: minor code clean up in ArmSrc. 
ADD: added some more default keys in Hf mf nested,  maybe it runs faster :)
 2015-01-08 00:08:33 +01:00
iceman1001
52ab55ab0d ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. 
ADD: added a manufacturer list in "hf 14a reader",  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: detect chinese magic backdoor commands in "hf 14a reader"
CHG: minor code clean up.
 2015-01-07 21:06:15 +01:00
iceman1001
10403a6a30 ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. 
ADD: added a manufacturer list for hf 14a reader,  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
 2015-01-06 11:17:02 +01:00
iceman1001
3fe4ff4f03 CHG: generic code clean up. Removal of commented code. 
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
 2015-01-05 15:51:27 +01:00
iceman1001
6ff6ade2f5 ADD: midnitesnakes desfire, ultralight changes from Unstable branch. 
ADD: Marshmellows fixes for the LF (demods) commands,  (LF SEACH)
ADD: Holimans changes with hash1_brute

FIXES:  minor fixes with some calls to "free" and redundant debug statement and code cleanup. removal of commented code.
 2014-12-31 11:35:43 +01:00
marshmellow42
6bfa18eab4 Merge pull request #1 from Proxmark/master 
Test
 2014-12-29 16:14:23 -05:00
marshmellow42
66707a3b3c LF Demod bug fixes and add lf em em410xdemod 
fixed a few bugs in lf demod that the streamlining added.  added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
 2014-12-29 15:32:53 -05:00
iceman1001
d52e4e8819 ADD: HF 14A READER is now able to see if a presented card responses to the chinese magic backdoor commands. 
FIX: simple namechange of some defines where it hinted it was related to "eml" when it wasn't.
 2014-12-26 21:32:58 +01:00