RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-25 09:46:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
12148 commits 3 branches 14 tags 85 MiB
Commit graph

1748 commits

Author SHA1 Message Date
iceman1001 9b2fd29149 text 2020-11-28 23:54:58 +01:00
tcprst 5b526522c7
hf lto rdbl - now use cliparser 2020-11-28 17:51:46 -05:00
tcprst 02637193f7
hf lto restore - now use cliparser 2020-11-28 17:42:35 -05:00
tcprst 7423c59c5f
hf lto info, dump - now use cliparser 2020-11-28 17:37:23 -05:00
iceman1001 ae04b07c13 optional 2020-11-28 22:19:25 +01:00
iceman1001 0ecefcfbf4 text 2020-11-28 22:18:23 +01:00
iceman1001 3dd4160c5a fix coverity 307506 - textual 2020-11-28 14:42:02 +01:00
iceman1001 1fa2654f15 hf iclass chk - textual 2020-11-28 13:47:05 +01:00
iceman1001 ddfca6b415 textual 2020-11-28 13:46:33 +01:00
iceman1001 4bb63577c6 iclass chk / lookup / loclass - speedups 2020-11-28 13:46:16 +01:00
tcprst ee7ad062f2
minor bug fix 2020-11-27 21:23:28 -05:00
tcprst 448a0546b1
hf iclass sim - now use cliparser 2020-11-27 21:22:23 -05:00
tcprst a5ab00357d
hf iclass lookup - now use cliparser (untested) 2020-11-27 20:28:23 -05:00
tcprst 769e809104
hf iclass calcnewkey - now use cliparser 2020-11-27 19:51:54 -05:00
tcprst 4e1c1f96f8
hf iclass managekeys - now use cliparser 2020-11-27 18:27:02 -05:00
tcprst 1722d2cb43
hf iclass chk -now use cliparser 2020-11-27 15:46:06 -05:00
tharexde b18ded915a Merge branch 'master' into allin 
update 201127
 2020-11-27 21:24:33 +01:00
