Commit graph

125 commits

Author SHA1 Message Date
Philippe Teuwen 290f2b625b Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0 -> NG and SendCommandOLD ....,NULL,0 -> MIX 2019-05-07 19:51:33 +02:00
iceman1001 39272ba1fb convert sendOLD -> MIX for simple cmds 2019-05-07 19:13:14 +02:00
Philippe Teuwen 645a4e9d1d generalize KEYS_IN_BLOCK usage 2019-05-01 14:55:14 +02:00
Philippe Teuwen 13b2e6eed7 Fix hf mf chk 2019-05-01 12:19:51 +02:00
Philippe Teuwen 4f11ef048f style 2019-05-01 01:38:52 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
iceman1001 6cddaa0a08 fix: 'hf mf keybrute' - adapt to NG for checkkeys. Kind of out-of-datem, since hardnested solves this better. 2019-04-30 14:29:52 +02:00
iceman1001 c1445d2a31 CHG: 'hf mf chk' - uses NG 2019-04-30 14:01:23 +02:00
Philippe Teuwen 56f92348ea style 2019-04-29 22:41:28 +02:00
iceman1001 f4b75d7f5b fix: ndef parse uri off by one 2019-04-29 14:42:37 +02:00
Philippe Teuwen 1c136c8fc6 Merge branch 'master' into experimental_varlen
* master:
  rework Dbprintf & add color support
  use color macros
  doc magic
  archive and fix hid-flasher
  update standalone readme
2019-04-26 10:48:28 +02:00
Philippe Teuwen 70995f0f1e use color macros 2019-04-26 08:29:48 +02:00
Philippe Teuwen 2ac5482d9c SendCommandOLD & errors retval: mifarehost 2019-04-19 01:45:45 +02:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
Philippe Teuwen 97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen ce606b51fc Handle explicitly enum vals in switch [-Wswitch-enum] 2019-04-13 22:46:08 +02:00
Philippe Teuwen 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
Philippe Teuwen 4f32655004 use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-13 00:25:43 +02:00
Philippe Teuwen 0ab6de64d4 structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers] 2019-04-10 13:59:00 +02:00
Philippe Teuwen 7f76fea21a good const, bad const, fixing -Wincompatible-pointer-types-discards-qualifiers 2019-04-10 10:21:42 +02:00
iceman1001 cf21db6f38 unused 2019-04-09 21:38:04 +02:00
iceman1001 c19b5977d4 unused 2019-04-09 21:36:52 +02:00
iceman1001 4c4471331b fix 2019-04-07 18:32:03 +02:00
iceman1001 27003904ce printandlogs.. 2019-04-07 18:12:58 +02:00
iceman1001 8d9bd81020 never used assignments 2019-04-07 16:49:22 +02:00
iceman1001 7bf24a170f style 2019-04-07 15:22:01 +02:00
Philippe Teuwen 51d6fa13eb arg names 2019-04-06 21:46:00 +02:00
Philippe Teuwen 98d9408746 make style 2019-04-06 00:52:55 +02:00
Philippe Teuwen 366c1ec901 style 2019-04-06 00:07:48 +02:00
iceman1001 cd78a0878b fix: duplicate breaks 2019-04-04 22:08:23 +02:00
iceman1001 ffdd91cab6 add: 'hf 14a info' - uid changeable tests, finds two kinds of Gen2 / CUID. 4byte / 7byte but there other Gen2 cards which will not be detected by this. 2019-03-21 12:53:05 +01:00
iceman1001 c9cb16d428 fix: mfkey32, cut and paste error? 2019-03-17 13:51:47 +01:00
Philippe Teuwen 1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +01:00
Philippe Teuwen 961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00
Philippe Teuwen 0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen 0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
Philippe Teuwen 60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
iceman1001 9764381aa4 fix: ndef - missing comma 2019-03-08 17:25:36 +01:00
merlokk cfcdbcdcee added some checks into madcheck 2019-03-06 00:50:12 +02:00
merlokk 05f5fb3e47 del verbose on warning 2019-03-06 00:43:59 +02:00
Oleg Moiseenko 8302751db7
Merge pull request #112 from merlokk/ndef_tlv
Ndef reading for and mfp
2019-03-05 19:58:28 +02:00
merlokk 53e0d03098 ndef cert right decode.
https://github.com/skjolber/ndef-tools-for-android/blob/master/ndeftools/src/org/ndeftools/wellknown/SignatureRecord.java
https://github.com/nfcpy/ndeflib/blob/master/src/ndef/signature.py
2019-03-05 19:41:50 +02:00
merlokk 04a6a63427 rename 2019-03-05 18:43:12 +02:00
merlokk 581fe408ba ndef sig decoding 2019-03-05 18:14:30 +02:00
merlokk a2be59db25 URI decode 2019-03-05 17:50:51 +02:00
merlokk c7c97d35b5 some code to decoding payload 2019-03-05 17:25:11 +02:00
merlokk 7003783c08 refactoring 2019-03-05 16:43:13 +02:00
merlokk fffa921aa0 ndef record decode OK 2019-03-05 16:41:20 +02:00
merlokk 34a133451e small addon 2019-03-05 01:02:54 +02:00
merlokk 3bf618ca56 log structure 2019-03-05 00:54:45 +02:00
merlokk 64a5b355b5 added ndef record parse sketch 2019-03-05 00:51:32 +02:00
merlokk a2f8f0628c added ndef tlv parsing 2019-03-05 00:48:02 +02:00
merlokk 0a30e03aaf add header 2019-03-05 00:13:01 +02:00
merlokk cbe25f4832 add ndef.c/h 2019-03-05 00:11:31 +02:00
sh7d 59bae84531 Mifare mad - do not exit if checksum is shitty 2019-03-04 22:12:10 +01:00
Philippe Teuwen 0944a12744 Add missing header 2019-03-04 20:27:57 +01:00
merlokk f45c330843 small visual fixes 2019-03-04 19:25:13 +02:00
merlokk 2c07bb790c hf mfp mad read contents by aid 2019-03-04 19:18:44 +02:00
merlokk ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
2019-03-01 19:37:43 +02:00
merlokk 3a98c9fcd3 fix mad2 crc8 check 2019-03-01 19:13:59 +02:00
merlokk 5cc4bea4e3 mfp refactoring 2019-03-01 19:05:51 +02:00
merlokk 6208a6869c added mad decode for mfp 2019-03-01 18:50:25 +02:00
merlokk 4d79ced1a9 ашчуы шт ьфвюс 2019-03-01 18:49:53 +02:00
merlokk 20be5c5d9f some of MAD2 code 2019-02-22 19:58:50 +02:00
merlokk 5122e1289d info-byte 2019-02-22 18:24:22 +02:00
merlokk 91ed51c673 add comment 2019-02-22 18:06:37 +02:00
merlokk 8010f2dc5e MAD1 OK 2019-02-22 18:05:45 +02:00
merlokk 01c9325469 check MAD crc 2019-02-21 20:06:53 +02:00
merlokk b9dc841bf9 MAD. print GPB 2019-02-21 19:44:07 +02:00
merlokk db7580203b create mad.c/h 2019-02-21 19:34:12 +02:00
merlokk 3b21b17509 move mifare stuff to its folder 2019-02-21 19:15:46 +02:00