Commit graph

4535 commits

Author SHA1 Message Date
iceman1001
1010aacca0 Minor corrections in fskdemod i lfops.c , see Holimans branch.
BUG: fixed a variablename, that didn't get changed.
2014-10-27 09:56:18 +01:00
iceman1001
c6be64da09 Some more nasty bugs fixed in the lf t55xx manchester_decode method.
ADD: a little function to see if GraphBuffer is not used.
2014-10-26 23:16:25 +01:00
iceman1001
db297e69e1 BUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth 2014-10-26 21:30:29 +01:00
iceman1001
149aeadaa6 Minor bug fixes with help from Holiman.
FIX: sprint_hex, sprint_bin  has better length detection.
FIX: ui.c has removed all c99 array declarations, with malloc
FIX: hfmfmfu.c wrong length in one array caused crashes in CmdHF14AMfURdCard
FIX: cmdlft55xx.c CmdDump has now a correct pwd string.
2014-10-26 21:25:06 +01:00
Martin Holst Swende
9cc8a1e588 Some more docs, also made lf hid fskdemod a bit more stable. Should be no more false readings now 2014-10-25 22:42:27 +02:00
Martin Holst Swende
b225678574 Some minor changes and some documentation 2014-10-24 21:12:31 +02:00
Martin Holst Swende
1a5a0d7590 Fixed compilation issues, but functionality not tested 2014-10-24 20:53:43 +02:00
Martin Holst Swende
f97d4e2378 First try att merging with head 2014-10-24 20:46:02 +02:00
iceman1001
081151eabb FIX: data mandemod read the wrong part of BigBuffer (no correct offset) 2014-10-24 15:34:50 +02:00
iceman1001
c2d25819d8 BUG: the lf read now uses "getbigbuffer" which the offset from where the data starts in "data samples nnnnn" needed to be set.
ADD:  ioprox nxp identifikations
2014-10-24 00:04:56 +02:00
iceman1001
72e930ef32 FIXED: lf t55xx fsk now demods but only to binary.
ADD:  holimans lf io / hid fskdemod  changes.
2014-10-23 18:36:44 +02:00
iceman1001
fbceacc5b8 add: "lf t55xx info" option to use data from Graphbuffer.
add:  "lf t55xx trace"  option to use data from Graphbuffer.
2014-10-16 22:25:38 +02:00
iceman1001
7bd30f12ac Small fixes,
Fix: removed a call to free,  which I think made linux people unhappy during "lf t55xx rd 0"...
Add: "lf t55xx fsk"  now kind of outputs binary from "FSK2a R/40 R/50"..
2014-10-16 15:05:27 +02:00
iceman1001
7737657747 Fixed: the dampening field detection is enhanced. If half a frame (clock rate) of values is within 40% of the mean value then it is a dampening field. 2014-10-07 21:34:02 +02:00
iceman1001
f6c18637ca chg: LF t55xx trace
new:  LF t55xx info
2014-10-06 19:42:50 +02:00
iceman1001
75465377b9 Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/iclass.c
	client/Makefile
	client/cmdhficlass.c
	client/loclass/cipher.c
	client/loclass/fileutils.c
	client/loclass/ikeys.h
	include/usb_cmd.h
2014-09-19 10:50:34 +02:00
Martin Holst Swende
92d255d3dc Merge pull request #22 from Proxmark/PenturaLabs-iclass-research
Pentura labs iclass research
2014-09-19 09:50:56 +02:00
Martin Holst Swende
e6ee6c4cd1 Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research 2014-09-19 09:45:38 +02:00
iceman1001
3d93d4f940 Add: simple Application enum.
Fix:  Minor overflows found by Holiman.
2014-09-18 14:15:48 +02:00
iceman1001
313ee67ea2 Fixed: "hf mfdes info" 2014-09-18 12:38:31 +02:00
iceman1001
b44e523300 LF t55xx and LF em4x commands now should manchester decode data. However t55xx can have other settings and different encodings. 2014-09-16 13:56:06 +02:00
iceman1001
35147d51e3 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-09-14 17:36:00 +02:00
pwpiwi
c626c56ef5 hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition 2014-09-12 07:45:04 +02:00
iceman1001
76c7e6c363 Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
	client/cmdhfmf.c
