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

4234 commits

Author SHA1 Message Date
iceman1001 18d2c24e9e chg: 'trace list' - abort when ENTER key is pressed 2019-08-04 19:13:54 +02:00
Philippe Teuwen f40600f997 make style 2019-08-04 16:57:06 +02:00
Philippe Teuwen 1cb039255e Add client option -i to stay in interactive mode after a script or command 
From 5a3f474331
with some fix in the logical flow
 2019-08-04 15:34:18 +02:00
Philippe Teuwen 88d2a61c0b typo 2019-08-04 12:58:36 +02:00
iceman1001 a90e5e1858 chg: legic cmds uses return macros. 
chg: hf search started to use macros
 2019-08-03 23:36:55 +02:00
Philippe Teuwen 60bfc37f35 remove more dummy cmds 2019-08-03 22:52:32 +02:00
Philippe Teuwen 61538bd635 thinfilm simulation when on battery 2019-08-03 22:37:01 +02:00
Philippe Teuwen 25f358955b make hf search robust to various HF configurations 2019-08-03 22:14:12 +02:00
Philippe Teuwen 4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Iceman e4972e8810
Merge pull request #305 from ViRb3/better-warn 
Better warn user of hardcoded hitag info
 2019-08-03 20:01:18 +02:00
Philippe Teuwen 017b3357ed Comment Felica simulation in client, there is no corresponding code in ARM 2019-08-03 19:57:57 +02:00
Philippe Teuwen a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Philippe Teuwen cbf5c717f7 Remove unused CMD_* 2019-08-03 19:48:02 +02:00
Victor a0193fa903 Better warn user of hardcoded hitag info 2019-08-03 18:29:02 +01:00
iceman1001 52065adcfa chg: 'hf topaz reader' - more verbose 2019-08-02 11:37:35 -04:00
iceman1001 0747cf9ec0 add more keys (@anon) 2019-08-02 09:48:42 -04:00
Philippe Teuwen ab74d2b798 Revert ARRAYLEN on whereami.c, bag of bones... 2019-08-02 08:06:30 +02:00
Philippe Teuwen 0eae1e2563 make style 2019-08-02 00:26:48 +02:00
Philippe Teuwen 865a7c3ad4 Add thinfilm simulation 2019-08-02 00:26:07 +02:00
Philippe Teuwen 824e0ae3e4 use thinfilm trace with hf thinfilm list 2019-08-01 20:15:46 +02:00
Philippe Teuwen 3bc5f7688d thinfilm trace 2019-08-01 20:06:07 +02:00
iceman1001 63a7f8a4c4 fix: 'hf topaz reader' - not crashing when trying to read a thinfilm 2019-08-01 12:36:50 -04:00
iceman1001 5a2d0c4cc1 chg: 'hf thinfilm info' - print text 2019-08-01 12:22:51 -04:00
iceman1001 2a054438ab chg: 'hf thinfilm info' - fixed manufacture lookup 2019-08-01 12:16:33 -04:00
Philippe Teuwen 7bdcf3cff5 thinfilm, show raw data if unknown encoding 2019-08-01 18:03:41 +02:00
Philippe Teuwen 85c0f3e9e3 thinfilm partial info when verbose 2019-08-01 17:49:35 +02:00
iceman1001 10c949a47e chg: 'hf thinfilm info' - versbose mode and sanity checks 2019-08-01 11:33:00 -04:00
iceman1001 2400418067 style 2019-08-01 11:15:39 -04:00
iceman1001 faf68081b0 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-01 11:11:07 -04:00
iceman1001 a331090c6a Chg : 'hf thinfilm info' - added crc check 2019-08-01 11:09:51 -04:00
Philippe Teuwen 8f6c048481 thinfilm: fix urls with 0xFE terminator 2019-08-01 17:07:07 +02:00
Philippe Teuwen 3fb442798d thinfilm usage typo 2019-08-01 15:49:58 +02:00
iceman1001 fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
Philippe Teuwen 733a7d836d more ARRAYLEN 2019-08-01 00:14:09 +02:00
Philippe Teuwen f276dca3f1 less hardcoded sizes and more ARRAYLEN 2019-07-31 23:45:17 +02:00
iceman1001 74288ad128 chg: hf topaz - got some love 2019-07-31 15:43:00 -04:00
Philippe Teuwen 98624037ad hf mfu: please no extended ascii char 2019-07-31 12:43:15 +02:00
Philippe Teuwen f0c939b1bc hf mfu: avoid hardcoded array size 2019-07-31 12:14:44 +02:00
Philippe Teuwen 5edd342d4c Add NTAG_I2C_1K support to hf mfu, thanks JP Szikora 2019-07-31 12:04:32 +02:00
iceman1001 4c9b95c216 chg: flash messge 2019-07-30 14:31:10 -04:00
iceman1001 6d1c996251 chg: flashing - test messages 2019-07-30 19:22:24 +02:00
netvader 8abbbe4d5e
Update default_keys.dic 
add hotel key from alltours
 2019-07-29 11:03:20 +02:00