iceman1001 00f140683f lf keri - now supports continuous mode, EM (untested) 2020-11-27 19:41:25 +01:00
iceman1001 97b1562bad lf motorola - now uses cliparser, supports continuous mode, EM (untested) 2020-11-27 19:13:48 +01:00
iceman1001 e4bbd30f45 lf nexwatch - now uses cliparser, support continuous mode, EM (untested) 2020-11-27 17:54:34 +01:00
iceman1001 b2544faaf8 lf noralsy - now uses cliparser, contiuous mode, EM (untested) 2020-11-27 11:04:05 +01:00
iceman1001 edb70fe524 lf pac clone/sim - adapted output to always print cardid 2020-11-27 10:48:53 +01:00
iceman1001 90509c6a82 lf pac - now uses cliparser, support continuous mode, and EM (untested) 2020-11-26 23:43:43 +01:00
iceman1001 966ecd6193 added lf paradox sim (experimental), lf paradox clone / reader - now uses cliparser, support continuous mode, EM (untested) 2020-11-26 20:09:20 +01:00
iceman1001 263215d242 text 2020-11-26 20:08:04 +01:00
iceman1001 a1e94a100a text 2020-11-26 20:07:39 +01:00
iceman1001 c59d6cdc71 lf presco - now uses cliparser, continuous mode and clone to EM (untested) 2020-11-26 19:42:24 +01:00
iceman1001 2e1c906d9e text 2020-11-26 07:07:33 +01:00
tcprst db083034d6
make style 2020-11-26 00:44:26 -05:00
tcprst 62196c7228
standardize argument types - hex,dec,etc 2020-11-26 00:34:30 -05:00
tcprst f723ed0386
hf iclass wrbl - now use cliparser 2020-11-26 00:11:54 -05:00
tcprst 5130bb24e2
hf iclass rdbl - now use cliparser 2020-11-25 21:16:08 -05:00
tcprst f4b100b068
show both decimal and hex for iclass blocks 2020-11-25 18:42:22 -05:00
tcprst 88b7efe69a
hf iclass restore - now use cliparser 2020-11-25 18:00:32 -05:00
tcprst 6b3f12ffe9
hf iclass dump - now uses cliparser 2020-11-25 14:02:52 -05:00
iceman1001 48b493a77a lf ti read -> converted to cliparser but hard to test/verify these commands. Most likely the continuous mode doesnt work because of impl of calling wo waiting 2020-11-25 19:48:10 +01:00
iceman1001 0d1760ad04 try to please coverity 2020-11-25 19:42:45 +01:00
iceman1001 2b34c64dde fix coverity 226302 2020-11-25 19:28:27 +01:00
iceman1001 3de8560456 lf pyramid - now uses cliparser, contiouos mode, and clone to EM (untested) 2020-11-25 16:27:54 +01:00
iceman1001 a12f32efa6 lf securakey clone - now supports EM4305/4469 (untested) 2020-11-25 16:20:44 +01:00
iceman1001 b7c0d6aa5e lf viking clone - now supports clone to EM4305/4469 (untested) 2020-11-25 15:13:32 +01:00
iceman1001 63e92c187c lf visa - now uses cliparser and reader continuous mode 2020-11-25 14:43:39 +01:00
iceman1001 0cb3704eee textual 2020-11-25 14:43:09 +01:00
iceman1001 2ad7a5b7f1 lf securakey read - renamed and now support contiuous mode 2020-11-25 13:39:32 +01:00
iceman1001 2ff7221874 lf viking read -> now renamed and supports contiuous mode 2020-11-25 13:34:52 +01:00
iceman1001 1e6fcd0291 added lf securakey sim - untested 2020-11-25 10:51:54 +01:00
iceman1001 04e0cdc9cf lf viking - now uses cliparse 2020-11-24 15:40:13 +01:00
iceman1001 3cb12356a2 textual 2020-11-24 12:53:29 +01:00
iceman1001 d24e0436dc hf 15 wrbl - missing some data output 2020-11-24 12:52:55 +01:00
iceman1001 f59d57aaab lf securakey - now uses cliparser 2020-11-24 12:52:09 +01:00
tcprst 0c0411c144
add short option and fix typo 2020-11-23 16:07:03 -05:00
tcprst 9ef0e07d49
hf iclass encrypt - now use cliparser 2020-11-23 15:42:32 -05:00
tcprst 4d616a1c09
hf iclass decrypt - now use cliparser 2020-11-23 14:46:07 -05:00
tcprst 1afb335478
make style 2020-11-22 19:39:54 -05:00
tcprst c80c7646da
iclass esave, eview - now use cliparser 2020-11-22 19:33:11 -05:00
iceman1001 a11e2ed4a6 hf mfdes info - cmk textual ( #1062 ) 2020-11-22 23:42:00 +01:00
tharexde 51d4c821b1 Merge branch 'master' into allin 
update 201120
 2020-11-20 22:19:37 +01:00
tharexde 86b9d2c620 cosmetics 2020-11-20 22:03:19 +01:00
iceman1001 1f8638c03b remove unused key 2020-11-20 19:15:50 +01:00
iceman1001 f75ba9bb33 comment out iclass autopwn 2020-11-20 19:07:51 +01:00
iceman1001 448394fa18 more clear message (thanks @amal!) 2020-11-20 15:45:14 +01:00
iceman1001 3113cfabcb lf t55xx wipe - helptext (thanks @amal!) 2020-11-19 23:33:55 +01:00
tharexde e642c05e5c Merge branch 'master' into allin 
update 201119
 2020-11-19 23:21:19 +01:00
tharexde 56efc8adec rearrangements 2020-11-19 23:18:04 +01:00
iceman1001 177fcbe4ca lf fdx clone - helptext 2020-11-19 22:01:47 +01:00
iceman1001 381a87c138 msleep, hints, auto, now uses cliparser 2020-11-19 20:44:44 +01:00
iceman1001 57eef7c5a9 hf mfdes.. a session flag to keep track of rf field up/down. Now selectaid/createaid/deleteaid works. However, hf mfdes auth is needed before. the rest of the commands needs to be adapted to this new style. The reason is that a "select application" command aborts a current authenticated session. So we need to authenticate and keep that on until we done. 2020-11-19 12:15:47 +01:00
iceman1001 4d28ffc014 hf mfdes deleteaid - shouldn't select before since it cancels the current session 2020-11-18 23:58:50 +01:00
iceman1001 4cafbcc259 hf mfdes - keeping track in the tag object of rf_field active status 2020-11-18 23:47:54 +01:00
tharexde 6e6f016460 deleted uneccessary function 2020-11-18 22:43:16 +01:00
iceman1001 f6aebe381b lf hid demod - add raw back 2020-11-16 20:06:33 +01:00
Philippe Teuwen 29b3477b00 lto: textual 2020-11-16 12:27:53 +01:00
tharexde 333fb5cbd4 clean up 2020-11-15 21:59:25 +01:00
tharexde f6e37d868e switched to PM3 status/error codes as return codes (if possible/sensible) 2020-11-15 19:54:51 +01:00
Ave 7c5e3a29de
Fix old UID display on hf mf csetuid 2020-11-15 20:14:08 +03:00
tharexde 2b301b140e - switched to PM3 error/status codes for reset function 
- wording
 2020-11-15 17:15:56 +01:00
tharexde d36645334a renaming 2020-11-15 01:56:00 +01:00
tharexde 79e1159eaf Merge branch 'master' into allin 
update 201114
 2020-11-14 19:56:02 +01:00
iceman1001 596a97a886 hf 14a raw - adapt return codes 2020-11-14 15:25:27 +01:00
iceman1001 8a11bfee10 hf 14a raw - fix cli parse args 2020-11-14 15:21:41 +01:00
iceman1001 1ae89950eb dbg printing 2020-11-14 12:40:59 +01:00
Philippe Teuwen 0fc6f4d502 iceman egg 2020-11-14 01:13:07 +01:00
tharexde 7c0c4e2e7d deleted unnecessary memory checks (passwords are uploaded blockwise, the more passwords the more blocks) 2020-11-14 00:08:37 +01:00
Philippe Teuwen f37088095b compile with swig files if available 2020-11-13 22:40:06 +01:00
Philippe Teuwen b4d8222c9a Waveshare: tested diy '2.13 inch e-paper B (with red)' 2020-11-13 22:32:46 +01:00
tharexde b91792f1d7 deleted uneccessary includes 2020-11-13 20:27:57 +01:00
iceman1001 3afbcaff2f fix coverity 305864, should be released when pointer is nulled 2020-11-13 16:27:29 +01:00
iceman1001 d9de790ea0 fix coverity 305865, add extra checks might quiet the coverity warning 2020-11-13 16:26:46 +01:00
iceman1001 1b697d2e42 less printf 2020-11-13 16:08:48 +01:00
iceman1001 63a26e6091 hf 14a raw - now uses cliparser 2020-11-13 12:20:01 +01:00
iceman1001 45f93acf3d remove fprintf, fwrite in emv 2020-11-13 12:19:24 +01:00
tharexde 9415363262 updated usage information 2020-11-13 00:50:49 +01:00
iceman1001 e09c7a9a3a remove fprintf, fwrite , in prep for libpm3 2020-11-12 22:37:47 +01:00
Iceman 0dd4786361
Merge pull request #1057 from nyanotech/waveshare-canvas-size 
waveshare: fix dimensions of 2.7" screen, test 1.54" screen
 2020-11-12 21:56:30 +01:00
iceman1001 0f4e31bfb0 adapt return codes 2020-11-12 21:51:05 +01:00
nyanotech a28d407e3d
waveshare: fix dimensions of 2.7" screen, test 1.54" screen 2020-11-12 20:45:59 +00:00
iceman1001 a28e5a88d1 fix #1056 - swapendianess for filenames based on uid 2020-11-12 21:13:52 +01:00
iceman1001 243d509203 remove dump.c step2 2020-11-12 18:43:03 +01:00
iceman1001 4e6ba6fcf5 removing dump_buffer step1 2020-11-12 18:25:56 +01:00
tharexde e444c2e942 Merge branch 'master' into allin 
update 201111
 2020-11-11 22:39:02 +01:00
tharexde f1b0b91585 - Relocated write requests of function „4x50_wipe" from device to client 
- used "INPLACE" attribute for messages in function 4x50_chk
 2020-11-11 22:37:17 +01:00
iceman1001 14ea72ca5d hf 14a apdu - textual 2020-11-11 18:29:27 +01:00
iceman1001 bf4cdf6eb7 remove dump_buffer_simple 2020-11-11 18:05:05 +01:00
iceman1001 8f67b511a6 textual, in prep for removing dump_buffer_simple 2020-11-11 18:01:04 +01:00
tharexde 3d14dbfbd0 pressing the pm3 button now stops 4x50_chk function 2020-11-11 01:37:54 +01:00
tharexde 99a21ae38c Merge branch 'master' into allin 
update 201111
 2020-11-11 01:14:45 +01:00
tharexde ae96cd869a relocated "pwd block management" from device to client 2020-11-11 01:11:09 +01:00
Philippe Teuwen eadacd82f5 SWIG experiments 
Squash of the following commits (a full rebase was too hard :( )
* ef309cfdf N - SWIG: create pm3.c (5 months ago)  <Philippe Teuwen>
* 05ba6a73f N - swig pm3_device -> pm3 (5 months ago)  <Philippe Teuwen>
* d59630183 N - swig: move pm3.i (5 months ago)  <Philippe Teuwen>
* 6adcfad75 N - Fix historic make & cmake (5 months ago)  <Philippe Teuwen>
* bcbef2edf N - Fix typo with script_embedded (5 months ago)  <slurdge>
* 538ee4dab N - Better SWIG integration: autogen func & attributes (5 months ago)  <slurdge>
* 756b62466 N - SWIG: few helper scripts (5 months ago)  <Philippe Teuwen>
* 47ba4acd0 N - SWIG %extend (5 months ago)  <Philippe Teuwen>
* 21841cb9d N - simplify scripts (5 months ago)  <Philippe Teuwen>
* 78c4f7929 N - Revert "SWIG experiments: introduce context" (5 months ago)  <Philippe Teuwen>
* 1562b75fc N - SWIG experiments: introduce context (5 months ago)  <Philippe Teuwen>
* a503dfcd9 N - SWIG experiments (5 months ago)  <Philippe Teuwen>
 2020-11-10 23:27:21 +01:00
tharexde 8a1558757c Merge branch 'master' into allin 
update 201110
 2020-11-10 00:47:13 +01:00
tharexde b791d392b6 switched from emulator memory to flash memory for various functions 2020-11-10 00:39:48 +01:00
tharexde ff0c4f924a updated short descriptions of em4x50 functions 2020-11-10 00:37:43 +01:00
iceman1001 089ae507be structs needs to be PACKED 2020-11-09 15:24:19 +01:00
iceman1001 3cd2c0b47b allow to write tags in unsecured pagemode 2020-11-09 09:58:30 +01:00
iceman1001 f894560325 hf mfdes fixes 2020-11-08 18:59:36 +01:00
Iceman 8ca004294f
Merge pull request #1051 from mwalker33/t55-detect-with-wake 
T55 detect with wake
 2020-11-08 11:28:04 +01:00
mwalker33 983c3a3a63 Detect with wakeup 
Detect with wake option to address init deley or AOR set.
 2020-11-08 21:03:33 +11:00
Philippe Teuwen 928d787970 print uid in 14a reader @ mode 2020-11-07 23:21:06 +01:00
Philippe Teuwen f63cf02178 make style 2020-11-07 01:32:43 +01:00
Philippe Teuwen 7a7d9c818b Merge branch 'sliceratwork/master' into master 
* sliceratwork/master:
  restore commands.md
  Delete commands.md
  Fix capitalization for command descriptions
 2020-11-07 01:31:42 +01:00
iceman1001 427e7c02e8 hf mfdes auth - textual 2020-11-06 23:52:11 +01:00
iceman1001 ac9d33c35f sAPDU printing.. these different apdu structs will need to be unified 2020-11-06 23:50:31 +01:00
Andrei 54527d03bf Fix capitalization for command descriptions 2020-11-07 00:34:30 +02:00
iceman1001 2cc5fb383c reorder command table 2020-11-05 12:50:51 +01:00
iceman1001 7f6e3a7cfc textual 2020-11-05 12:02:54 +01:00
Philippe Teuwen d500d1d6e9 flasher: textual 2020-11-05 01:09:29 +01:00
iceman1001 e149dc4ad2 lf hid demod - print hex values of demod if unpacking of wiegand failed 2020-11-04 19:21:44 +01:00
iceman1001 0a0155fea7 refactore printDemodbuff fct. 2020-11-04 19:19:38 +01:00
iceman1001 d8b2f962e5 text 2020-11-04 08:24:44 +01:00
iceman1001 5f9abb0263 fix #1048 - add LTO dump type 0002 2020-11-04 08:24:17 +01:00
iceman1001 59a68dc4ec added 32bit, 37bit formats from cardinfo 2020-11-03 20:47:47 +01:00
iceman1001 877d9bd455 hf 14a info - ATS part got some love 2020-11-03 17:29:29 +01:00
Philippe Teuwen c03daf233c Add support for 10b UID in hf 14a sim 2020-11-03 02:32:41 +01:00
iceman1001 0e5640a631 fix coverity 303814 2020-11-02 18:28:15 +01:00
iceman1001 786accc487 fix coverity 286660 2020-11-02 17:59:30 +01:00
iceman1001 feddfe7f43 fix coverity 303441, 303442, 303486, 286660 2020-11-02 17:55:48 +01:00
iceman1001 e91c46616a fix, coverity 303794 2020-11-02 17:27:39 +01:00
iceman1001 89e7317489 fix, part coverity, part bad user input combo 2020-11-02 17:25:09 +01:00
Iceman 03bd9e00b2
Merge pull request #1046 from tcprst/iclass_cliparser2 
hf iclass eload, loclass - now use cliparser
 2020-11-02 08:03:58 +01:00
tcprst 4c333ff02f
Update references to hf iclass loclass 2020-11-01 21:02:51 -05:00
tcprst 9ec126a80b
hf iclass loclass - now uses cliparser 2020-11-01 20:58:14 -05:00
tcprst 2648ed0354
update eload argument text 2020-11-01 20:15:32 -05:00
tcprst 71cf7da4c2
hf iclass eload - now uses cliparser 2020-11-01 20:10:13 -05:00
tcprst 2eac5d8dd4 Fix missing hyphens on command examples 2020-11-02 01:53:30 +01:00
Philippe Teuwen 777cb5a8ce make style 2020-11-02 01:46:47 +01:00
Philippe Teuwen 7278310e27 clean 2020-11-02 01:46:05 +01:00
Philippe Teuwen a359e4fac4 Make use of aid_desfire info 2020-11-02 01:38:07 +01:00
tharexde 836ca5da40 Merge branch 'master' into allin 
update 201101
 2020-11-01 22:57:07 +01:00
tharexde 6af4bc1f1b - added first version of 4x50_chk 
- renamed 4x50_write_password to 4x50_writepwd
- added check regarding valid data in emulation memory for 4x50_esave
- minor changes
- introduced new cliparser
 2020-11-01 22:53:10 +01:00
tharexde 3ddd9f8a91 - added first version of 4x50_chk 
- renamed 4x50_write_password to 4x50_writepwd
 2020-11-01 22:44:16 +01:00
NZSmartie c9a10631de
Gallagher key checking is now supported on MIFARE Desfire 
Both `hf mfdes auth` and `hf mfdes chk` now support Key Diversification for
AN10922 and as special treat, Gallagher issued cards.

For `hf mfdes auth`:
```
    -d, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922, 2=Gallagher)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

And for `hf mfdes chk`:
```
    -f, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922, Gallagher)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

Examples:
- `hf mfdes auth -a 2081f4 -m 3 -t 4 -d 2 -n 2 -k 00112233445566778899aabbccddeeff`
  Will diversify the key for key `2` on AID `2081F4` for Gallagher issued cards

- `hf mfdes chk -f 1 -i 00112233 -d mfdes_default_keys`
  Will read in all the default keys from the dictionary, and diversify them
  using AN10922 with the input data `00112233`

- `hf mfdes chk -f 2 -d mfdes_default_keys`
  Will read in all the default keys from the dictionary, and diversify them
  using AN10922 but with input data generated from the card's UID, AID and
  key number.
 2020-11-02 01:41:48 +13:00
NZSmartie 634c69398d
Split out mfdes_get_info from CmdHF14ADesInfo 
Change needed so that UID can be read for later
 2020-11-02 01:09:48 +13:00
NZSmartie 5a3502920c
Improve hf mfdes chk key checking and fix specifying single AID 2020-11-01 13:40:46 +13:00
iceman1001 4b33a21d09 exclude 0x6d 00 2020-11-01 00:14:47 +01:00
tharexde d977902fd8 Merge branch 'master' into allin 
update 201031
 2020-10-31 14:56:23 +01:00
tharexde 098ca87c81 renamed std_read -> stdread 2020-10-31 14:53:52 +01:00
NZSmartie b788054aca
Add initial suport for MIFARE Key Diversification 
This adds two new options to `hf mfdes auth`

```
    -d, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

By specifying `-d 1` and some kdf data `-i 00112233`, the key will be
diversified using AN10922.
 2020-10-31 21:17:35 +13:00
tharexde 35a671d592 sing emulator memory for sim and restore 2020-10-31 01:51:40 +01:00
iceman1001 9c5b3b7a72 text, and no parity check for ADT 31 2020-10-30 21:28:56 +01:00
iceman1001 cc1ff2e3eb added Smartpass, bqt, and fixed non-parity for N10002 2020-10-30 21:20:26 +01:00
iceman1001 585d2e6e3e Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-30 21:19:52 +01:00
Philippe Teuwen c8d223b9c9 reminder... (thanks amal!) 2020-10-30 21:01:59 +01:00
iceman1001 6a6e3053d8 add casi-rusco 40bit format 2020-10-30 20:46:09 +01:00
iceman1001 e5e2852eb1 lf t55xx chk - now uses default dictionary if none is specified 2020-10-30 17:34:19 +01:00
iceman1001 60b12ca905 more details of recovery 2020-10-30 02:32:13 +01:00
iceman1001 d42350baff allow for different sectors 2020-10-30 02:25:54 +01:00
iceman1001 6534034e54 adapted reset 2020-10-30 02:19:15 +01:00
iceman1001 c1ed65bc4c added reset state 2020-10-30 02:12:36 +01:00
iceman1001 3b7200d1b1 hide debug 2020-10-30 02:06:14 +01:00
iceman1001 257358ac12 added "hf mf supercard" , to extract key from card 2020-10-30 02:04:44 +01:00
tharexde bb04832b9d first version of 4x50_eload and 4x50_esave 2020-10-30 00:41:45 +01:00
tharexde 18326934d6 compact address assignment 2020-10-29 23:12:46 +01:00
iceman1001 748f067143 text 2020-10-29 21:48:58 +01:00
iceman1001 55f913381c text 2020-10-29 21:46:46 +01:00
iceman1001 7cea1bcbf8 text 2020-10-29 19:51:26 +01:00
iceman1001 81db8c4f77 fix: hf mf autopwn, darkside now works 2020-10-29 19:46:32 +01:00
iceman1001 6391a9ab00 fix: run gen3 on non MFC 2020-10-29 10:54:22 +01:00
iceman1001 0e4f5f4865 fix #1036 , wrong offset used. Thanks @xianglin1998 2020-10-29 10:29:03 +01:00
tharexde 4c95c16e54 address has to be inserted twice, otherwise loop from for -> lwr fails, since lwr is 0 2020-10-29 00:23:14 +01:00
tharexde eefb8b82b9 use of already existing function in util.c 2020-10-29 00:01:15 +01:00
tharexde 236e3f82d8 4x50_sim: options 'u' and 'f' can not be used at the same time 2020-10-28 12:41:28 +01:00
Iceman 6c627f6b7b
Merge pull request #1015 from VortixDev/mifare_detect 
Improve MIFARE type identification
 2020-10-28 10:57:12 +01:00
iceman1001 127882ca70 textual 2020-10-28 10:41:44 +01:00
Philippe Teuwen 5a86a7757b tune em 4x05_info 2020-10-28 01:54:59 +01:00
Philippe Teuwen a45bb684f4 tune support for EM4369 & EM4469 2020-10-28 00:39:41 +01:00
Philippe Teuwen fdd11c3fb2 Fix MAD decoding for DESFire 2020-10-27 20:46:51 +01:00
tharexde 140037d9f0 Adaptation of the implementation of read function to that currently used in master branch 2020-10-27 19:16:54 +01:00
iceman1001 fce8da584a textual 2020-10-27 18:54:19 +01:00
iceman1001 89f305b842 forgot header file 2020-10-27 18:52:11 +01:00
iceman1001 52164a4fd1 hf 14b sriread -> hf 14b rdbl, renamed and refactored it to read a block. use dump, to dump whole tag 2020-10-27 18:26:14 +01:00
tharexde ce5181bdc9 added std_read command for em4x50 2020-10-27 18:18:02 +01:00
iceman1001 4c4f1b228f Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-27 17:19:54 +01:00
iceman1001 de2f64eb8e 14b sriwrite - adapt to new raw parser 2020-10-27 17:19:46 +01:00
Philippe Teuwen 66d5181a82 dfev3 pk 2020-10-27 10:30:19 +01:00
tharexde 0a41049bf6 adjusted descriptions 2020-10-27 01:09:19 +01:00
tharexde e63a40e5b6 added file upload for sim function 2020-10-27 00:53:50 +01:00
tharexde d6471f2231 Merge branch 'master' into allin 
update
 2020-10-26 22:20:32 +01:00
tharexde eee2540e85 adjustments regarding em4x50 (hopefully it works...) 2020-10-26 22:14:18 +01:00
tharexde 2b5e8f358e added simple sim function for em4x50 ( + some minor corrections) 2020-10-26 22:11:57 +01:00
tharexde 96e05d49df added simple sim function for em4x50 2020-10-26 22:10:48 +01:00
tharexde c1f5fc546d added import for em4x50 2020-10-26 14:35:09 +01:00
tharexde 3a698dfc0c reorder of file types (if extension is neither bin nor eml -> json is assumed) 2020-10-26 14:34:40 +01:00
tharexde bc87a6edf2 addded JSON import support for 4x50_restore 2020-10-26 14:04:39 +01:00
tharexde 9af388c1e1 added EM4x50 JSON export 2020-10-26 13:30:25 +01:00
iceman1001 d7d809a8e3 remove extra parenthesis 2020-10-26 10:00:44 +01:00
iceman1001 57f226c922 smart upgrade - now uses NG, added crc for each transfer to verify data integrity before flashing 2020-10-26 00:38:13 +01:00
tharexde 3ce365ee2b Merge branch 'master' into allin 
update
 2020-10-26 00:31:27 +01:00
tharexde 82c2f79dd0 dump function indicates use of tag UID in filename but takes device serial -> changed to UID 2020-10-26 00:22:11 +01:00
tharexde e834c30f6b added eml file format support for restoring 2020-10-26 00:14:37 +01:00
tharexde 86007bfdd4 replaced command parameter: a <addr> -> b <block> and w <word> -> d <data> 2020-10-25 22:01:52 +01:00
tharexde 881bdbf456 added new function 4x50_restore 2020-10-25 16:39:22 +01:00
tharexde 8ca8c307ad added new function 4x50_restore + unified cosmetic adaptions 2020-10-25 16:39:10 +01:00
tharexde 10aabebec5 added new function 4x50_restore 2020-10-25 16:37:55 +01:00
iceman1001 bc48941951 fix smart card 2020-10-25 01:12:20 +02:00
Philippe Teuwen e9b55acd00 typos 2020-10-24 19:50:14 +02:00
iceman1001 8f954ebf9d refactor continuous mode 2020-10-24 11:56:47 +02:00
Philippe Teuwen fcc70f7536 Add continuous mode for hf 14a reader 2020-10-24 01:18:51 +02:00
iceman1001 f11bc85a34 no spaces 2020-10-24 00:23:05 +02:00
iceman1001 34148b0383 fix https://github.com/RfidResearchGroup/proxmark3/issues/1029 2020-10-23 10:00:47 +02:00
Philippe Teuwen ceb709a512 typos 2020-10-23 01:31:33 +02:00
Philippe Teuwen 18a6d3e92a typos 2020-10-23 01:24:58 +02:00
iceman1001 6ffcc827a8 visual helptext 2020-10-22 22:16:44 +02:00
iceman1001 452ad19bb9 fix https://github.com/RfidResearchGroup/proxmark3/issues/1028 2020-10-22 17:44:37 +02:00
tharexde e1b3cbfc9f will have a closer look at this later... 2020-10-22 15:09:09 +02:00
tharexde 6dc4ed3301 syntax error 2020-10-22 15:07:36 +02:00
iceman1001 74760c6de6 hf lto dump / info - now adapts to different type_info 2020-10-22 12:20:39 +02:00
mwalker33 b94e4d927e Update cmdlfem4x.c 
Show clock reate for EM4100 tags
 2020-10-22 10:09:50 +02:00
tharexde 069018e72a Merge branch 'master' into allin 
update
 2020-10-22 01:01:59 +02:00
tharexde a04002ab1b redesign 2020-10-22 00:42:18 +02:00
iceman1001 085d7c6cc5 remove dublicate calls (thanks @doegox) 2020-10-22 00:05:44 +02:00
iceman1001 534fc5071b lf em 4x05_info - add known configuration identification 2020-10-21 14:03:36 +02:00
iceman1001 6c4b629547 em4x05 - psk detection improvement 2020-10-21 13:29:45 +02:00
iceman1001 ea6ac60726 renames 2020-10-21 13:26:28 +02:00
iceman1001 ce50c50fcd lf keri demod - when doing invert of bits, do before decoding 2020-10-21 08:49:40 +02:00
iceman1001 be8d2fbd25 add u64_from_hex, no need to use 0x, thanks @mwalker33!\n reverse blocks when cloning for em4305/4469 2020-10-21 08:42:33 +02:00
iceman1001 0ccbd6e0fb just for testing, lf keri clone , now has experimental support for EM4305 2020-10-21 00:37:36 +02:00
iceman1001 527d1c9442 all prepped for EM4x05 to be used with clone commands 2020-10-20 23:10:34 +02:00
iceman1001 2479b54eb9 forgot 2020-10-20 22:22:21 +02:00
iceman1001 fa96a6ef80 prepping for adding support of EM4305 to clone commands 2020-10-20 21:59:33 +02:00
Philippe Teuwen 47cfc778e3 typos 2020-10-20 20:22:54 +02:00
Philippe Teuwen e7a76cee5a ugly fix for gcc10 stringop-overflow warning 2020-10-20 19:28:57 +02:00
iceman1001 d8294a958b hf 14a antifuzz - now uses NG 2020-10-20 17:36:01 +02:00
iceman1001 2e27a493e8 revert to precision clock 2020-10-20 17:34:42 +02:00
Philippe Teuwen 3959b77feb 4x05 sniff: available offline 2020-10-20 16:12:34 +02:00
mwalker33 96a6b99a80 Update cmdlfem4x05.c 
Early bug fixs and extend to all commands.
 2020-10-20 16:06:13 +02:00
Philippe Teuwen a6beff18a5 fix em 4x05 bf 2020-10-20 15:46:44 +02:00
Philippe Teuwen ecf50070dd typo, thanks iceman 2020-10-20 14:16:15 +02:00
Philippe Teuwen 3b83e8e703 EM 4x05 login bf 2020-10-20 13:21:40 +02:00
Philippe Teuwen 9003b96312 EM: typos 2020-10-20 13:18:48 +02:00
Iceman 398da9eb0b
Merge pull request #1022 from mwalker33/em4x05-sniff 
Em4x05 sniff
 2020-10-20 11:16:15 +02:00
mwalker33 3979363b69 em4x05 sniff 
V1 for testing
 2020-10-20 17:52:32 +11:00
Philippe Teuwen 378f5faeb7 fix style 2020-10-20 01:06:07 +02:00
Philippe Teuwen 29f1147aad make style 2020-10-20 01:00:23 +02:00
Philippe Teuwen 8d14b46232 waveshare: tolerate (but ignore) alpha channel 2020-10-19 21:25:24 +02:00
Philippe Teuwen f1d39f7e53 fix support for waveshare 1.54 2020-10-19 15:48:53 +02:00
iceman1001 0e4a9fbc34 text 2020-10-19 12:42:26 +02:00
iceman1001 3616f145e1 textual 2020-10-19 10:33:45 +02:00
Philippe Teuwen 1731db2f0c EM4x05: init flipped array 2020-10-19 00:51:41 +02:00
Philippe Teuwen dd6044e508 EM4x05: use full preambles 2020-10-19 00:51:20 +02:00
Philippe Teuwen 95bf65cda9 Add EM 4x05 Login 2020-10-18 23:46:36 +02:00
Philippe Teuwen c86df6b83d em 4x05_chk: check if a pwd is really activated to avoid false positives 2020-10-18 16:16:21 +02:00
iceman1001 a36001ca03 hf iclass dump/view/decrypt - output redesign 2020-10-18 11:50:20 +02:00
iceman1001 452323fc11 take notice of read_once vs looping 2020-10-18 00:46:15 +02:00
iceman1001 e016582e1f textual 2020-10-18 00:15:09 +02:00
tcprst 41286b8230
remove cliparser buffer bandaid 2020-10-17 17:38:49 -04:00
iceman1001 2b77c732b1 hf 15 demod, and others uses cliparser and different output 2020-10-17 23:10:23 +02:00
iceman1001 8c7f1e0609 fix bad param sanity checks 2020-10-17 23:09:34 +02:00
tcprst 4a5e58281b
remove debug print 2020-10-17 15:00:55 -04:00
tcprst 3b5cb752a4
ST25TA drop field on error & buffer fixes 2020-10-17 15:00:07 -04:00
iceman1001 abaef4de6c hf 15 demod - dont calc crc if we didnt get enough data 2020-10-17 17:47:58 +02:00
iceman1001 4d1b0f182e hf iclass sim - textual 2020-10-17 16:36:58 +02:00
iceman1001 2fbffe0894 hf 14b sim - better help text and must use PUPI 2020-10-17 16:33:46 +02:00
iceman1001 66182ea85c lf motorola clone - to properly use cliparser 2020-10-17 16:33:00 +02:00
Philippe Teuwen b6fd1a8694 Need Qt >= 5.1 for qunsetenv 2020-10-17 11:53:26 +02:00
Philippe Teuwen ab749f3d29 unsetenv -> qunsetenv (thanks @libin-ka) 2020-10-17 11:48:32 +02:00
iceman1001 076372425c lf indala clone - textual 2020-10-17 10:39:15 +02:00
iceman1001 5233e9c855 fix #1016 (thanks @mwalker33!) 2020-10-17 10:34:31 +02:00
Vortix ccb035ec2f Improve MIFARE detection 
Reduce false positives and integrate AN10834 update
 2020-10-17 02:41:21 +01:00
iceman1001 b7e431842e em4x05_dump - also save as json 2020-10-17 01:18:45 +02:00
iceman1001 0ea561f239 WIP adapt for cliparser and EM4x69 2020-10-17 01:03:27 +02:00
Philippe Teuwen 30fc549880 Avoid 'Qt: Session management error' 2020-10-17 00:29:53 +02:00
mwalker33 bb59250eca Cliparser fix 
Fix CLIGetStrwithRetrun
Allows casting and requires the buffer length to be passed in.
Existing uses of the function have been updated.
 2020-10-17 00:27:14 +02:00
iceman1001 8aa70b37e3 extract em 4x05 into own file 2020-10-16 19:13:40 +02:00
iceman1001 d27a8abe80 WIP, not suitable for running 2020-10-16 17:42:28 +02:00
iceman1001 c6902245f0 fix coverity 2020-10-16 17:22:12 +02:00
iceman1001 e41e871014 fix coverity 2020-10-16 17:15:04 +02:00
iceman1001 1c8194a84f fix coverity 2020-10-16 17:13:05 +02:00
iceman1001 4950098042 fix coverity 2020-10-16 17:10:24 +02:00
iceman1001 c85962f815 fix coverity 2020-10-16 17:09:27 +02:00
iceman1001 867750b7ee fix coverity 2020-10-16 16:07:39 +02:00
iceman1001 2713cd9595 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-16 14:20:00 +02:00
iceman1001 91a1520ce3 disabling stuff 2020-10-16 14:19:52 +02:00
Philippe Teuwen 1dfd2f5127 simpler 2020-10-16 14:15:12 +02:00
iceman1001 a7b7e0ba9b fix overflow 2020-10-16 14:02:21 +02:00
iceman1001 ffffa77dd9 some more stats 2020-10-16 07:49:51 +02:00
Philippe Teuwen d4e6a5b7a6 em: display nr of flips 2020-10-16 01:30:08 +02:00
Philippe Teuwen b589699c38 em: show bitflips 2020-10-16 00:11:52 +02:00
iceman1001 275986e743 exits 2020-10-15 23:54:18 +02:00
Philippe Teuwen ab2d232689 em tuning 2020-10-15 23:31:03 +02:00
Philippe Teuwen f39131f5f0 forgot to read back after reset 2020-10-15 22:58:04 +02:00
Philippe Teuwen 63a2d38191 fix debug val 2020-10-15 22:05:18 +02:00
Philippe Teuwen 03d994ea2c em stuff 2020-10-15 22:01:26 +02:00
Philippe Teuwen e4967ac654 use handle 2020-10-15 20:06:27 +02:00
iceman1001 df5c635a7d hook up 4x50 read for lua 2020-10-15 19:38:49 +02:00
iceman1001 4ba31596d5 adapt some tag identification of ats historical bytes 2020-10-15 19:30:49 +02:00
iceman1001 ba8aa6f0ab lf em stuff 2020-10-15 19:29:54 +02:00
tharexde f8045e0434 removed function call with timeout (initial call after starting pm3 client will always cause a timeout) 2020-10-14 19:59:55 +02:00
iceman1001 53c7e47e75 fix: hf iclass restore - now uses NG and better reporting and works :) 2020-10-14 17:41:34 +02:00
iceman1001 3868b0b4e6 hf iclass write, hf 15 raw, write, etc supports tear off trigger 2020-10-13 22:43:28 +02:00
tcprst 045f90ecf4
fix fido2 list/info 2020-10-13 11:19:18 -04:00
iceman1001 9a3c669e59 EM4x50 to exit if tear off 2020-10-13 14:05:18 +02:00
iceman1001 d8b2dc2ebf enable tearoff for LF EM 4x50_WRITE & EM_WRITE_PASSWORD 2020-10-13 14:00:03 +02:00
iceman1001 125548a44c hf mf rdsc - use fcts instead 2020-10-13 12:08:34 +02:00
iceman1001 14fd9a54df hf mf rdsc - use fcts instead 2020-10-13 12:07:33 +02:00
Iceman c40edaec82
Merge pull request #1010 from xianglin1998/master 
32 sector print incomplete for Mifare 4K
 2020-10-13 12:02:02 +02:00
iceman1001 597e069c50 remove HF ICLASS REPLAY, use HF ICLASS RDBL or HF ICLASS DUMP instead with option "n" 2020-10-13 11:54:38 +02:00
dxl 1bc1443731 32 sector print Incomplete for Mifare 4K(more) 2020-10-13 17:33:32 +08:00
dxl 1afddd2b12 32 sector print incomplete for Mifare 4K 2020-10-13 17:27:28 +08:00
dxl 334b3bfb77 fix text 2020-10-13 08:46:38 +02:00
dxl d3336ef842 fix text 2020-10-13 14:26:40 +08:00
Philippe Teuwen 782d36d312 add option to hf mfu cauth to keep field active 2020-10-12 23:41:44 +02:00
iceman1001 2235d96486 textual 2020-10-12 19:54:50 +02:00
iceman1001 114cc98600 less output 2020-10-12 19:32:36 +02:00
iceman1001 7cfbdcbae9 WIP - hf mfu countertear ... 2020-10-12 19:08:29 +02:00
iceman1001 acada02e37 hf 14a raw - no crc check on the iso14 select card response 2020-10-12 18:35:47 +02:00
Philippe Teuwen 25195b3197 fix destron clone command 2020-10-12 13:57:50 +02:00
Philippe Teuwen 2ee9ea0ef3 Add Destron 2020-10-12 13:42:33 +02:00
Philippe Teuwen cb0ad464c1 Fix T55xx modulation parser 2020-10-12 13:42:33 +02:00
iceman1001 a9400bed51 Q5 - wrong setting 2020-10-12 13:08:34 +02:00
Uli Heilmeier e9087175a2 cmdhflegic: Make sure to show help text 
Show usage when parameter h is used or none parameter
 2020-10-12 11:25:32 +02:00
mwalker33 43907dc4ed Update cmddata.c 
Fix issues when char cast to int8_t
 2020-10-12 15:33:14 +11:00
iceman1001 dcc33d5904 text 2020-10-12 02:01:34 +02:00
iceman1001 36f1c33321 hf mfu otptear -m fix 2020-10-12 01:57:22 +02:00
iceman1001 b64742baf9 hf mfu otptear -m fix 2020-10-12 01:55:39 +02:00
iceman1001 00f36f0335 hf mfu otptear -m fix 2020-10-12 01:51:35 +02:00
iceman1001 14bc37bbcb stop. 2020-10-12 01:44:16 +02:00
Philippe Teuwen fa332b1ba4 fdxb: add manufacturers & countries 2020-10-12 01:35:10 +02:00
iceman1001 cb18c4cbd9 text 2020-10-12 01:09:16 +02:00
Philippe Teuwen 539c376dd3 typedef name 2020-10-12 01:01:07 +02:00
iceman1001 79f57b2019 textual 2020-10-12 00:36:08 +02:00
Philippe Teuwen fb46e326c4 fdxb: shows new ISO amendment fields 2020-10-12 00:20:51 +02:00
iceman1001 91c979d56a lf em4x05_chk - textual and now always do the default keys.. 2020-10-11 23:43:42 +02:00
iceman1001 90a4f4d44c add: lf em 4x05_chk - a check password command 2020-10-11 22:44:05 +02:00
Philippe Teuwen 55fa5e7c35 make style 2020-10-11 22:40:05 +02:00
Philippe Teuwen 76701af8a7 Make clear current FDX in Pm3 is FDX-B only 2020-10-11 22:38:52 +02:00
tharexde b4a8409349 clean up 2020-10-11 20:06:03 +02:00
Philippe Teuwen 8693083747 fix em 4x05 dump indexes 2020-10-11 19:43:56 +02:00
iceman1001 bc9545d493 hf mfu otptear - textual, changing order on initial write device 2020-10-11 18:03:29 +02:00
iceman1001 43f4bba432 hf mfu otptear - use high precision clock instead 2020-10-11 10:59:57 +02:00
iceman1001 8f536d6655 hf mfu otptear - interruptable with keyboard 2020-10-11 10:19:20 +02:00
iceman1001 ec679385b9 hf mfu otptear - textual 2020-10-11 09:51:56 +02:00
iceman1001 9aaae19b54 fix print w vars in lua 2020-10-11 01:35:56 +02:00
iceman1001 e003618b3e hw tearoff - silent option 2020-10-11 01:09:31 +02:00
iceman1001 451d82c714 text 2020-10-10 22:52:15 +02:00
iceman1001 cf32ece9ff text 2020-10-10 22:51:51 +02:00
iceman1001 f3b2d05c51 less messages 2020-10-10 22:50:54 +02:00
Marcos Del Sol Vives ad2d993ae0 Fix last block for UL-C 2020-10-10 21:02:23 +02:00
Marcos Del Sol Vives ae5cace86d Added customizable 3DES key to hf mfu cauth 2020-10-10 20:38:58 +02:00
iceman1001 743ac26708 make debug.. 2020-10-10 18:14:04 +02:00
Philippe Teuwen 235d920b52 em 4x05_dump: indication of active PW closer to reality 2020-10-10 17:20:43 +02:00
iceman1001 0d0c42a56e hw tearoff - colors 2020-10-10 10:45:15 +02:00
iceman1001 fa2bde2876 textual 2020-10-10 10:35:50 +02:00
Philippe Teuwen 627b7a242c hw tune warns about possible mismatch between fw & actual hw, based on Q factor measurements :) 2020-10-10 01:43:39 +02:00
Philippe Teuwen 104377362a hw tune: compute Q 2020-10-10 00:55:55 +02:00
iceman1001 2098a6113b enable 4x05_read via lua 2020-10-10 00:51:02 +02:00
iceman1001 4d5d45659d helptext rearrange 2020-10-09 22:20:19 +02:00
Philippe Teuwen b1b40c0985 set cursors on hw tune plot 2020-10-09 21:51:52 +02:00
Philippe Teuwen 9be8b341ff lighter blue for cursorD, more visible 2020-10-09 21:51:52 +02:00
Philippe Teuwen 9020b1292c fix GridOffset type 2020-10-09 21:51:52 +02:00
iceman1001 470a0a5978 actually fix the list options 2020-10-09 20:46:48 +02:00
iceman1001 cd2c95251f text 2020-10-09 20:20:12 +02:00
iceman1001 64a44d1e85 adapt list command to allow for options 2020-10-09 20:19:36 +02:00
iceman1001 627a361666 trace list, load, save - now uses cliparser 2020-10-09 19:45:29 +02:00
iceman1001 8990caca2a text 2020-10-09 18:11:27 +02:00
iceman1001 5060c9cf0d data decimate / undecimate - now uses cliparser 2020-10-09 18:08:46 +02:00
Philippe Teuwen 1acd0a516a data undec: interpolate 2020-10-09 17:21:13 +02:00
iceman1001 1e0fd49bdd .... 2020-10-09 17:02:48 +02:00
iceman1001 2065d7a2c6 sub carrier and fsk clock 2020-10-09 17:02:28 +02:00
Philippe Teuwen 1e37d548c2 plot: allow float values for grid 2020-10-09 16:49:50 +02:00
Philippe Teuwen 984b0d4803 fix plot grid for non-integer zoom factors 2020-10-09 16:22:54 +02:00
iceman1001 4c85ce5f2f Add - analyse lf signal in graphbuffer and detects clock and matching modulations 2020-10-09 16:21:44 +02:00
Philippe Teuwen ee3f5a9c2b rename t55xx trydetectmod 2020-10-09 15:31:27 +02:00
Philippe Teuwen 07023657f2 generic tearoff: make use of new @iceman SpinDelayUsPrecision :) 2020-10-09 14:55:17 +02:00
Philippe Teuwen 7f8a4b4182 Add generic tear-off hook 2020-10-09 01:52:56 +02:00
iceman1001 c5b3443fe6 lf hid sim - now uses cliparser and --fc, --cn options 2020-10-08 21:46:53 +02:00
iceman1001 3f977043bd lf hid clone - textual 2020-10-08 20:32:45 +02:00
iceman1001 a547690af5 fix mem leak 2020-10-08 20:27:15 +02:00
iceman1001 9162a9d5f0 lf hic clone - now use cliparse and support FC,CN and RAW 2020-10-08 20:26:46 +02:00
Philippe Teuwen 8fbe3b4463 incognito: make sure prefs file is not loaded/saved in any circumstances 2020-10-08 10:06:05 +02:00
Philippe Teuwen 12fd83b5a1 incognito: text 2020-10-08 09:52:33 +02:00
Philippe Teuwen bd6effd980 Don't save prefs in incognito mode 2020-10-08 09:50:17 +02:00
Philippe Teuwen 543393f7f8 fix EM4205 detection 2020-10-08 09:49:39 +02:00
Philippe Teuwen a0a7a3960e EN4x05 dump: show reason of read fails 2020-10-07 23:48:49 +02:00
Philippe Teuwen 229da561d6 EM4x05: avoid false positives in preamble detection 2020-10-07 23:48:14 +02:00
Philippe Teuwen 1d8c268b8b EM4x05: don't mark first pages as RO, textual 2020-10-07 23:16:54 +02:00
Philippe Teuwen f4feaa6a03 EM4x05: capture tag 'error preamble' answer as well 2020-10-07 22:55:43 +02:00
Philippe Teuwen 9962b8769a EM4x05: add support for Protect command 2020-10-07 18:38:47 +02:00
Philippe Teuwen ad6632beee EM4x05 dump: show when lock bits are unknown and show active PR word 2020-10-07 16:06:05 +02:00
Philippe Teuwen 9395b9581f EM4x05 dump: improve few things, see details: 
- textual
- don't write command passwd in dump it tag is not pwd protected
- don't dump wrong Word14/15 if we couldn't read them
 2020-10-07 15:45:47 +02:00
Philippe Teuwen 70f11c4097 em4x05 dump text 2020-10-07 13:01:24 +02:00
Philippe Teuwen c24383c189 typo 2020-10-07 12:09:56 +02:00
iceman1001 eb05cadb1c hid 2020-10-07 01:29:00 +02:00
Philippe Teuwen 3872b5bd66 Move back jansson_path as it's not part of upstream and breaks usage of system jansson lib 2020-10-07 01:11:40 +02:00
iceman1001 7ea0324a62 lf hid read - increase amount of samples to reaed in order to fit long formats 2020-10-07 00:47:34 +02:00
iceman1001 0439e3ed60 style 2020-10-07 00:05:12 +02:00
iceman1001 8c726c157b fix savejson mem leaks 2020-10-07 00:04:20 +02:00
iceman1001 6338a9edbb fix json memory leaks 2020-10-07 00:03:08 +02:00
iceman1001 02df6ebbf7 bad memcpy based on size 2020-10-06 23:45:04 +02:00
iceman1001 83baa88340 filename pointer mem leak 2020-10-06 23:26:56 +02:00
iceman1001 f856087aa9 move jansson files from client 2020-10-06 21:45:32 +02:00
iceman1001 26f7f07120 mem leak out of bounds 2020-10-06 21:35:40 +02:00
iceman1001 073c630458 data raw am - fix length checks 2020-10-06 20:31:21 +02:00
Philippe Teuwen 3f9ddf9b29 make style 2020-10-06 18:41:15 +02:00
Philippe Teuwen 008c920db0 Add incognito option to avoid manglign history & logs during tests 2020-10-06 18:11:45 +02:00
iceman1001 64f9bb5e01 style 2020-10-06 18:00:00 +02:00
iceman1001 c55b4d5aac style 2020-10-06 17:50:20 +02:00
Iceman ddd92fcf69
Merge pull request #1000 from tcprst/iclass_cliparser 
hf iclass view, permute - now use cliparser
 2020-10-06 17:16:11 +02:00
iceman1001 4eb11f470d reveng mem leaks 2020-10-06 17:14:10 +02:00
iceman1001 feae472a41 mem leaks 2020-10-06 15:59:12 +02:00
iceman1001 154d3ff222 bad copies 2020-10-06 15:54:56 +02:00
iceman1001 fa2d9a77b9 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-06 15:42:23 +02:00
iceman1001 8ad8e2322e fix heap - unpack return ref to int* 2020-10-06 15:42:17 +02:00
Philippe Teuwen a647ceda23 fix buffer underflow read 2020-10-06 15:41:57 +02:00
tcprst fbc7f05ad1
rebase on master, fix merge conflict 2020-10-06 09:33:02 -04:00
tcprst c85d919e20
hf iclass view - now use cliparser 2020-10-06 09:30:35 -04:00
tcprst adacace012
hf iclass permute - now use cliparser 2020-10-06 09:30:35 -04:00
Philippe Teuwen 91d9463c2a cmdtrace: avoid 'strncat output may be truncated' warning 2020-10-06 14:39:36 +02:00
Philippe Teuwen a5c6130c7a waveshare: fix 'may be used uninitialized' warning 2020-10-06 14:32:14 +02:00
Philippe Teuwen 5b4e4dc4a4 plot: add </> to realign demod plot on samples 2020-10-06 14:23:24 +02:00
Philippe Teuwen fd3b440eea plot trim: adjust demod graph and cursors when possible 2020-10-06 14:23:24 +02:00
iceman1001 30cc0b4b48 fix lf wiegand - only take one format 2020-10-06 12:22:23 +02:00
Philippe Teuwen 64e1498cc7 data scale -> timescale 2020-10-06 12:13:39 +02:00
Philippe Teuwen 31909ff140 text 2020-10-06 12:01:11 +02:00
iceman1001 5304eca07d hf waveshare loadbmp -f only one 2020-10-06 11:58:32 +02:00
iceman1001 afa8393aa8 hf waveshare loadbmp -f is mandatory 2020-10-06 11:53:48 +02:00
iceman1001 701b924f03 hf waveshare loadbmp - now uses cliparser 2020-10-06 11:44:55 +02:00
Philippe Teuwen 72a0ee0994 waveshare: extra checks and info 2020-10-06 11:33:36 +02:00
iceman1001 957a1a8bf3 lf fdx demod - less strick len check 2020-10-06 10:21:46 +02:00
iceman1001 d316d96e04 lf hid demod - now uses wiegandtools instead 2020-10-06 10:21:07 +02:00
tharexde 68db54028c added function 4x50_watch 2020-10-05 22:59:08 +02:00
Philippe Teuwen 8691d3b77f hf 14a info: tells when no ATS but SAK pretends 14a-4 2020-10-05 22:33:33 +02:00
Philippe Teuwen 9c856fd9f4 Gen3 detection: be prudent, false positives are possible 2020-10-05 22:33:33 +02:00
iceman1001 7cebb832b6 14a,b raw - textual 2020-10-05 21:39:47 +02:00
iceman1001 08a875c259 coverity 301403 2020-10-05 13:56:12 +02:00
iceman1001 904bc51fb6 coverity 303200 2020-10-05 13:40:01 +02:00
iceman1001 537a21b2fa coverity 303199 2020-10-05 13:39:10 +02:00
iceman1001 d2e75de06e coverity 303195 2020-10-05 13:38:04 +02:00
iceman1001 a5bd3d7c32 coverity 303191 2020-10-05 13:36:17 +02:00
iceman1001 d5cc802e57 coverity 294394 2020-10-05 13:33:24 +02:00
iceman1001 fbec6b0c35 puts -> printandlog 2020-10-05 12:58:33 +02:00
mwalker33 702e9b774e Update proxguiqt.cpp 
Removed comment test sprintf
 2020-10-05 12:38:42 +02:00