iceman1001
548d6429ed
return codes
2019-05-27 09:15:53 -04:00
iceman1001
53f2058c7a
chf: hf mf eget\nhf mf eset\nhf mf eclr - uses NG
2019-05-27 07:46:27 -04:00
iceman1001
b05796c7c4
chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG
2019-05-26 13:42:27 -04:00
Albert Einstein
de694d7cca
modified help in fchk and chk
2019-05-23 21:04:48 +02:00
iceman1001
65ff4f0e92
chg: hf mf setmod - uses NG
2019-05-15 06:52:22 -04:00
Philippe Teuwen
962f45e3e6
mf nested: remove compilation warning
2019-05-08 22:02:14 +02:00
Philippe Teuwen
77398550b0
fast mode on Mifare emulator upload
2019-05-08 21:54:15 +02:00
Philippe Teuwen
2f1061f95b
rework ping
2019-05-07 23:35:09 +02:00
Philippe Teuwen
290f2b625b
Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0 -> NG and SendCommandOLD ....,NULL,0 -> MIX
2019-05-07 19:51:33 +02:00
iceman1001
39272ba1fb
convert sendOLD -> MIX for simple cmds
2019-05-07 19:13:14 +02:00
iceman1001
0cedfc7b2b
chg: list should always be available, since we can now load / save trace files.
2019-05-02 10:42:02 +02:00
Philippe Teuwen
f217b47cbd
style
2019-05-02 00:18:20 +02:00
Philippe Teuwen
e6135a8f78
Replace WITH_ISO14443a by dynamic detection in client
2019-05-01 23:38:57 +02:00
Philippe Teuwen
cad676a23c
Replace WITH_FLASH by dynamic detection in client
2019-05-01 21:46:29 +02:00
Philippe Teuwen
ca43afa19b
begin of dynamic capabilities handling in client
2019-05-01 20:48:15 +02:00
iceman1001
ec5f70caf2
easier to read
2019-05-01 15:15:48 +02:00
Philippe Teuwen
645a4e9d1d
generalize KEYS_IN_BLOCK usage
2019-05-01 14:55:14 +02:00
iceman1001
b7e3806eff
chg: 'hf mf chk' - let eload part benefit for fast push mode
...
chg: 'script run mfkeys' - corrected to use NG frames correct
2019-05-01 13:15:51 +02:00
Philippe Teuwen
13b2e6eed7
Fix hf mf chk
2019-05-01 12:19:51 +02:00
Philippe Teuwen
27f7057961
Rename few USB -> PM3 to avoid misleading interpretations
2019-04-30 21:10:11 +02:00
iceman1001
c1445d2a31
CHG: 'hf mf chk' - uses NG
2019-04-30 14:01:23 +02:00
Philippe Teuwen
35ea8e745e
Faster CmdHF14AMfChk
2019-04-29 22:39:42 +02:00
Philippe Teuwen
f1deb865db
Merge branch 'master' into experimental_varlen
...
* master:
ltrim cmd before display
hf mf eload: fix absence of filename
detect wrong numOfBlocks / numOfSectors arguments
safeFile*: accept when suffix is already provided
loadFile*: accept when suffix is already provided
textual, to reflect which repo.
LoadEML: don't complain on the last \n
2019-04-28 22:53:12 +02:00
Philippe Teuwen
334e6d208b
hf mf eload: fix absence of filename
2019-04-28 22:16:50 +02:00
Philippe Teuwen
997f5d700e
detect wrong numOfBlocks / numOfSectors arguments
2019-04-28 21:34:05 +02:00
Philippe Teuwen
1dbcb712c3
safeFile*: accept when suffix is already provided
2019-04-28 20:42:57 +02:00
Philippe Teuwen
405f24522e
loadFile*: accept when suffix is already provided
2019-04-28 19:21:04 +02:00
iceman1001
9779868753
style
2019-04-28 11:09:46 +02:00
Philippe Teuwen
eababdd3ef
Merge branch 'master' into experimental_varlen
...
* master:
chg: 'hf mf sim' - textual
fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine.
fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code, return 1. Will only impact the speed of hardnested execution.
fix again OSX
fix https://github.com/RfidResearchGroup/proxmark3/issues/173
used predefined constants, common types moved to common header files
backward compatibility, on load converter for old mfu dump format
loops for counters output
UL/NTAG new dump file format. Added counters support, simulation
2019-04-25 20:05:04 +02:00
iceman1001
ef95d8c742
chg: 'hf mf sim' - textual
2019-04-25 16:57:18 +02:00
Iceman
f227041932
Merge pull request #172 from McEloff/hfmfu
...
UL/NTAG new dump file format. Added counters support, simulation
2019-04-25 16:10:03 +02:00
Eloff
a8c1fa7a3b
backward compatibility, on load converter for old mfu dump format
2019-04-23 17:07:20 +03:00
Philippe Teuwen
9602e641e2
Merge branch 'master' into experimental_varlen
...
* master:
translation
document offsets
textual
textual
typo
'hf mf sim' full-byte anti-collision frame support
2019-04-22 21:39:38 +02:00
iceman1001
166da51360
textual
2019-04-22 19:21:07 +02:00
Philippe Teuwen
c4766b2649
Semi-Automated SendCommand -> SendCommandOLD
2019-04-19 23:01:13 +02:00
Philippe Teuwen
1b6a45ac17
propagate CmdsParse return value
2019-04-19 00:47:51 +02:00
Eloff
960b21793c
'hf mf sim' full-byte anti-collision frame support
2019-04-18 21:02:48 +03:00
Philippe Teuwen
482db05741
Rename few stuff for consistency
2019-04-18 12:49:51 +02:00
Philippe Teuwen
533667ea6d
Better Reply structs
2019-04-17 23:44:48 +02:00
Philippe Teuwen
7cbcf8163c
Merge branch 'master' into experimental_varlen
...
* master: (27 commits)
textual
style redundant assignment
timeout fix
small fix
add termcap
add readline and small fix
rdp
textual
null term?
fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
add dlls to release
style
style
test fix
test fixes
another fix
fix memleak
fix
textual
use printandlogex
...
2019-04-17 22:06:39 +02:00
Philippe Teuwen
be15ad7fec
Viva la revolucion
2019-04-17 21:30:01 +02:00
iceman1001
587d826f84
textual
2019-04-17 20:36:10 +02:00
Eloff
63f9f11066
'hf mf sim' bugs fix, RATS support, etc
2019-04-16 23:52:05 +03:00
iceman1001
436910605b
unified Proxmark3 text
2019-04-16 20:00:25 +02:00
iceman1001
74ece72b26
textual
2019-04-16 17:21:42 +02:00
iceman1001
7b30126371
style
2019-04-16 15:29:18 +02:00
Philippe Teuwen
5c55664fc5
use more static and fix [-Wmissing-prototypes]
2019-04-13 21:57:13 +02:00
Philippe Teuwen
05374fce07
Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes]
2019-04-12 19:41:56 +02:00
iceman1001
a872f04c1e
textual
2019-04-11 17:19:48 +02:00
Philippe Teuwen
0ab6de64d4
structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers]
2019-04-10 13:59:00 +02:00
Philippe Teuwen
3d6d58aae5
internal help fcts -> static
2019-04-10 13:06:05 +02:00
Philippe Teuwen
cc0454d5d2
tag unused Cmd [-Wunused-parameter]
2019-04-10 12:23:40 +02:00
osboxes.org
ad52243981
style
2019-04-10 09:36:23 +02:00
Philippe Teuwen
a561370f8d
more strncpy fix
2019-04-09 20:15:08 +02:00
iceman1001
87660df8f2
fix: 'hf mf hardnested' - not verify key when reading nonce file
2019-04-09 17:14:47 +02:00
iceman1001
b37981df74
shadow
2019-04-07 20:08:53 +02:00
Philippe Teuwen
41f36ca20b
make style
2019-04-06 19:09:01 +02:00
vratiskol
6e8b3c29ba
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-04-03 22:18:39 +02:00
iceman1001
0383d7f052
chg: 'hf mf restore' - add finish message
...
chg: 'hf mfu restore' - add finish message
chg: 'hf 15 restore' - add finish message, close filehandle when failing.
2019-04-03 15:34:36 +02:00
vratiskol
1e20316cee
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-19 02:07:22 +01:00
iceman1001
fb9d34447e
style
2019-03-18 23:59:35 +01:00
vratiskol
c2c4aac7ff
Merge remote-tracking branch 'upstream/master' into hf_mf_sim
2019-03-18 21:51:29 +01:00
iceman1001
4f88d7105f
style
2019-03-18 20:24:09 +01:00
Philippe Teuwen
f51e6fbad2
fix double free
2019-03-16 01:26:15 +01:00
vratiskol
cfe2b2797e
Revert "Merge branch 'master' into hf_mf_sim"
...
This reverts commit cbea5d9d02
, reversing
changes made to b66152feb2
.
2019-03-15 21:45:00 +01:00
vratiskol
cbea5d9d02
Merge branch 'master' into hf_mf_sim
2019-03-15 21:17:44 +01:00
vratiskol
6a52b6074f
Sync from Upstream
2019-03-15 21:17:07 +01:00
vratiskol
64c3ae8b34
hf mf sim
2019-03-15 21:04:25 +01:00
iceman1001
7d88c22aaf
chg: added limit check for loadfile
...
rename: 'lf hitag checkchallenges' -> 'lf hitag cc'
chg: 'lf hitag checkchallenges' - refactored, added helptext
2019-03-14 08:24:49 +01:00
iceman1001
35bc4a975e
rename SNOOP -> SNIFF
2019-03-12 13:15:39 +01:00
Philippe Teuwen
961d929f4d
changing {} style to match majority of previous style
2019-03-10 11:20:22 +01:00
Philippe Teuwen
da6cdf014b
Keep string syntax in color macros
2019-03-10 00:56:00 +01:00
Philippe Teuwen
0373696662
make style
2019-03-10 00:00:59 +01:00
Philippe Teuwen
0d9223a547
client: fix mix of spaces & tabs
2019-03-09 23:35:06 +01:00
Philippe Teuwen
60f292b18e
remove spurious spaces & tabs at end of lines
2019-03-09 08:59:13 +01:00
Philippe Teuwen
edc19f202a
Convert the few files with still Windows carriage returns
2019-03-09 08:49:41 +01:00
Philippe Teuwen
abddff513e
loadFile: fix double free
2019-03-08 19:49:12 +01:00
merlokk
2e8771d7a3
added hf mf ndef
2019-03-05 19:57:08 +02:00
merlokk
9c8e60cf03
added to hf mf mad
2019-03-04 19:44:19 +02:00
merlokk
ee9daac029
Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad
...
# Conflicts:
# client/cmdhfmf.c
# client/mifare/mifarehost.c
2019-03-01 19:37:43 +02:00
merlokk
979aa678ad
small fix
2019-03-01 19:07:34 +02:00
Chris
c2046f2e65
CHG: 'hf mf dump' - now saves in BIN/EML/JSON default
...
CHG: 'hf mf esave' - now saves in BIN/EML/JSON default
2019-02-25 22:33:49 +01:00
iceman1001
aaac99fdee
fix: 'hf mf csave' unused code
2019-02-24 19:46:09 +01:00
iceman1001
f58c47a7b8
cleanup
2019-02-24 19:38:16 +01:00
iceman1001
cea5b5214d
chg: colors
2019-02-24 14:51:21 +01:00
merlokk
20be5c5d9f
some of MAD2 code
2019-02-22 19:58:50 +02:00
iceman1001
140c327cc2
CHG: 'hf mf list' - readded it. calls trace list mf in the back
2019-02-22 09:43:03 +01:00
iceman1001
7ea7061ed0
fix: 'hf mf cload' - wrong free
2019-02-21 23:22:39 +01:00
merlokk
db7580203b
create mad.c/h
2019-02-21 19:34:12 +02:00
merlokk
3b21b17509
move mifare stuff to its folder
2019-02-21 19:15:46 +02:00
iceman1001
6d63b3fbed
fix: mem leaks.
2019-02-21 16:17:49 +01:00
iceman1001
de317d9f48
fix: mem leaks.
2019-02-21 15:39:36 +01:00
iceman1001
06ade9970a
FIX: mem leaks
...
FIX: 'hf mf nested' - params
2019-02-20 22:29:39 +01:00
merlokk
583b732268
add hf mf mad
command
2019-02-20 21:12:50 +02:00
iceman1001
72cf200df7
chg....
2019-02-18 16:43:27 +01:00
iceman1001
b320ebca7c
chg: textual
2019-02-18 16:39:39 +01:00
iceman1001
38437a3916
chg: colors
2019-02-18 15:47:48 +01:00
iceman1001
fc1ed47d57
chg: more colors
2019-02-18 15:37:26 +01:00
iceman1001
23d0b6b1c6
chg: colors
2019-02-18 14:59:19 +01:00
iceman1001
06fc95b62d
chg: 'hf mf fchk' - textual
2019-02-18 10:41:54 +01:00
iceman1001
cacba04959
chg: 'hf mf fchk' - better handling when no keys was found.
2019-02-18 10:38:49 +01:00
iceman1001
7e601e5285
chg: textual
2019-02-18 10:27:14 +01:00
vratiskol
8e6b41f513
Use Variable for MIFARE_MINI_MAXSECTOR
...
Modify type uint16_t => 256
2019-02-15 15:17:28 +01:00
vratiskol
35df317a2c
Update MAXBLOCK - MF 4K
...
- Modify MAXBLOCK size: 4k => 256
- Typo
2019-02-15 01:08:30 +01:00
iceman1001
ed7122e409
chg: use calloc
2019-01-30 20:21:41 +01:00
iceman1001
66c82d16b0
chg: calloc calls
2019-01-21 09:02:00 +01:00
iceman1001
7bb8c629ba
fix: remove warnings
2019-01-08 20:14:46 +01:00
iceman1001
dac30911a3
FIX: remove gcc8.2 warnings
2019-01-08 10:56:56 +01:00
iceman1001
e3f4ef498f
CHG: 'hf mf fchk' - textual
2019-01-02 12:11:49 +01:00
iceman1001
6e281a08ed
CHG: 'hf mf fchk' - speed improvments by tweaking implementation.
...
CHG: 'hf mf fchk' - can use dictionary from flashmem if one is uploaded. (faster)
2019-01-02 11:52:13 +01:00
iceman1001
a963a7834c
FIX: 'mem load' - bad memory allocation
...
CHG: calloc fixes
2018-12-17 14:01:18 +01:00
Chris
7ceac11308
chg: Added some more Mifare sector trailer decoding (@Fl0-0)
2018-12-07 20:11:40 +01:00
merlokk
7c8377839e
4k fix
2018-11-30 20:33:46 +02:00
merlokk
9f77f2741f
added trailer decoding
2018-11-30 14:16:34 +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
Chris
6a21df3443
FIX: 'hf mf cload' - showing helptext instead of loading file.
...
Added support for easy loading of bin/eml files in this patch aswell.
2018-11-12 22:17:49 +01:00
Chris
3731ca19d2
chg: 'hf mf fchk' - filename
2018-11-08 01:16:27 +01:00
Chris
3e7d9fde01
CHG: 'hf mf hardnest' auto detect supported cpu-commandset. See helptext for more info. (@piwi)
2018-11-05 17:46:32 +01:00
merlokk
8720d10da9
changed logs
2018-10-24 19:02:14 +03:00
merlokk
61ea3109c9
start merge
2018-10-24 18:18:05 +03:00
Chris
bd34d145f1
fix: error enum rename
2018-10-14 12:05:45 +02:00
merlokk
ab5233d29f
now it needs to resolve issues in reveng
2018-10-11 11:48:46 +03:00
Chris
5c0517526a
CHG: 'hf mf csave'
...
CHG: 'hf mf esave' -
2018-09-16 23:05:09 +02:00
Garret Kelly
a665e170cd
Populate emulator keys from hf mf fchk
...
Just like `hf mf chk`, when the 't' option is provided make fchk put the
found keys into emulator memory.
2018-08-23 14:07:48 -04:00
Chris
8c0aa0c86d
FIX: 'hf mf chk' - chkkeys param error fix #1
2018-08-13 22:37:44 +02:00
Chris
5f77121694
initial commit to be in sync the-soon-defunct repo pm3rdv40.
2018-08-12 21:54:31 +02:00
Iceman
9b03cd9cd6
Update cmdhfmf.c
...
fix #225
2018-08-10 18:28:51 +02:00
iceman1001
9581317d3a
chg: some more commands
2018-05-05 18:59:31 +02:00
iceman1001
939b727c42
chg: converting malloc calls -> calloc which zeros out the allocated memory
2018-05-03 19:42:16 +02:00
iceman1001
45e6c96bda
....
2018-05-03 11:04:51 +02:00
iceman1001
0e7d8faf59
chg: 'hf mf csave'
...
chg: 'mem save'
chg: 'hf 15 dump' - no extra newline after last block in emlfile
2018-05-03 11:02:50 +02:00
iceman1001
271cb3e1cc
chg: \r didn't work well with printandlogex
...
chg: spaces
chg: cleaning
2018-04-27 12:15:26 +02:00
iceman1001
4f1e2f80c5
fix: 'hf mf esave' - no extra newline in the end of the file
2018-04-26 12:05:18 +02:00
iceman1001
24482211ad
chg: the dot progress is not logged anymore. Force fflush afterwards.
2018-03-05 20:07:29 +01:00
iceman1001
0eaae0cbae
chg: another "." progress
2018-03-01 14:12:17 +01:00
Brian Pow
f0314562f7
fix typos
2018-02-22 20:47:23 +08:00
Brian Pow
6003d4ffa0
tweak messages
2018-02-21 20:43:53 +08:00
Brian Pow
621a349e61
tweak messages
2018-02-21 20:43:50 +08:00
Brian Pow
ec0fa961a1
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:49 +08:00
Brian Pow
8b00d6c121
FIX: remove ISO14A_NO_DISCONNECT when reading the UID from mifare card
2018-02-10 00:01:50 +08:00
Brian Pow
b1d414c680
CHG: replace 'samples:' with 'Examples:', unify some usage text
2018-02-09 22:56:16 +08:00
Brian Pow
a02ec72f50
CHG: 'hf mf hardnested r' now read the corresponding bin file if tag presents, otherwise read nonces.bin
2018-02-09 22:56:16 +08:00
Brian Pow
e1bc58692d
Improved error detection and message if missing paramters for 'hf mf hardnested'
2018-02-09 22:56:15 +08:00
Brian Pow
35e62e7d1f
CHG: 'hf mf hardnested' now use hf-mf-<UID>-nonces.bin by default, with parameter 'u' or 'f' to override.
2018-02-09 22:56:15 +08:00
Brian Pow
d9882c9167
ADD: help in 'hf mf ice'. Save to hf-mf-<UID>-nonces.bin by default, with 'f' switch to override the default name
2018-02-09 22:56:15 +08:00
Brian Pow
53540fe206
ADD: 'hf mf restore' now allow user to specify the filename to restore
2018-02-09 22:56:15 +08:00
Brian Pow
756378e3c7
CHG: Added two switches for 'hf mf dump'. 'k' for key filename and 'f' for data filename,
...
FIX: Stop dumping/restoreing a tag if failed to generate filename using uid
2018-02-09 22:56:14 +08:00
Brian Pow
19fc90fa71
FIX: Stop dumping/restoreing a tag if failed to generate filename using uid
2018-02-09 22:54:55 +08:00