Commit graph

83 commits

Author SHA1 Message Date
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
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
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
merlokk
bed3e4c20d Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3 2017-11-01 17:13:27 +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
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
merlokk
d1300b47ae apdu sending refactoring 2017-10-31 16:08:58 +02:00
merlokk
8019540b19 param parsing convert to procedures 2017-10-31 15:15:57 +02:00
merlokk
f2b0169cc6 apdu works. 2017-10-31 13:28:16 +02:00
merlokk
f1a983a330 fixed bug in CmdHF14ACmdRaw: if we cant select we send command anyway... 2017-10-30 17:58:43 +02:00
merlokk
980417eacd iso14_apdu works via logical channel. not as it needs. it needs to change to raw( 2017-10-30 17:29:03 +02:00
Oleg Moiseenko
618c220c38 small fixes in ReaderIso14443a() (#446) 2017-10-29 16:34:51 +01:00
merlokk
1208cdcb45 added sketch for command hf 14a apdu 2017-10-27 19:02:45 +03:00
merlokk
7710983be3 added hf 14a apdu command. 2017-10-27 18:45:42 +03:00
Oleg Moiseenko
e17660d5f7 code cleaning (#445) 2017-10-26 19:09:53 +02:00
pwpiwi
c04a4b60ce Don't do iso14443-4 select for mifare emulations on processor cards (IDPrime, SmartMX, ...) 2017-10-01 17:52:10 +02:00
Fl0-0
7906cb41ff Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compatibility (#349)
* Improve 'Magic' Mifare tags detection

* Magic Mifare tags detection and version printing

* Magic s50/1k tag halt error correction for cload and csave

* hf mf c* commands for gen1b

* Use |= for bitwise operation

* gen1b: don't issue wipe command and don't expect response from WUPC1 magic command after a SELECT_UID: old UID display works in hf mf csetuid

* hf mf cgetsc compatibility for 4k

* hf mf csave compatibility for 4k

* hf mf cload compatibility for 4k, suppress halt errors messages for debug level 2

* Revert to MF_DBG_ERROR level in mifare_classic_halt() and don't issue the halt command for gen1b

* Improve 'Magic' Mifare tags generation detection & hf mf c* commands magic 4k compatibility
2017-07-12 15:58:32 +02:00
Iceman
2a7861ef0a Update cmdhf14a.c
need include to detection function
2017-06-26 21:58:03 +02:00
pwpiwi
ec9c71129f Fix compile errors with MacOS (#312)
* Fix compile errors with MacOS
- _POSIX_C_SOURCE must not be defined for num_CPU()

* separate util_posix.c require changes in tools directory as well

* remove unnecessary self-include
2017-06-07 22:35:20 +02:00
marshmellow42
b4810303f5 needs a ; ... ...
...
2017-06-06 12:57:11 -04:00
marshmellow42
e57c8b2e56 more coverity fixes
plus fix some spacing in functions i touched.
2017-06-06 12:45:00 -04:00
pwpiwi
acf0582d53 Provide msclock() as Milliseconds timer for performance measures (#231)
- don't use clock(). It has different functionalities in Windows and Linux
- move sleep functions to util.h
2017-03-12 15:06:27 +01:00
pwpiwi
7cb8516cb5 Client code cleanup:
- cleanup some header files and respective #includes
- rearrange functions (definition before first use)
- use SCNxxx instead of PRIxxx macros in scanf()
- use stdbool true/false instead of self defined TRUE/FALSE
2017-03-06 21:03:13 +01:00
pwpiwi
43534cbad2 Code cleanup:
- correctly use inttypes.h scanf and printf macros (PRIx64 et al)
- fix indendation warnings
2017-02-22 22:45:00 +01:00
ikarus
2943527472 Fixed all "misleading-indentation" warnings (fixes #187). 2016-09-26 21:15:49 +02:00
András Veres-Szentkirályi
7cdf6236cb Fixed copypasted hex output to match input
The value `x0` was obviously copypasted but not edited to reflect the real values used in `case` matching.
2015-11-09 21:06:58 +01:00
pwpiwi
db2b81ba11 Merge branch 'master' into topaz
Conflicts:
	client/Makefile
	client/cmdhf.c
	client/cmdhf14a.c
2015-07-01 08:17:00 +02:00
marshmellow42
c7442b7673 Add NTAG i2c and bug fix
also streamlined select tag code
2015-05-20 14:06:46 -04:00
marshmellow42
6ce0e5386a HF Search - refactoring cmds to work with it 2015-05-12 16:45:48 -04:00
marshmellow42
8ceb6b03e5 hf search - prelim - re-use hf mfu GetTagType...
in hf 14a reader to identify UL(+)

still a work in progress.
2015-05-12 00:19:44 -04:00
Martin Holst Swende
4b36037948 Fixes to issue #100 2015-05-03 22:09:52 +02:00
marshmellow42
4745afb647 Iceman's Issue #96 fix 2015-04-28 15:35:23 -04:00
pwpiwi
48ece4a750 add: Topaz mode for "hf 14a raw" (new option -T)
chg: allow tracing without parity
chg: make "hf list topaz" aware of additional commands for Dynamic Memory Model
2015-03-20 21:06:51 +01:00
pwpiwi
ee1eadee0f add: start to support Topaz tags
- hf 14a reader now exits gracefully in case of proprietary anticollision sequence
- changed miller decoder to handle Topaz 8 data bits/no parity frames from reader
- started to implement hf list topaz
2015-03-13 18:13:18 +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
pwpiwi
19a700a8b5 hf 14a: if the tag supports it, set default timeout according to ATS
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started
2015-02-11 22:20:22 +01:00
iceman1001
df3e429d71 minor fix for a help in "hf 14a snoop" 2015-01-21 21:24:37 +01:00
iceman1001
5ee701292f Step 2 - Ultralight / Ultralight-C
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
2015-01-20 21:23:04 +01:00
Martin Holst Swende
68033ed776 Fixed error when no match is found for uidmapping 2015-01-11 21:49:13 +01:00
iceman1001
79bf1ad2cc ADD: Jonor's timeout patch for "Hf 14a raw".
minor code clean up
2015-01-07 23:23:17 +01:00
iceman1001
b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K"
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua  script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
2015-01-07 22:00:29 +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
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
Martin Holst Swende
4c3de57ad2 Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands 2015-01-04 21:22:54 +01:00