Commit graph

12587 commits

Author SHA1 Message Date
iceman1001 d1468b8156 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-02-17 17:31:32 +01:00
iceman1001 8d4d1cc3a6 text 2021-02-17 17:31:08 +01:00
Iceman 776d63205c
Merge pull request #1205 from adadnc/master
Documentation for Jooki
2021-02-17 13:41:18 +01:00
Akif Dinc 7744e53968 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2021-02-17 13:34:35 +01:00
Akif Dinc a1f9a03823 Adding Jooki documentation 2021-02-17 13:31:44 +01:00
iceman1001 e5b879cbe9 rdv4 device detection added 2021-02-17 11:52:23 +01:00
iceman1001 88d95b639f text 2021-02-17 11:42:37 +01:00
iceman1001 e129244a66 ..types 2021-02-17 10:46:58 +01:00
iceman1001 b3064c4888 style 2021-02-17 08:59:20 +01:00
iceman1001 0a405ca21e text 2021-02-17 08:57:22 +01:00
iceman1001 563f703d6a lf hid clone - hooked up the binary input 2021-02-17 08:56:42 +01:00
iceman1001 b979ed3e17 style 2021-02-17 07:33:29 +01:00
iceman1001 45fea41084 text 2021-02-17 07:32:38 +01:00
Iceman 7a7d4654e1
Merge pull request #1204 from adadnc/master
Minor changes to hf jooki command
2021-02-17 07:28:33 +01:00
Akif Dinc b25d9c8ef3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2021-02-16 23:32:05 +01:00
Akif Dinc f7359bcc65 Fixing bug in tid selection 2021-02-16 23:30:40 +01:00
iceman1001 bb823762fa textual 2021-02-16 22:40:54 +01:00
Akif Dinc 23be1158c6 Remove useless comment 2021-02-16 22:37:17 +01:00
Akif Dinc 76b73b26d3 Fixing short commands for figurine names 2021-02-16 22:34:39 +01:00
Akif Dinc 2a07959da6 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2021-02-16 21:16:35 +01:00
Akif Dinc 5c385e8f2f Changes to Jooki command codes 2021-02-16 20:55:48 +01:00
Akif Dinc be25db2804 Adding Figurine Type ID and Figurine ID parameters for hf jooki 2021-02-16 20:53:53 +01:00
iceman1001 bf23b88c1b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-02-16 15:37:45 +01:00
iceman1001 9593dd05ad lf search - rearrange checks to minimize number of false positives of indala 2021-02-16 15:36:39 +01:00
Iceman f9fb398fb9
Merge pull request #1203 from tharexde/em4x50_standalone
em4x50 standalone mode (lf_tharexde)
2021-02-15 23:36:38 +01:00
tharexde db679608ec initial implementation of em4x50 standalone mode (lf_tharexde) 2021-02-15 22:48:34 +01:00
Iceman 460892eabf
Merge pull request #1202 from tharexde/refactor_em4x50
Refactor em4x50
2021-02-15 22:18:44 +01:00
tharexde 84d19bb22d Merge branch 'master' into refactor_em4x50
update 210215
2021-02-15 21:40:20 +01:00
tharexde a78fecad07 revert changes (PR follows) 2021-02-15 21:26:16 +01:00
iceman1001 db4bd209a4 no unicode.. 2021-02-15 17:04:35 +01:00
iceman1001 8c7bcd42c7 textual 2021-02-15 11:01:01 +01:00
iceman1001 3ba8dffe75 rename "hf jooki write -> clone", adapted tid/fid 2021-02-15 02:59:14 +01:00
tharexde 1680a1700e Merge branch 'master' into 4x50_standalone
merged master
2021-02-14 15:53:44 +01:00
tharexde 9a96157e82 initial implementation of em4x50 standalone mode 2021-02-14 12:42:47 +01:00
Iceman 9038c6f6fb
Merge pull request #1198 from tcprst/cliparser/mfc
rework hf mf chk and cliparser for hf mf fchk
2021-02-14 07:22:38 +01:00
tcprst 987f95cca9
bugfix 2021-02-13 23:29:58 -05:00
tcprst 282dc099b6
rework hf mf chk and cliparser for hf mf fchk 2021-02-13 21:03:57 -05:00
Iceman 108ae51146
Merge pull request #1197 from tcprst/cliparser/mfc
hf mf - cliparser
2021-02-13 22:09:36 +01:00
tcprst 7830c0f8ea
update type to lits 2021-02-13 15:41:10 -05:00
tcprst dc1e2df649
make style - again 2021-02-13 14:48:44 -05:00
tcprst defc8b52fd
Merge branch 'cliparser/mfc' of https://github.com/tcprst/proxmark3 into cliparser/mfc 2021-02-13 14:47:11 -05:00
tcprst d793a601da
make style 2021-02-13 14:38:51 -05:00
tcprst 9cca51f61e
hf mf chk - now use cliparser 2021-02-13 14:37:47 -05:00
tcprst b7b0830194
hf mf staticnested - now use cliparser 2021-02-13 14:27:00 -05:00
tcprst 200e2e540f
hf mf nested - now use cliparser 2021-02-13 14:27:00 -05:00
tcprst 006246bf8c
hf mf sim - now use cliparser 2021-02-13 14:27:00 -05:00
tcprst 0ade8a5505
hf mf darkside - now use cliparser 2021-02-13 14:26:59 -05:00
tcprst 7d37481ce1
hf mf dump - now uses cliparser 2021-02-13 14:26:59 -05:00
tcprst eec13e8798
hf mf ice - now use cliparser 2021-02-13 14:26:52 -05:00
iceman1001 a7d3584176 even less dataavailable checks 2021-02-13 10:28:37 +01:00