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

487 Commits

Author SHA1 Message Date
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
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
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
iceman1001
664bb5ae72 BUGS: more Coverity scan fixes. 2015-05-13 14:08:59 +02:00
iceman1001
8949bb5dad Added @marshmellow42 "hf search" 2015-05-13 09:13:42 +02:00
iceman1001
cd07302754 CHG: reverted a method declaration. 2015-05-05 00:35:56 +02:00
iceman1001
74daee24b8 CHG: for the 2k3des changes 2015-05-05 00:34:20 +02:00
iceman1001
8d53ea1403 CHG: added 2k3des to ULC READCARD. 2015-05-05 00:33:07 +02:00
iceman1001
062b7cb956 FIX: the HF MFU CREAD command on deviceside now can do a proper ATUTHENTICATION request with 2KEY3DES. 2015-05-01 15:29:19 +02:00
iceman1001
1ec21089b2 CHG: the work in progress of making "HF MFU INFO" / "HF MFU DUMP" goes on. 
ook @marshmellows changes and remade them a bit. TagTypeUL_t behaves like a flag-enum.
     "HF MFU DUMP" now autodetects tagtype, and the deviceside should report back proper length.
 2015-04-30 10:15:52 +02: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
fb2d24882e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
 2015-04-24 19:04:01 +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
5eae566a28 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-04-08 21:24:08 +02:00
marshmellow42
25d3e5cc83 Merge remote-tracking branch 'upstream/master' 2015-04-08 14:19:19 -04:00
Martin Holst Swende
83602affe5 Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337 2015-04-08 13:31:04 +02:00
marshmellow42
fef74fdce4 lf ask consolidation 
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category

front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
 2015-04-08 01:07:39 -04:00
iceman1001
49dc1d0a9e Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/lfops.c
	client/cmdlft55xx.c
	common/ldscript.common
	common/lfdemod.c
 2015-04-01 18:02:10 +02:00
iceman1001
b8f705e73e ADD: added some changes from Marshmellow 
CHG: minor change to the help text for "LF HITAG WRITE"
 2015-04-01 17:58:35 +02:00
iceman1001
e204bb7fb2 CHG: revert -O2 -> -Os compile 2015-04-01 17:52:24 +02:00
pwpiwi
f83c41c75b Merge pull request #89 from pwpiwi/image_shrink 
Reclaim more than 19K of ARM flash memory.
 2015-03-31 22:57:33 +02:00
Martin Holst Swende
d5d6f22718 Merge pull request #91 from marshmellow42/master 
lfdemod.c refactoring  (+ bug fixes)
 2015-03-31 22:11:19 +02:00
pwpiwi
e335ca2846 Reclaim more than 19K of ARM flash memory. 
- added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint)
- removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image
- moved the fpga images to the data section to avoid reserving unused space for a separate section
 2015-03-31 08:07:26 +02:00
iceman1001
02d352fea7 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	armsrc/lfops.c
	client/cmdlf.c
	common/lfdemod.c
	include/usb_cmd.h
 2015-03-30 21:11:37 +02:00
iceman1001
46c65fed6c CHG: adding some variable initalisation to the Uart. 2015-03-30 16:29:30 +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
Martin Holst Swende
caaf9618ae Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found 2015-03-29 21:49:58 +02:00
marshmellow42
2eec55c8a4 lfdemods streamline & bug fixes 
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod

cleaned up lfdemod.c some
 2015-03-27 00:02:30 -04:00
marshmellow42
e0165dcf3a Fixed indents to Tabs from Spaces 
Spacing changes ONLY - no code changes
 2015-03-25 14:24:36 -04:00
marshmellow42
327a690813 EM410x bug fix 2015-03-24 23:05:46 -04: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
754a35e72b ADD: added the ioprox checksum test to IOdemodFSK 
MENTIONED HERE:  http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
ADD:  changed the layout of the HID descramble patterns a bit,  and rearranged some hex/dec outputs.
 2015-03-23 17:11:45 +01:00
marshmellow42
13d77ef964 lf t5 read plus lf demod adjustments 
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
 2015-03-22 15:28:48 -04:00
iceman1001
b1db38e1b7 ADD: piwi's compiler flags -O2 2015-03-18 20:29:58 +01:00
iceman1001
78e875807f FIX: narrowed down the detect modulation even further. 
FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .

MISSING:
the detect, trace, info,  doesn't use a password for those tags with enabled password-mode.
 2015-03-16 22:45:06 +01:00
iceman1001
05446d5bc3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	common/crc.c
	common/crc.h
	common/lfdemod.c
	include/crc.h
	include/crc.h.old
 2015-03-16 13:13:18 +01:00
marshmellow42
b41534d142 adjust ask/biphase handling - more complete 
also added XL EM410x formats
 2015-03-15 22:03:50 -04:00
iceman1001
f2d46122d3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-12 19:01:09 +01:00
Martin Holst Swende
f7048dc8a9 Implemented usb_poll() within LF sim. This means the LF sim will be aborted whenever something comes over the USB 2015-03-12 16:32:01 +01:00
iceman1001
5ff3c4017b add: a experimental lualib, unstable. 
fix: Introduced a wrong variable name due to "cut & paste" before, now fixed.
 2015-03-12 09:50:22 +01:00
iceman1001
96f39a47a9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-11 22:21:01 +01:00
pwpiwi
04bc1c660b fix: hf 14a raw was broken 
(see http://www.proxmark.org/forum/viewtopic.php?id=2351)
 2015-03-11 20:19:30 +01: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
ada339a10f biphase bug fixes 2015-03-09 15:27:20 -04:00
marshmellow42
712ebfa6df 1 bug fix + code trimming 2015-03-07 23:31:23 -05:00
marshmellow42
df51693f95 Merge remote-tracking branch 'upstream/master' 2015-03-06 12:30:16 -05:00
marshmellow42
78f5b1a77c lf sim fixes/creations correct now 
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim  (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
 2015-03-06 12:28:54 -05:00
marshmellow42
e09f21fa7b Revert "lf sim fixes/creations" 
This reverts commit 293de1bad7.
 2015-03-06 12:26:33 -05:00