Philippe Teuwen c6b8e199fd fix usart cmd descriptions 2019-07-28 21:08:50 +02:00
Philippe Teuwen c83ff9da0f make style 2019-07-28 19:24:00 +02:00
Philippe Teuwen 5854ab19dd client tells when over TCP 2019-07-28 19:23:37 +02:00
iceman1001 a25814bda4 ADD: 'trace list' - annotate nano signature 2019-07-28 14:23:30 +02:00
iceman1001 00350db238 Chg: hf tune - increase timeout vaules. fix #265 2019-07-28 03:29:31 -04:00
iceman1001 c5b8df449d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-28 09:22:30 +02:00
iceman1001 ca53711b8d chg: lf t55xx - helptext 2019-07-28 09:21:02 +02:00
iceman1001 9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001 f433e26e3b Add: 'hf mfu info' - now does orinality check against ECC. (@pwpivi) 
Adapted to prefered codestyle and added references.
 2019-07-27 23:44:23 +02:00
iceman1001 283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001 e99910694b chg: some more key, thanks @Ollibolli 2019-07-27 15:06:58 +02:00
iceman1001 d7c967b65d chg: 'codestyle' 2019-07-27 10:25:03 +02:00
iceman1001 e9b493ead6 style 2019-07-27 02:39:30 -04:00
Iceman b7ba46d38e
Merge pull request #292 from netvader/patch-1 
Update default_keys.dic
 2019-07-26 23:53:15 +02:00
netvader 54a18ebf2b
Update default_keys.dic 
added some keys from clever fit gym, hotel room turkey, and simonsvoss key card
 2019-07-26 22:45:16 +02:00
3ldidi94 ee152657c6
Add one more key 
Found a new key that is not in this dic file, so I add it.
 2019-07-26 11:43:21 +02:00
mwalker33 9085465c38 Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-25 21:00:41 +10:00
mwalker33 3211f35062 Added set default timings 2019-07-25 21:00:30 +10:00
mwalker33 b222161941
Merge branch 'master' into master 2019-07-25 20:12:00 +10:00
mwalker33 77d96ff3b7 Bug Fix Timing order 
Timing for backward compatibility
 2019-07-25 20:01:03 +10:00
Philippe Teuwen c0eb19acb1 remove tabs 2019-07-24 00:52:24 +02:00
mwalker33 b16f2fdaba Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-24 08:15:38 +10:00
mwalker33 cdc3787008 clean 2019-07-24 08:12:25 +10:00
Philippe Teuwen ab043a68b8 remove space in filename 2019-07-23 23:44:41 +02:00
Philippe Teuwen ac233a346a make style 2019-07-23 23:43:30 +02:00
Philippe Teuwen ac18114909 Remove long unsigned int warning 2019-07-23 22:46:58 +02:00
Philippe Teuwen 11e5131604
Merge pull request #284 from mwalker33/master 
T55x7 Downlink mode support added
 2019-07-23 22:42:47 +02:00
