RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-09-09 14:17:23 +08:00
Code Issues Projects Releases Packages Wiki Activity
6500 commits 3 branches 17 tags 91 MiB
Commit graph

4132 commits

Author SHA1 Message Date
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
merlokk
84c09ce881 added define PACKED 2019-07-15 19:21:19 +03:00
merlokk
d2a2acf69c make style 2019-07-15 19:12:01 +03:00