2014-09-11 23:29:14 +02:00
iceman1001
f38a152863 First check in. 2014-09-11 23:23:46 +02:00
iceman1001
4a79e52c0b Added piwis patch,
first version of finding out the card size. Experimental.
2014-09-11 22:33:43 +02:00
pwpiwi
79db03ef63 hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file
- hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case.
- hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin).
  if there are unknown keys, write 0xffffffffffff instead to the file.
- provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from
  mf_default_keys.lua
2014-09-11 20:58:34 +02:00
pwpiwi
baeaf57950 fix/add support for 4K (and other non 1K) card sizes in hf mf commands
- hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A)
- hf mf restore (add): added (optional) card size parameter and support for non 1K cards
- hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf eget (fix): displayed three instead of one block
- hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility)
- hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
2014-09-10 19:04:50 +02:00
Martin Holst Swende
fdefed663f Some more lua-scripts and library fixes from iceman, including more default keys 2014-08-29 09:11:36 +02:00
Martin Holst Swende
5b1311fba2 Various scripts from iceman 2014-08-29 09:09:23 +02:00
pwpiwi
6e2f51a06e add *.eml to .gitignore 2014-08-05 18:45:37 +02:00
pwpiwi
bfb6a143ea bugfix hf mf sim
- an additional erronous byte was sent after SAK
2014-08-05 18:40:19 +02:00
pwpiwi
b03c0f2d86 bugfixes hf mf sim
- output of debug messages caused communication failures due to timing issues.
  hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim
2014-07-30 21:23:02 +02:00
pwpiwi
991f13f27d minor bugfixes to hf mf sniff and hf 14a snoop
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)
2014-07-15 08:39:56 +02:00
pwpiwi
9a573554e0 minor bugfix and enhancement to hf 14a reader
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.
2014-07-15 08:35:27 +02:00
pwpiwi
c7324bef28 Bugfix hf 14a raw:
number of bits sent was wrong when option -c was used without option -b
2014-07-01 08:28:28 +02:00
pwpiwi
1604d0a290 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2014-07-01 07:09:21 +02:00
Martin Holst Swende
9e28ee9f14 Only documentation and minor changes 2014-06-30 11:23:14 +02:00
pwpiwi
19d6d91fd5 hf 14a reader enhancement
In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.
2014-06-30 08:21:50 +02:00
Martin Holst Swende
9b82de75f4 more work towards iclass elite dumping.. not quite finished yet though :( 2014-06-30 00:20:40 +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
Martin Holst Swende
d2d0af8ca6 Merge branch 'PenturaLabs-iclass-research' of github.com:Proxmark/proxmark3 into PenturaLabs-iclass-research 2014-06-29 13:52:05 +02:00
Martin Holst Swende
dbf732ee41 Minor 2014-06-29 13:48:13 +02:00
Midnitesnake
74a3880283 Changes inorder for iclass dump to work correctly 2014-06-29 09:25:31 +01:00
Martin Holst Swende
26c0d833ac Some minor changes [iclass-related] 2014-06-28 22:57:48 +02: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
Martin Holst Swende
6c0f60ca7b Merge pull request #17 from Proxmark/iclass-fixes
Iclass fixes
2014-06-28 12:50:09 +02:00
Martin Holst Swende
6db28145ea Merge remote-tracking branch 'origin/master' into iclass-fixes 2014-06-28 12:47:40 +02:00
iZsh
238c503c38 fpga/min_max_tracker.v: english 2014-06-27 23:28:56 +02:00
pwpiwi
0dcf1ee3fd git housekeeping:
- added *.log files to .gitignore
- new file .gitattributes: tell git not to diff or merge binary *.bit (FPGA) files
2014-06-27 19:23:42 +02:00