RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-15 14:20:51 +08:00
Code Issues Projects Releases Packages Wiki Activity
4689 commits 3 branches 14 tags 86 MiB
Commit graph

4689 commits

This branch
This branch
All branches
Author SHA1 Message Date
RFID Research Group
a86a60bd06
Merge pull request #67 from merlokk/emv_sc 
Emv commands works with smartcard interface
 2018-12-07 09:30:48 +01:00
merlokk
80d07bcaac added code if AIP not found 2018-12-06 20:04:28 +02:00
merlokk
17d0194aea small fix and block scan command 2018-12-06 19:47:57 +02:00
merlokk
34b53a5b48 exchange works 2018-12-06 14:44:55 +02:00
merlokk
ec3acc7d8a some of emv commands works in test mode 2018-12-05 19:23:13 +02:00
merlokk
312ec79e48 added sketch sc apdu 2018-12-05 17:27:28 +02:00
iceman1001
898484f642 FIX: compilation for OS X, see https://github.com/Proxmark/proxmark3/pull/730/ (@jmichelp) 2018-12-04 13:51:28 +01:00
merlokk
4c7e5757f3 added channel parameter 2018-12-03 19:29:31 +02:00
merlokk
01a10bade7 Mastercard compute cryptographic checksum result will print anyway 2018-12-03 18:49:54 +02:00
merlokk
2245673262 fix search big loop 2018-12-03 18:46:11 +02:00
merlokk
e8671e6c18 fix emv command's help 2018-12-03 18:21:05 +02:00
merlokk
7fd3536b29 fix appveyor 2018-12-03 18:16:39 +02:00
merlokk
47d954c79f move emv commands to root 2018-12-03 18:16:25 +02:00
iceman1001
259dbadbe9 chg: output unified 2018-12-02 10:05:31 +01:00
iceman1001
2eee1663df chg: iso15693 small fix... 2018-11-30 21:04:32 +01:00
iceman1001
0372cb8a04 chg: iso15693 lua lib works. 2018-11-30 20:58:47 +01:00
RFID Research Group
2fb8805ee9
Merge pull request #65 from merlokk/merge_trailer 
Merge trailer fix and 4k access bits fix
 2018-11-30 19:47:00 +01:00
merlokk
7c8377839e 4k fix 2018-11-30 20:33:46 +02:00
merlokk
2d932e49ac https://github.com/Proxmark/proxmark3/pull/725 2018-11-30 20:28:34 +02:00
Iceman
71435fb824
Merge pull request #64 from merlokk/trailer_decode 
Trailer decode
 2018-11-30 14:08:25 +01:00
merlokk
a10bf3ac05 added changelog 2018-11-30 14:17:46 +02:00
merlokk
9f77f2741f added trailer decoding 2018-11-30 14:16:34 +02:00
iceman1001
c5c75d494b chg.. moved into defined 2018-11-30 09:13:09 +01:00
iceman1001
8bef04f94b ADD: Support TCP ports for proxmark (@phcoder) 
On ChromeOS Linux apps can't access serial port but they can connect to TCP,
so I wrote a simple app to forward TCP to serial. I suppose this can have other uses as well.
see: 538d10d651
 2018-11-30 09:03:55 +01:00
iceman1001
a5898158c5 FIX: basic fixes for lua reader14a, reader14b, reader15 
ADD: utils got iso15693 crc support
 2018-11-30 01:41:39 +01:00
iceman1001
ccb0cd23f5 FIX: 'lua calc of iso15692 crc' - works better now 2018-11-30 01:19:57 +01:00
iceman1001
bd7ac487cd FIX: 'hf mf hardnested' - output misalignment 2018-11-29 23:44:50 +01:00
iceman1001
c948911f71 chg... 2018-11-29 23:37:05 +01:00
iceman1001
dcd1a62ce3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-11-29 23:33:47 +01:00
iceman1001
2accb7d3f4 CHG: remove different clocks calls. 2018-11-29 23:32:59 +01:00
Iceman
24fc3fdb58
Merge pull request #62 from merlokk/err 
fix memory error
 2018-11-29 21:34:00 +01:00
merlokk
9584074c00 fix memory error 2018-11-29 22:06:49 +02:00
iceman1001
0b5ee43392 FIX: remove linker directive warnings used with compiler in CLANG, OS X. 2018-11-29 17:59:46 +01:00
iceman1001
3c88bb5e59 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-11-29 17:53:57 +01:00
iceman1001
b64fdafc40 ADD: basic iso15693 comms in lua support. Not fully functional 2018-11-29 17:53:24 +01:00
Iceman
55dff20530
Merge pull request #54 from merlokk/json_loclass 
`hf mf csave` and `hf mf cload` works with json.
 2018-11-29 16:50:27 +01:00
merlokk
4dece3e30d del line 2018-11-29 17:13:00 +02:00
merlokk
efabdde248 small fixes. done 2018-11-29 17:09:37 +02:00
merlokk
6baf579fe0 hf mf cload works 2018-11-29 16:56:57 +02:00
merlokk
955ced6c28 hf mf csave works 2018-11-29 16:05:57 +02:00
merlokk
e6d7a05721 csave works 2018-11-29 13:42:07 +02:00
merlokk
0ffddd8470 raw load file 2018-11-29 13:21:38 +02:00
Iceman
ed7d46c685
Merge pull request #60 from merlokk/jansson_update 
jansson update. 2.11 to 2.12
 2018-11-29 11:07:29 +01:00
merlokk
5d5e273982 jansson update. 2.11 to 2.12 
fix warnings
 2018-11-29 12:00:23 +02:00
iceman1001
91809c6d94 FIX: part of https://github.com/Proxmark/proxmark3/pull/723 (@Fl0-0) 
CHG: remove some warnings when compiling on 32/64 bit systems.  Messy messy
 2018-11-28 23:53:31 +01:00
merlokk
21118ed6b8 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass 2018-11-28 00:09:11 +02:00
Iceman
f979907d17
Merge pull request #59 from merlokk/fido2 
Fido2 implementation
 2018-11-27 18:49:35 +01:00
merlokk
04b436ce5e del annoying comment 2018-11-27 19:44:03 +02:00
merlokk
f8cac71aa0 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass 2018-11-27 19:40:30 +02:00
Oleg Moiseenko
4e89ef7c24
Merge branch 'master' into fido2 2018-11-27 19:37:08 +02:00