Commit Graph

7691 Commits

Author SHA1 Message Date
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
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
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
4e157aa94a hf jooki sim - copy uid and use correct flag 2021-02-13 06:40:42 +01:00
tharexde
ac0ef23d5e Merge branch 'master' into dev_4x50_standalone
update
2021-02-12 23:21:49 +01:00
iceman1001
4c7c3643f3 hf jooki sim - fix lockbits 2021-02-12 20:54:30 +01:00
iceman1001
29476bb923 change from NTAG215 -> NTAG213 2021-02-12 20:35:26 +01:00
iceman1001
8ece2ca023 hf jooki sim - set type to NTAG215 2021-02-12 19:28:32 +01:00
iceman1001
9f44abe2f4 hf jooki sim - fixed a wrong bcc0 calc and forgot to convert it to the new dump format.. 2021-02-12 18:47:41 +01:00
iceman1001
667e2bb9f8 fix pm3test for mfu keygen. UID array was not zero:d 2021-02-12 11:10:58 +01:00
iceman1001
0f40e97b71 lf gallagher demod - remove debug statements 2021-02-12 10:38:57 +01:00
iceman1001
69a73675fb text 2021-02-12 10:32:07 +01:00
iceman1001
46d9ed20e5 added "hf jooki sim" command. Lets see if the data_available call every 8000th times doesnt interrupt with simulation process too much. 2021-02-12 10:16:24 +01:00
iceman1001
73cd4fb4ff lf gallagher sim - about w user input. Coverity fixes 2021-02-12 10:14:54 +01:00
iceman1001
7a653e7faf textual 2021-02-12 09:10:55 +01:00
iceman1001
152a2b43c0 hf jooki encode - fix tagtype.. 2021-02-11 23:18:17 +01:00
iceman1001
f9e1106842 remove debugs message 2021-02-11 23:12:13 +01:00
iceman1001
cdbef43f1a hf jooki write - may work... 2021-02-11 23:09:45 +01:00
Iceman
9ae5b8aa83 Merge pull request #1195 from DarkMatterMatt/feat/gallagher-simulate
Support specifying region/facility/card/issue numbers to Gallagher simulation
2021-02-11 22:43:30 +01:00
iceman1001
3ef308120c fix signedness 2021-02-11 22:37:12 +01:00
iceman1001
05e85cbbe2 fixing some type conversions 2021-02-11 22:26:15 +01:00
DarkMatterMatt
d7a1145945 Add support for specifying region/facility/card/issue numbers to Gallagher simulation
Extract `region_code`/`facility_code`/`card_number`/`issue_level` validation to `isValidGallagherParams` function
Add `--rc/fc/cn/il` parameters to `lf gallagher sim`
2021-02-12 10:23:05 +13:00
iceman1001
c576a0065b hf jooki - encode / decode ... 2021-02-11 22:08:51 +01:00
iceman1001
db29f0a691 textual.. 2021-02-11 15:37:35 +01:00
iceman1001
6416aaa52b add simple detection of file based on extension ftc 2021-02-11 15:36:56 +01:00
iceman1001
bd57430058 ..not recommend _keep field on_ 2021-02-11 15:35:12 +01:00
Akif Dinc
724ac35665 Typo in hf 14a help 2021-02-11 12:22:40 +01:00
DarkMatterMatt
73465e5167 Reorder & simplify code 2021-02-11 17:36:02 +13:00
DarkMatterMatt
03347fcfea Refactor how blocks are generated to be cleaner 2021-02-11 14:07:14 +13:00
DarkMatterMatt
0fdbdb044f Use ARRAYLEN instead of constant length 2021-02-11 11:30:22 +13:00
DarkMatterMatt
62ccbc0a37 Fix styles
Run `make style`
2021-02-11 11:12:45 +13:00
DarkMatterMatt
f655391bd4 Initial implementation of encoding 2021-02-11 00:17:48 +13:00
DarkMatterMatt
a4da1476b6 Fix Gallagher data decoding & CRC checks
Descramble function was re-scrambling the data
Skip constant magic prefix `7FEA` to get correct data to decode
Fix offsets & bitmasks to correctly decode card and region codes
Fix CRC refin & refout parameters (both now false)
2021-02-10 15:47:14 +13:00
Iceman
abbbbcebc9 Merge pull request #1189 from craftbyte/master
make style on master
2021-02-09 17:57:09 +01:00
Iceman
4825aeaac7 Merge pull request #1182 from craftbyte/feature/mfdes-enum
Added actual MF DESfire enumeration
2021-02-09 17:55:09 +01:00
Anže Jenšterle
cd36770c5e make style 2021-02-09 16:56:55 +01:00
Anže Jenšterle
8760068a03 make style 2021-02-09 16:52:48 +01:00
Anže Jenšterle
cf8256979d fix code per comments 2021-02-09 16:15:52 +01:00