1932 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
pwpiwi	db68bcdb06	Complete WTX handling	2017-11-15 07:47:18 +01:00
marshmellow42	aa264aba1d	Merge pull request #480 from pwpiwi/fix_nested ... fix memory overflow in hf mf nested (issue #479)	2017-11-13 09:42:56 -05:00
pwpiwi	e537c3e894	fix memory overflow in hf mf nested (issue #479)	2017-11-12 18:08:57 +01:00
Iceman	c3511781a1	Merge pull request #478 from wsmoses/master ... Fix memory bounds error	2017-11-11 22:45:37 +01:00
Iceman	230eaa5391	Merge pull request #477 from merlokk/wtx ... Added work with S-Block WTX in 14a apdu on arm side	2017-11-11 22:16:19 +01:00
William S. Moses	874572d419	Fix memory bounds error	2017-11-11 16:15:29 -05:00
merlokk	ba4f95b4af	added some info from @peterfillmore fork	2017-11-11 23:05:08 +02:00
merlokk	a63505c953	Added work with S-Block WTX in 14a apdu on arm side	2017-11-11 22:56:50 +02:00
Iceman	c0e852f907	Merge pull request #475 from merlokk/master ... true fix #472 )))	2017-11-11 00:39:29 +01:00
merlokk	298143218a	true fix #472 )))	2017-11-11 01:28:20 +02:00
Iceman	8b5ec1f4a6	Merge pull request #474 from merlokk/df_fix ... change `ul_switch_off_field` to `DropField` fix #473	2017-11-11 00:24:38 +01:00
Iceman	7c84f80657	Merge pull request #471 from marshmellow42/master ... fix lf search bugs when no tag is on antenna …	2017-11-11 00:24:20 +01:00
merlokk	872337e019	change ul_switch_off_field to DropField fix #473	2017-11-11 01:19:34 +02:00
Iceman	c425cc7efc	Merge pull request #472 from merlokk/master ... fix #468	2017-11-10 23:45:45 +01:00
merlokk	77499f6fb2	fix #468	2017-11-11 00:43:29 +02:00
Iceman	d940ebfbad	Merge pull request #470 from pwpiwi/mod_indent ... add: proper indentation when printing TLV objects	2017-11-10 23:21:26 +01:00
pwpiwi	33a9982c76	dump only leaf TLV data	2017-11-10 23:09:08 +01:00
marshmellow42	cb593491df	fix incorrect variable name ... that is what i get for going back over my code and trying to mimic the naming style used previously...	2017-11-10 16:03:55 -05:00
marshmellow42	217cfb6b29	fix lf search bugs when no tag is on antenna ... cotag read could enter endless loop, now cancels if the next bit doesn't appear em4x05 detection would loop due to a threshold never being met, now has a dump out after 1000 samples tested. fixed some indenting in hitag2 while i was reviewing that code for potential endless loops...	2017-11-10 15:57:55 -05:00
pwpiwi	43912d6349	add: proper indentation when printing TLV objects	2017-11-10 21:54:07 +01:00
Iceman	7c8115b273	Merge pull request #466 from pwpiwi/mod_14areader ... revert field on/off in hf 14a reader, fix typo	2017-11-10 20:53:20 +01:00
pwpiwi	f5adb06fae	revert field on/off in hf 14a reader ... fix typo	2017-11-10 20:14:00 +01:00
Iceman	e464f62258	Merge pull request #462 from pwpiwi/fix_hfmfsim ... Fix hf mf sim (issue #412)	2017-11-10 18:07:25 +01:00
Iceman	881eacc8aa	Merge pull request #461 from merlokk/14a_rework3 ... added `hf 14a apdu` #447 part 3	2017-11-10 17:14:38 +01:00
merlokk	9658b9e137	move include modules from h to c file	2017-11-10 09:15:56 +02:00
merlokk	86a1c1dc25	eliminate double DropField command	2017-11-09 22:01:00 +02:00
merlokk	b7d3e89923	changed iso14aapdu arm side and client	2017-11-09 16:39:40 +02:00
merlokk	eb6e8de45d	moved includes, added clear_trace flag (it was there...) and fixed multiapdu iso14443 stream	2017-11-03 13:42:38 +02:00
pwpiwi	82f4955245	Merge branch 'master' into fix_hfmfsim	2017-11-02 21:37:42 +01:00
pwpiwi	b35e04a7c6	fix hf mf sim: ... * more timing fixes * correctly determine correction bit (taken from iceman's fork) * add checking of Access Conditions for Read command * never allow reading KeyA	2017-11-02 21:29:08 +01:00
merlokk	1d6f7bc8ac	added changelog	2017-11-02 14:28:05 +02:00
Oleg Moiseenko	378d3406ca	Merge branch 'master' into 14a_rework3	2017-11-02 14:14:55 +02:00
merlokk	23207d748f	tlv decoder works.	2017-11-02 14:11:42 +02:00
Oleg Moiseenko	75e42ef5df	added changelog (#460)	2017-11-01 20:37:18 +01:00
Oleg Moiseenko	fe6bf3c58c	improve hf 14a info (#457) ... * added validate_prng_nonce from iceman1001 fork * added DetectClassicPrng from iceman1001 fork	2017-11-01 17:48:59 +01:00
Oleg Moiseenko	83df98d691	change comment in iso14443a.c (#459)	2017-11-01 17:44:43 +01:00
merlokk	499df9088d	fix behavier reading iso14443-3 and iso14443-4 cards	2017-11-01 18:34:15 +02:00
merlokk	7376da5c44	revert SAK check	2017-11-01 18:22:03 +02:00
merlokk	bed3e4c20d	Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3	2017-11-01 17:13:27 +02:00
merlokk	89ec86abd2	now SAK check is OK	2017-11-01 17:02:35 +02:00
merlokk	c5e9a0212e	deleted condition in iso14a select (sak & 0x20 ==0) - error. Usually SAK = 88	2017-11-01 16:55:12 +02:00
marshmellow42	9d139870cb	Merge pull request #456 from merlokk/hfreaderfix ... fixed bug with `hf search 14a`	2017-11-01 07:57:30 -04:00
merlokk	fe842bed9c	fixed bug with hf search 14a	2017-11-01 13:54:03 +02:00
merlokk	a2bb2735d5	TLV decoding works	2017-11-01 13:38:29 +02:00
Oleg Moiseenko	7dac1034e5	Add hf mf info, change hf mf reader (#452) ... * copy functionality from `hf 14a reader` to `hf 14a info` * added command `hf 14a reader` with simple anticollision-select procedure. * add parameters to `hf 14a reader`. may start and end acting as reader	2017-11-01 08:51:05 +01:00
merlokk	78a94ff902	improved GetAPDUCode()	2017-10-31 19:19:49 +02:00
merlokk	5bcb3496fa	small refactoring	2017-10-31 19:11:23 +02:00
merlokk	fe346768b3	added showing apdu response codes	2017-10-31 18:14:32 +02:00
merlokk	a23f000182	move strucrture to .h file	2017-10-31 16:25:42 +02:00
merlokk	6fc6cd0f57	export apdu function	2017-10-31 16:20:23 +02:00