Philippe Teuwen 7e84a546c5 GetFromDevice leftovers 2019-07-23 21:45:06 +02:00
Philippe Teuwen 544fb30ce6 typos 2019-07-23 21:40:01 +02:00
Philippe Teuwen 9beabaabf5 make style 2019-07-23 21:33:52 +02:00
mwalker33 5de04f84e9 Restored * 8 
Revert back to store and use the full value (*8) for the timing.
 2019-07-23 20:12:05 +10:00
cjbrigato 70cd0d844b FIX : Tereifying typo 2019-07-23 07:39:34 +02:00
mwalker33 4e0e69ed63 Added T55 downlink mode support 2019-07-23 09:50:28 +10:00
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen daae890667 Bootrom & flasher changes: 
* use macros for versions
* activate UNDERSTANDS_VERSION in bootrom
* fix missing break; bug in bootrom
* force flash_load to reject images > 256k if bootloader not up to date
* move logic from flasher to flash
 2019-07-20 10:48:40 +02:00
slurdge 68aa9d631d Flasher support for versionning 
Only bootrom with version > 1.0.0 will allow 512K writes
 2019-07-20 10:47:24 +02:00
Philippe Teuwen 8e6258936c make style 2019-07-19 13:18:35 +02:00
Philippe Teuwen 33f2cb0981 Rework flasher exit on error 2019-07-19 13:15:32 +02:00
Philippe Teuwen f6f14f82d4 Add option -i to flasher to query Pm3 for its memory size, and some doc tuning 2019-07-19 13:02:12 +02:00
Philippe Teuwen 44278272a4 typo 2019-07-19 12:39:23 +02:00
slurdge 7bf3255a6c Flasher support for 512K flash 
A better way would be to cut the connecting function and flashing function and to move the whole mem computation to flash.c
Working flasher
 2019-07-19 12:35:04 +02:00
Philippe Teuwen 4e9e7d6da0 temporary fix to get Appveyor happy. Will need more tuning later. 2019-07-18 23:50:45 +02:00
Julien Piat 29f8bfb80c Update default_keys.dic with new keys from Scan Badge APK 2019-07-18 15:54:21 +02:00
Philippe Teuwen 259c730bb0 exit(EXIT_FAILURE) if a port was specified to the client and no pm3 is usable 2019-07-17 20:15:47 +02:00
merlokk 84022807a8 fix rare emv search behavior 2019-07-17 12:20:04 +03:00
merlokk a6977860db fix emv search keep field bug 2019-07-17 11:27:05 +03:00
Oleg Moiseenko d3b6a8e193
Merge pull request #253 from merlokk/emv_apdu 
Emv apdu
 2019-07-16 18:08:39 +03:00
merlokk 638d698445 make style 2019-07-16 18:05:36 +03:00
merlokk 5fd2a7613f add check 2019-07-16 18:05:23 +03:00
merlokk e61a65fbe8 check PPSE instead of PSE and vice versa. I have one card with this strange behavior... 2019-07-16 17:15:32 +03:00
merlokk a30c62137b use apduencode for emv commands 2019-07-16 17:04:54 +03:00
merlokk bd8824a2f3 make style 2019-07-16 16:10:11 +03:00
merlokk 7726ec6000 move sAPDU 2019-07-16 16:05:47 +03:00
Philippe Teuwen ed4289d462
Merge pull request #251 from merlokk/reorg_includes 
added PACKED attribute for structures and reorganize include folder
 2019-07-16 14:52:14 +02:00
merlokk 12c6b5cb20 add the definition of PACKED in its client/deprecated-hid-flasher/flasher/proxmark3.h 2019-07-16 15:25:48 +03:00
merlokk 20d13d5509 added PACKED attribute for structures and reorganize include folder 2019-07-16 14:50:38 +03:00
Philippe Teuwen d8763509de Add 'hw standalone' to jump to standalone mode from command line or script 2019-07-15 22:31:19 +02:00
Oleg Moiseenko ddd4601c1e
Merge branch 'master' into ext_apdu 2019-07-15 19:25:48 +03:00