iceman1001
b279d04c85
chg: moving around includes
2018-05-02 19:37:20 +02:00
iceman1001
65c1a6b2c1
remove old data.c files. Code now in cmdmain.c
2018-05-02 18:10:17 +02:00
iceman1001
d9045635fb
whitespace
2018-05-02 18:09:46 +02:00
iceman1001
7d5322fc6e
whitespace
2018-05-02 18:08:47 +02:00
iceman1001
be4c5118b1
chg: remove obsolete data.c
2018-05-02 08:16:59 +02:00
iceman1001
a8dbbc1609
chg: forgot one
2018-05-02 08:13:23 +02:00
iceman1001
207fa2b574
add: potential fix for OSX uses, by @piwi
...
chg: adapting fix to support iceman forks extended commands.
2018-05-02 08:11:29 +02:00
iceman1001
886f7fbdad
chg: 'hf search' textual
...
chg: 'lf search' textual
2018-04-27 17:38:41 +02:00
iceman1001
cff2473cf8
testing. RDV40 Flashmemory upload / download working.
2018-04-27 16:51:08 +02:00
iceman1001
fe339872d8
chg: 'data bitsamples' - getfrombigbuf has now timeout
...
chg: 'data hexsamples' - getfrombigbuf has now timeout
chg: 'data samples' - getfrombigbuf has now timeout
2018-04-27 16:50:22 +02:00
iceman1001
69346852a6
chg: 'hf felica dumplite' - getfrombigbuf has now timeout
2018-04-27 16:49:34 +02:00
iceman1001
9577dad1aa
chg: 'hf iclass reader - getfrombigbuf has now timeout
2018-04-27 16:48:59 +02:00
iceman1001
cc0fac016b
chg: 'lf cotag - remove unneeded variable
2018-04-27 16:48:12 +02:00
iceman1001
d7e6b5d6a1
chg: 'lf hitag list' - getfrombigbuf has now timeout
2018-04-27 16:47:29 +02:00
iceman1001
511cae77f1
chg: 'lua scripting' - getfrombigbuf has now timeout
2018-04-27 16:46:38 +02:00
iceman1001
a42580317c
chg: 'trace list' - getfrombigbuf has now timeout
2018-04-27 16:45:49 +02:00
iceman1001
fec833de03
chg: 'lf t55 resetread' - getfrombigbuf has now timeout
...
chg: 'lf t55 ' - (aquiredata) getfrombigbuf has now timeout
2018-04-27 16:45:02 +02:00
iceman1001
c7067d0057
CHG: added extra out-of-bounds check when downloading data from device.
2018-04-27 12:36:53 +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
c41013d394
chg: printandlogex now deals with string which has inital newline char.
2018-04-27 11:22:30 +02:00
iceman1001
cd93f3a134
ADD: sample buffer size variable, to keep track of possible download lengths which is reserved on client.
2018-04-27 10:09:14 +02:00
iceman1001
7a17e7e753
chg: 'lf search' - remove some block prints for AutoCorrelate
...
chg: textual
2018-04-26 14:39:11 +02:00
iceman1001
8730b020b3
chg: space?
2018-04-26 14:26:28 +02:00
iceman1001
ef867794d1
chg: ...textual
2018-04-26 14:19:33 +02:00
iceman1001
e4bf5d3c66
chg: might fix timing issues between threads.
2018-04-26 12:13:03 +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
e119db8683
chg: textual
2018-04-26 08:46:17 +02:00
iceman1001
96a5cefe97
fix: wrong string used.
2018-04-25 18:13:28 +02:00
iceman1001
fcad4054b6
CHG: PrintAndLogEx, prints prefixes on without the \n in string
2018-04-25 09:28:27 +02:00
iceman1001
f5257f5380
fixes: 'script run mifareplus' behaves better now.
2018-04-25 09:22:41 +02:00
iceman1001
409c7b1029
chg: added some nedap blocks
2018-04-20 16:09:40 +02:00
iceman1001
cc181c3f91
chg: downloading of flashmemory to client.
2018-04-20 15:26:34 +02:00
iceman1001
a746699f5f
chg: reading / writing flashmem works better now.
2018-04-19 00:27:44 +02:00
iceman1001
fd52946ef8
chg: missing import, added sample to helptext and better length checks. (@neuromancer)
2018-04-18 22:21:16 +02:00
iceman1001
2e6699273e
chg: cleanup from offical repo
2018-04-18 20:17:00 +02:00
iceman1001
646ff0ce68
add: 'script run mifare_access' script which tries to decode Mifare Classic access bytes. (thanks to @neuromancer)
2018-04-18 19:20:13 +02:00
iceman1001
ec54fa5b30
fix: crc16 ccitt in utils.lua has been adapted for the new crc16.
2018-04-18 16:08:46 +02:00
iceman1001
a968ea8c53
chg: latest fixes
2018-04-17 13:26:28 +02:00
iceman1001
e09f26c862
chg: extra space
2018-04-06 23:53:33 +02:00
iceman1001
e8be06dd31
fix: 'data plot' - plot window now hides when keypress Q
2018-04-06 23:52:55 +02:00
iceman1001
190be2bd43
chg: 'data plot' - keypress Q doesn't hide / close window.. still unsolved.
2018-04-06 23:11:26 +02:00
iceman1001
eb2e3ce681
chg: to debug..
2018-04-06 23:02:56 +02:00
4m4rOk
2c490063da
Fixed undeclared identifier
...
Building the client fails because the identifier "ERROR" is undeclared. Changing it to "ERR" fixes this.
2018-04-06 22:53:37 +02:00
iceman1001
2aa9372534
CHG: rename of global variable
...
CHG: adjusted outputs.
2018-04-06 09:25:34 +02:00
iceman1001
2e3308b257
add: 'script run mifareplus' - a script to communicate with Mifare Plus tag. (@dceliano)
...
chg: added a bunch of gitignores for my dev-env.
2018-04-05 11:57:44 +02:00
iceman1001
395fd82935
add: information on loclass binary files
2018-04-05 11:41:48 +02:00
iceman1001
0aa6568bf9
fix: 'hf mfu' increase array
2018-04-04 12:28:30 +02:00
iceman1001
6b63f704cc
chg: adding spaces
2018-04-03 11:58:35 +02:00
iceman1001
967dbce1f2
chg: 'script run ul_uid' - tried to add suppor to for brickable magic tags which must be written in one session.
2018-04-03 11:24:58 +02:00
iceman1001
4b2a746ef5
ADD: 'hf mfu' detection of Mifare Ultralight NANO tags.
...
Interesting tag with two new commands. LOCK_SIG / WRITE_SIG. Need to add support for it.
https://www.nxp.com/docs/en/data-sheet/MF0UN_H_00.pdf
2018-04-03 09:57:20 +02:00
iceman1001
089beed4f4
fix: 'script lf_bulk' - parity fixes (@pwpiwi)
2018-03-29 13:20:00 +02:00
iceman1001
d0b3f1311e
chg: using_history? (suggestion of @pwpiwi)
2018-03-28 20:29:34 +02:00
iceman1001
37ff9275f1
reverted
2018-03-28 15:06:27 +02:00
iceman1001
90e63e10fb
chg: wrong variable name
2018-03-28 13:05:23 +02:00
iceman1001
31bc214137
chg
2018-03-28 13:00:44 +02:00
iceman1001
230c279124
fix: 'lf indala' Commit 1dae981 extended the amount of
...
fixed bits searched for when decoding 64-bit Indala. These additional
bits come from the end of one UID, and therefore need to be skipped past
when actually retrieving the UID. (@megabug)
b05611a30b
2018-03-28 12:53:27 +02:00
iceman1001
8f9da28a93
fix: reverting LF adjustment, will enable some LF to work properly again.
2018-03-26 12:02:22 +02:00
iceman1001
9f7d9a5d7f
chg: 'trace save' - removed redundant message
...
chg: 'trace load' - add check if file is too small to be useful
2018-03-21 08:33:41 +01:00
iceman1001
4dd7c19be1
fix: causes readline to crash a lot on ubuntu
2018-03-21 08:13:07 +01:00
iceman1001
b5545f4c35
chg: 'trace save' - now uses fileutils.c instead.
2018-03-20 08:23:54 +01:00
iceman1001
3d92a616b7
fix: to_lower -> tolower
2018-03-19 19:24:52 +01:00
iceman1001
c814615e1b
chg: helptext now shows correct sample key. (thanks @Dmanufacturer for pointing it out)
2018-03-19 19:19:57 +01:00
iceman1001
4ea466ac56
space
2018-03-19 18:17:04 +01:00
iceman1001
0abb85a411
chg: 'hf mfu dump' - renamed filename parameter from 'n' to 'f', since 'f' is used on other command (iClass)
...
chg: generic to_lower can remove some cases
2018-03-19 18:16:33 +01:00
iceman1001
15d258a30a
fix: tracebuffer, and messages
2018-03-19 16:13:31 +01:00
iceman1001
e182d12ba8
chg: textual
2018-03-18 21:49:48 +01:00
iceman1001
52a0acd7f1
chg: 'trace save' better checks
...
chg: 'trace load' closing filehandles..
2018-03-18 21:47:16 +01:00
iceman1001
c30e282f5e
chg: 'trace list' - allocating memory
2018-03-18 21:18:26 +01:00
iceman1001
7ecd35943c
chg: 'trace load'
...
chg: 'trace save'
all from @pwpivi PR in offical pm3 repo https://github.com/Proxmark/proxmark3/pull/577
Adapted for bigger filesizes and offline/online detection.
Currently a bug somewhere....
2018-03-18 19:58:22 +01:00
iceman1001
71ce6e07ee
CHG: moved trace commands into its own category (from hf)
...
'trace list'
there will also the load / save of trace buffer come.
For backwardfunctionality the old commands still works.
2018-03-18 18:00:41 +01:00
iceman1001
4c666e3832
add: OSX readline fixes ( @micolous )
...
0763239363
2018-03-17 14:35:34 +01:00
iceman1001
0656edbb85
chg: 'hf mfu dump' message
2018-03-17 14:34:55 +01:00
iceman1001
b0eaa730c0
FIX: 'hf mfu dump' - partial reads leads to overwritten data on wrong blocks.
2018-03-16 16:31:10 +01:00
iceman1001
0eca7e3977
chg: #define rename
2018-03-16 08:58:07 +01:00
iceman1001
7a71df3aec
syntax sugar
2018-03-15 22:35:11 +01:00
Johnny Bengtsson
fdda1d2961
Minor warning correction.
...
This fix resolves the warnings as printed below.
ui.c: In function ‘PrintAndLogOptions’:
ui.c:40:45: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%%us", space, counts[j]);
^
ui.c:40:50: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%%us", space, counts[j]);
^
ui.c:42:54: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%-%us", space, counts[j]);
^
ui.c:42:60: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
snprintf(format, sizeof(format), "%%%us%%-%us", space, counts[j]);
2018-03-15 13:59:43 +01:00
iceman1001
fd7acc78f3
fix: 'hf 14a info' - ATS length sanity check added
2018-03-13 23:16:48 +01:00
iceman1001
24482211ad
chg: the dot progress is not logged anymore. Force fflush afterwards.
2018-03-05 20:07:29 +01:00
Brian Pow
a352dbd93f
migrate some usage text to call PrintAndLogOptions()
2018-03-01 23:55:13 +08:00
Brian Pow
88073dc5ce
add PrintAndLogOptions
2018-03-01 23:34:14 +08:00
iceman1001
04d4ecddbf
FIX: 'data plot + keypress g on empty plot' correct fix.
2018-03-01 14:35:47 +01:00
iceman1001
0eaae0cbae
chg: another "." progress
2018-03-01 14:12:17 +01:00
iceman1001
40cc0a402b
chG: adjust some "." progress dots, that shouldn't use NORMAL..
2018-03-01 14:10:52 +01:00
iceman1001
5de4d9d3a6
FIX: 'data plot window' - keypress G in an empty plot crashed the client. Missing parenthis.
2018-02-28 21:53:42 +01:00
iceman1001
802994d30a
add: 'hf 14 antifuzz' - the outline for the new functionality which fuzzes the anticollision phase ISO 14443a.
2018-02-28 13:21:47 +01:00
iceman1001
184ab1aeab
fix: output from reconnect, seems to get stuck and not continue into cli.
2018-02-28 08:23:49 +01:00
iceman1001
97c029fc55
textual output
2018-02-28 08:12:21 +01:00
Brian Pow
e0121a3bfd
reformat usage text
2018-02-27 22:59:15 +08:00
Iceman
b63e9ab938
Merge pull request #183 from brianpow/hf-15-restore
...
implement 'hf 15 restore'
2018-02-26 21:06:29 +01:00
iceman1001
867a3a8f0c
fix: wrong size
2018-02-24 18:11:54 +01:00
Brian Pow
d8f0863a2a
PrintAndLogEx supports multi-line messages
2018-02-25 00:39:05 +08:00
Brian Pow
c0c89a0e7b
implement 'hf 15 restore'
2018-02-24 21:45:51 +08:00
Brian Pow
a4fa0144eb
migrate PrintfAndLog() to PrintAndLogDevice()
2018-02-22 23:17:46 +08:00
Brian Pow
668b44ba26
use PrintAndLogEx() instead of PrintAndLog()
2018-02-22 20:49:39 +08:00
Brian Pow
f0314562f7
fix typos
2018-02-22 20:47:23 +08:00
iceman1001
d8281e69fd
chg: skip printing debug statements when not debugging.
...
chg: started with a coloring of messages. Didn't work super well..
2018-02-21 19:00:42 +01:00
iceman1001
a9c652bb6c
no need for formatting
2018-02-21 18:20:50 +01:00
iceman1001
65a4253e7e
print..
2018-02-21 17:56:09 +01:00
iceman1001
b5500c3e54
simple debug..
2018-02-21 16:48:52 +01:00
iceman1001
db6b1bab7d
simpler debug
2018-02-21 16:46:38 +01:00
iceman1001
0248352ea6
chg:simpler debug printing
2018-02-21 16:41:39 +01:00
iceman1001
e69ca55246
chg: more..
2018-02-21 16:37:20 +01:00
iceman1001
555b261eab
simpler debug printing
2018-02-21 16:36:40 +01:00
iceman1001
e29503b368
chg: easier debug printing
2018-02-21 16:31:34 +01:00
iceman1001
7064a2dd71
chg: made debugprintig easier.
2018-02-21 16:30:15 +01:00
iceman1001
a29b2328db
fix: g_debugMode - client side global debugvariable, moved to util.c
2018-02-21 15:54:13 +01:00
iceman1001
180e3d4df9
chg: adaptations for global debug var to be accessible
2018-02-21 14:59:06 +01:00
iceman1001
dc22ba144c
fix: adapting for g_debug access..
2018-02-21 14:52:31 +01:00
iceman1001
69aa3bfeed
chg: skip printing DEBUG messages if global client debug variable it set to zero.
2018-02-21 14:42:00 +01:00
Brian Pow
731a7db4e6
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 21:03:36 +08:00
Brian Pow
6ba31a5581
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 21:03:36 +08:00
Brian Pow
5d332d38ef
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 21:03:36 +08:00
Brian Pow
26af82879a
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 21:03:35 +08:00
Brian Pow
e9185085c7
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 21:02:28 +08:00
Brian Pow
39f44c33a4
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:56:39 +08:00
Brian Pow
7a9612036d
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:56:39 +08:00
Brian Pow
6d6f5f422d
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:56:39 +08:00
Brian Pow
ee3da288e3
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:56:39 +08:00
Brian Pow
14c68d47ec
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:56:38 +08:00
Brian Pow
d8518f0b00
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:56:38 +08:00
Brian Pow
e68055ac65
use PrintAndLogEx() instead of PrintAndLog(), remove uerr()
2018-02-21 20:43:56 +08:00
Brian Pow
0de94cff10
use PrintAndLogEx() instead of PrintAndLog(), tweak messages
2018-02-21 20:43:56 +08:00
Brian Pow
dff2a778b1
use PrintAndLogEx() instead of PrintAndLog(), tweak message
2018-02-21 20:43:56 +08:00
Brian Pow
936581b4ac
use PrintAndLogEx() instead of PrintAndLog(), tweak messages
2018-02-21 20:43:56 +08:00
Brian Pow
69586e5dd6
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:56 +08:00
Brian Pow
5bd7ba6fd0
use PrintAndLogEx() instead of PrintAndLog(), tweak messages
2018-02-21 20:43:56 +08:00
Brian Pow
bfa510cce1
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:55 +08:00
Brian Pow
217647d993
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:55 +08:00
Brian Pow
24274ff2fe
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:55 +08:00
Brian Pow
a7f61f7811
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:55 +08:00
Brian Pow
b4b26377d8
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:55 +08:00
Brian Pow
6a1c2895e0
use PrintAndLogEx() instead of PrintAndLog(), tweak messages
2018-02-21 20:43:54 +08:00
Brian Pow
72b733b833
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:54 +08:00
Brian Pow
9c574b4920
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:54 +08:00
Brian Pow
a84d863fc2
use PrintAndLogEx() instead of PrintAndLog(), tweak messages
2018-02-21 20:43:54 +08:00
Brian Pow
bec3b6c468
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:54 +08:00
Brian Pow
4306f85343
tweak messages
2018-02-21 20:43:54 +08:00
Brian Pow
9b7bd49665
tweak messages
2018-02-21 20:43:53 +08:00
Brian Pow
6003d4ffa0
tweak messages
2018-02-21 20:43:53 +08:00
Brian Pow
858224244d
tweak messages
2018-02-21 20:43:53 +08:00
Brian Pow
43ec321e53
tweak messages
2018-02-21 20:43:53 +08:00
Brian Pow
b1318c6e0c
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:52 +08:00
Brian Pow
618b868daf
tweak message
2018-02-21 20:43:52 +08:00
Brian Pow
c80c992ff3
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:52 +08:00
Brian Pow
2cea36c3b5
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:51 +08:00
Brian Pow
740a1daaa4
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:51 +08:00
Brian Pow
8e15b3fa22
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:51 +08:00
Brian Pow
8c435c2725
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:51 +08:00
Brian Pow
0f6e779e0d
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:51 +08:00
Brian Pow
8a408088af
tweak message
2018-02-21 20:43:51 +08:00
Brian Pow
d34e95b9a8
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:50 +08:00
Brian Pow
2a3f670e0c
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:50 +08:00
Brian Pow
621a349e61
tweak messages
2018-02-21 20:43:50 +08:00
Brian Pow
4afe5e6ce0
tweak messages
2018-02-21 20:43:50 +08:00
Brian Pow
6582a2ccb1
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:50 +08:00
Brian Pow
cafa0649f5
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:50 +08:00
Brian Pow
02694401e8
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:49 +08:00
Brian Pow
b8f106d7a7
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:49 +08:00
Brian Pow
44bd1cd13d
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:49 +08:00
Brian Pow
9aee92f27d
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:49 +08:00
Brian Pow
5b0233854d
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:49 +08:00
Brian Pow
ec0fa961a1
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:49 +08:00
Brian Pow
78647f4502
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:48 +08:00
Brian Pow
37b1b9a650
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:48 +08:00
Brian Pow
cf7b12a734
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:48 +08:00
Brian Pow
72ce7dc595
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:48 +08:00
Brian Pow
d8c8874bdf
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:48 +08:00
Brian Pow
9fa5d23cc5
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:43:47 +08:00
Brian Pow
7e125b9bfb
use PrintAndLogEx() instead of PrintAndLog()
2018-02-21 20:39:54 +08:00
Iceman
4efb9aba4d
Merge pull request #177 from brianpow/PrintAndLogEx
...
add PrintAndLogEx()
2018-02-21 07:20:43 +01:00
Brian Pow
68fddf00ce
simplify PrintAndLogEx()
2018-02-21 14:10:44 +08:00
iceman1001
4e915d2eb4
chg: prng detection now takes in consideration if detection fails.
2018-02-20 21:20:17 +01:00
iceman1001
9512f60227
chg: formatMifare.lua helptext output
2018-02-20 20:20:34 +01:00
iceman1001
5dbfb627fc
chg: 'brutesim' - script prints author and checks for being called with no arguments.
2018-02-20 20:18:37 +01:00
iceman1001
5b6a5206df
add: 'script run lf_bulk' - the original script is call lf_buld_program but thats a too long name, with adaptations in code.
...
chg: some script textual output
2018-02-20 20:16:30 +01:00
tuxthemadpenguin
ce27e5d7e1
Adding MBTA keys - same for every card
2018-02-19 11:02:18 -05:00
iceman1001
e6f51451aa
chg: added the mutex lock to printing in communications thread.
2018-02-18 10:36:15 +01:00
iceman1001
41540ae1c1
chg: removed warning of uninitilised
2018-02-15 23:47:16 +01:00
iceman1001
9e1e9af794
chg: 'data autocorr' - adjustment of parameters.
2018-02-15 20:23:54 +01:00
iceman1001
a38904c453
CHG: 'data autocorrelate' - now using proper autocorrelate algo.
2018-02-15 17:57:28 +01:00
Brian Pow
5ea8b4348c
add PrintAndLogEx()
2018-02-15 23:32:08 +08:00
iceman1001
a1dd7c2020
chg: 'hf list mf' - adapted the output from 16bytes rows to 18 in order to make output more easily to compare
2018-02-15 11:47:34 +01:00
Federico Cerutti
8d152d24f2
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2018-02-15 00:21:25 +01:00
Federico Cerutti
58ddd53fb0
Removed hf 15 select: broken command
2018-02-15 00:13:27 +01:00
iceman1001
acda2ebc66
fix: 'hf list mf' - decrypting works now. Missed a bit.
2018-02-15 00:03:01 +01:00
iceman1001
326079fbb6
chg: timing text
2018-02-14 23:53:32 +01:00
iceman1001
b8ddb3b384
chg: 'hf list mf' - 10b uid
2018-02-14 23:48:45 +01:00
iceman1001
ad99b4f394
add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk)
...
---most likely broke something.. :) needs proper testing.
2018-02-14 23:03:39 +01:00
iceman1001
604aaf5356
fix: missing in header..
2018-02-14 21:56:28 +01:00
Iceman
2b78b785f3
Merge pull request #173 from brianpow/rename-prnlog-to-PrintfAndLog
...
Rename prnlog() to PrintfAndLog()
2018-02-14 21:47:54 +01:00
iceman1001
b2a3b0f72a
chg: 'lf cmdread' @marshmellow42 improvements from https://github.com/Proxmark/proxmark3/pull/570
...
chg: and some adaptations..
2018-02-14 21:40:52 +01:00
iceman1001
8c5ab9cf18
textual
2018-02-14 16:18:04 +01:00
iceman1001
e09d5385bf
chg: clearing some mem..
2018-02-14 15:27:39 +01:00
iceman1001
97803733ce
fix: 'hf 15 raw' - wrong length when using -c param
...
https://github.com/iceman1001/proxmark3/issues/174
2018-02-14 15:24:45 +01:00
iceman1001
46d540490f
chg: add response ack.
2018-02-13 15:45:15 +01:00
iceman1001
1709c1ce1a
chg: flash_mem - hooked up client - device comms
2018-02-13 15:36:20 +01:00
Brian Pow
8f9c81ae81
Rename prnlog() to PrintfAndLog()
2018-02-13 00:12:50 +08:00
iceman1001
1b8ff6c45c
syntax
2018-02-11 17:46:14 +01:00
Iceman
9af8d0e7ac
Merge pull request #164 from brianpow/master
...
CHG: 'hf mf dump' now use hf-mf-UID-key.bin and hf-mf-UID-data.bin in…
2018-02-11 17:42:40 +01:00
Iceman
442ad9f481
Merge pull request #172 from n0ncetonic/patch-2
...
Adds default PicoPass 2k Exchange Key
2018-02-11 14:10:57 +01:00
noncetonic
b3c6103f92
Adds key
...
Actually adds the key...
2018-02-09 11:24:25 -08:00
noncetonic
fb05042b71
Adds default PicoPass 2k Exchange Key
...
PicoPass 2k doc describes loading Kd and Kc via their "encrypted values" composed of the default exchange key XOR'd with Kd/Kc
2018-02-09 10:12:40 -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
Brian Pow
8e04df77ba
FIX: GenerateFilename() return broken filename if no tag is detected.
2018-02-09 22:54:55 +08:00
Brian Pow
45c20d62b8
FIX: wrongly assume the max size of UID to 8 bytes. Max size should be 10 bytes.
2018-02-09 22:54:55 +08:00
Brian Pow
551cc5539b
Updated header file for better consistency of parameter name
2018-02-09 22:54:55 +08:00
Brian Pow
39d2a92ead
CHG: use FillFileNameByUID() for filename generation for 'hf 15 dump'
2018-02-09 22:54:54 +08:00
Brian Pow
d050e473b7
CHG: use FillFileNameByUID() for filename generation for 'hf mf dump' and 'hf mf chk * ? d'
2018-02-09 22:54:54 +08:00
Brian Pow
314253c359
CHG: 'hf mf dump' now use hf-mf-UID-key.bin and hf-mf-UID-data.bin instead of dumpkey.bin and dumpdata.bin as default name
2018-02-09 22:54:54 +08:00
iceman1001
f1dcdaef27
fix: 'hf mf fchk' wrong number of vars to format string
2018-02-09 13:40:28 +01:00
iceman1001
5b596f8e82
chg: 'hw tune' - only show plotwindow if LF antenna is connected (ie we get lf values)
2018-02-09 13:39:32 +01:00
iceman1001
ff598db839
textual
2018-02-09 00:28:30 +01:00
iceman1001
76e6683ac4
text
2018-02-09 00:27:30 +01:00
iceman1001
5adb9af78f
chg: 'hw tune' - compensating the 3% error marginal.
2018-02-09 00:25:45 +01:00
iceman1001
fe34cac012
FIX: 'hf mf darkside' - no more WDT crashes. plus positive sideeffects (@pwpiwi)
...
https://github.com/Proxmark/proxmark3/pull/569
2018-02-08 19:11:35 +01:00
noncetonic
20af8e78ad
Adds PicoPass 2k Kd
...
Found in documentation when describing how the exchange key is used with default Kd to send encrypted Kd. Kc also referenced but not sure if it's super useful
2018-02-08 06:05:31 -08:00
iceman1001
39de74cb78
fix: wrong block
2018-02-08 12:39:35 +01:00
iceman1001
357cf59f1b
textual
2018-02-08 12:35:59 +01:00
iceman1001
220614ca10
fix: 'hf iclass reader' - drop field when finished.
2018-02-08 12:34:13 +01:00
iceman1001
b31afcfc31
fix: 'hf iclass reader' - missing CC
2018-02-08 12:18:40 +01:00
iceman1001
2847a147b5
fix: 'hf iclass dump', missing CC
2018-02-08 12:15:47 +01:00
iceman1001
f6d314d09e
chg: iclass dump textual..
2018-02-08 11:03:11 +01:00
iceman1001
28e73824e1
chg: 'hf iclass dump' - more texts
2018-02-08 10:49:44 +01:00
iceman1001
30e9395590
fix: 'hf iclass lookup' - exit when failed to load dictionary file
2018-02-08 10:32:14 +01:00
iceman1001
7bf6e0d089
fix: 'hf iclass chk' - checking keys outside the first chunk of 128.
2018-02-08 09:30:34 +01:00
iceman1001
fb4b3502ef
fix: 'script run mifare_autopwn.lua' - wrong bool comparision
2018-02-07 23:54:11 +01:00
iceman1001
c808eb0e87
chg: 'hf mf nested' - adjusted the candidate loop to handle all keys, not only max 85 keys.
2018-02-07 23:13:54 +01:00
iceman1001
c9479276dc
textu
2018-02-07 22:02:04 +01:00
iceman1001
134d04cb7a
FIX: 'hf mf darkside' - correct behaviour is to copy the key candidates to the list, not only to first position.
...
This solves slow execution of command, since before attack had to repeat until correct key was in pos 1.
2018-02-07 21:51:45 +01:00
iceman1001
120abf10bc
chg: tests with ansi-colors
2018-02-07 14:08:57 +01:00
iceman1001
6371dfc5b6
chg: made DropField function a compiler macro instead.
2018-02-06 22:32:08 +01:00
iceman1001
2820ba5580
chg: 'hf mf nested'
...
chg: 'hf mf dump' change retries to 10 times
2018-02-06 20:08:42 +01:00
iceman1001
09b2a079ba
chg: enable ansi-colors for OSX
2018-02-06 19:21:47 +01:00
iceman1001
88becf8b09
chg: missed a spot.. showBanner should not be shown on apple
2018-02-06 12:45:38 +01:00
iceman1001
843f453491
fix: saveFileEML() does not follow blocksize. Thanks to @brainpow
...
ref
271dface40
2018-02-06 12:43:58 +01:00
iceman1001
124ce7efc6
chg: from loclass demo file
2018-02-06 12:33:27 +01:00
iceman1001
304a59f710
chg: 'hf mf darkside' - .... nothing special... zero parity attack works, doesnt crash, but takes kind of long time
2018-02-05 23:16:09 +01:00
iceman1001
9e8c1d81a4
chg: 'hf mf darkside' - better output for zero-parity attack.
...
chg: 'hf mf darkside' - now also honor keyboard interupt attack..
2018-02-05 21:05:29 +01:00
iceman1001
b8e7f20945
chg: textual.. and moved a helptext
2018-02-05 21:03:51 +01:00
iceman1001
3464fbe1df
fix 'hf mf darkside' - adapted solution from @pwpivi
2018-02-05 20:46:14 +01:00
iceman1001
09d8744b84
testual
2018-02-05 16:57:29 +01:00
iceman1001
c02ee39029
practising byte splitting and a startpattern detection for FeliCa...
2018-02-05 16:51:46 +01:00
iceman1001
b90c3db96b
rename: 'hf mf mifare' -> 'hf mf darkside' Finally renamed this,...
...
adjusted the help-texts
adjusted command tables, to have separators in order to make it easier to read. commands now grouped according to relevance.
2018-02-05 16:50:06 +01:00
iceman1001
274370554f
textual
...
and only allow escape sequences on linux
2018-02-05 16:47:57 +01:00
iceman1001
c72548562e
chg: remove double exit text
...
chg: escape chars didn't work on apple
2018-02-05 16:38:00 +01:00
iceman1001
debf4e3327
chg: 'analyse hid' moved to 'hf iclass permute' un/permute function is moved.
2018-02-04 17:19:08 +01:00
iceman1001
7c89a191ef
textual
2018-02-04 16:58:48 +01:00
iceman1001
6605d92fbb
chg: tried making the reselect more stable.
...
chg: 'hf iclass readblk'
chg: 'hf iclass writeblk'
chg: 'hf iclass dump'
chg: 'hf iclass clone'
all commands now has 'v' verbose parameter for more detailed output.
2018-02-04 12:25:55 +01:00
iceman1001
6a9ddf6e69
chg 'hf iclass chk' - increased timeout, switch off antenna before each run in order to reset card, three retires. all this make it more stable.
2018-02-04 10:20:38 +01:00
iceman1001
dc25f9212f
FIX: 'hf iclass sim 2'
...
FIX: 'hf iclass sim 4'
FIX: 'hf iclass loclass' - this fixes the bug where loclass assumes the epurse value is all zeros, while it now should save the epurse value during the simulation if it is updated/read.
I assume a empty valid epurse, while an all zero epurse is too much easy to detect as a anomaly.
2018-02-04 00:52:29 +01:00
iceman1001
7c8de64c57
textual
2018-02-03 23:15:14 +01:00
iceman1001
1ab498001e
fix: 'reveng -g' stack crash by too small array
2018-02-03 23:05:01 +01:00
iceman1001
e95313cc22
fix: reveng needs a macro to compile.
2018-02-03 22:58:43 +01:00
iceman1001
7de458486f
adjustments, still breaks on ubuntu,
2018-02-03 22:47:17 +01:00
iceman1001
0234ca5654
scripting, remove free
2018-02-03 22:33:51 +01:00
iceman1001
8a49cb84a2
fix: script run e - if called with param but no value, use default value for width.
...
fix: if no models found, return lua error.
textual changes.
2018-02-03 22:17:07 +01:00
iceman1001
2d2a8b7b1b
fix: avoid empty strings.
2018-02-03 21:56:34 +01:00
iceman1001
2b34fbec0c
fix: proper exit with script fails to find any crc models.
2018-02-03 21:49:29 +01:00
iceman1001
54f0c188dd
add
2018-02-03 15:35:59 +01:00
iceman1001
c025e38d91
fix: remove warning..
2018-02-02 17:32:02 +01:00
iceman1001
07d7b9424c
chg: textual
2018-02-02 13:01:11 +01:00
iceman1001
fff8edd815
chg: textual..
2018-02-02 12:59:40 +01:00
iceman1001
ccfdd60c09
chg: textual
2018-02-01 21:39:34 +01:00
iceman1001
cfb3654f7b
chg: textual
2018-02-01 18:24:38 +01:00
iceman1001
55874d7872
chg: textual
2018-02-01 18:02:24 +01:00
iceman1001
59a461fd2b
chg: 'hf iclass sim' ..double
2018-02-01 18:01:44 +01:00
iceman1001
8380743a42
chg: 'hf iclass sim' textual
2018-02-01 17:58:50 +01:00
iceman1001
111b55d850
chg: 'hf iclass sim' textual
2018-02-01 17:53:28 +01:00
iceman1001
e0373212a3
chg: 'hf iclass sim' - sim2, 4 get less default output, set DBG 4 for verbose
2018-02-01 16:10:24 +01:00
iceman1001
3248bb5a56
chg: 'hf iclass sim' - get ride of the "waiting for response" message.
...
-- sim 2, 4 - cancel by keypress.
2018-02-01 15:55:12 +01:00
noncetonic
a52024ef3d
Updates command usage
...
Updates `usage_hf_iclass_lookup` to match u/U being used for CSN vs c/C.
Updates `usage_hf_iclass_sim` to include "sim 4"
Updates `usage_hf_iclass_writeblock` to remove sample with invalid `n 0` option
2018-02-01 06:41:44 -08:00
iceman1001
1965927009
chg: https://github.com/Proxmark/proxmark3/pull/558 (@pwpiwi) might solve the mystery crashes.
2018-02-01 15:24:36 +01:00
iceman1001
52d69ed4ee
CHG: refactor CRC16 algos. This is a big change, most likely some parts broke, hard to test it all.
2018-02-01 15:19:47 +01:00
noncetonic
092c75961f
Adds HID Master Auth Key
...
It's leaked so why not share it
2018-02-01 04:21:04 -08:00
iceman1001
50e4d60853
chg: 'hf iclass lookup' adjusted helptext and parameters
2018-01-31 16:50:41 +01:00
iceman1001
e66b9c52b3
chg: some referense to "string.h" -> which should be <string.h> or removed.
2018-01-31 12:04:12 +01:00
iceman1001
bf25b1c9ba
chg: crc16 got a compute_crc function
2018-01-30 03:31:11 +01:00
iceman1001
eb8e7a1679
intendention
2018-01-30 03:29:59 +01:00
iceman1001
c6207d09e1
chg: 'hf felica reader' is better, almost working good
2018-01-30 03:29:37 +01:00
iceman1001
b39332e938
REM: 'hf 15 debug' removed command, unified with mf_debuglevel instead. The idea is to have ONE debug flag on deviceside.
2018-01-29 15:58:00 +01:00
iceman1001
29c15b3480
cHG.. missing
2018-01-29 13:48:18 +01:00
iceman1001
ed982a4787
textual
2018-01-29 13:42:18 +01:00
iceman1001
c04ac4f9ac
ADD: 'hf felica reader' - added pm3 as FeliCa reader
...
ADD: raw commands - added the basis for sending RAW commands to FeliCa.
CHG: CRC16 rework, uses table based implementation. This will change more functions as I go on.
2018-01-29 13:42:02 +01:00
iceman1001
51a65a0ce3
rem: removed unneeded function
2018-01-28 12:47:08 +01:00
iceman1001
205e4b2300
chg: adjusted the input parameters for crc16 implementations.
2018-01-28 12:19:04 +01:00
iceman1001
e396575424
add: fast reverse 16bit
2018-01-27 23:16:35 +01:00
iceman1001
ede55a1498
add: fast 8bit reversal.
2018-01-27 22:20:56 +01:00
iceman1001
dcdac209d4
fix: gcc7 warning
2018-01-26 20:44:57 +01:00
iceman1001
374c1b16f6
chg: remove gcc 7.0 warnings
2018-01-26 20:17:56 +01:00
iceman1001
13e521668f
FIX: https://github.com/Proxmark/proxmark3/pull/555 (Thanks @arnie97)
2018-01-26 19:31:13 +01:00
iceman1001
4671b81115
chg: skip pointers and make a small number instead.
2018-01-25 20:54:15 +01:00
iceman1001
0582fdf934
chg: pointer should be unsigned
2018-01-25 20:29:22 +01:00
iceman1001
d3db40b7dd
chg: remove warning
2018-01-25 20:12:33 +01:00
iceman1001
f01bc31486
CHG: removed warnings %zu size_t
2018-01-25 19:51:10 +01:00
iceman1001
20e9931b63
syntax sugar
2018-01-25 18:45:13 +01:00
iceman1001
f0e328a64b
chg: since we now uses c99 as standard, we can use string formatter %zu
2018-01-25 18:41:59 +01:00
iceman1001
009e4f9d99
chg: use return value instead
2018-01-25 18:11:07 +01:00
iceman1001
681f2cc83d
fix: bad compare.
2018-01-25 18:10:34 +01:00
iceman1001
f6b98acbf6
chg: turn off antenna when failed.
2018-01-25 18:02:49 +01:00
iceman1001
b10dca061a
fix: too many arguments to function
2018-01-25 18:01:40 +01:00
iceman1001
c1b4411268
FIX: array-out-of-bounds
2018-01-25 17:59:11 +01:00
iceman1001
a13ecc4a4e
CHG: applied https://github.com/Proxmark/proxmark3/pull/553 (@arnie97) and in some more places
2018-01-25 09:51:49 +01:00
iceman1001
aad1e65b97
FIX: cherrypick some fixes from https://github.com/Proxmark/proxmark3/pull/550 (pwpiwi)
2018-01-23 17:41:47 +01:00
iceman1001
be82f9f018
DEL: 'hf mf sniff' - since it is very similar to 'hf 14a sniff' , I removed this command. The desired functionality will become a new 'hf list mf' option in the future.
2018-01-18 14:11:22 +01:00
iceman1001
21dd3f68ea
chg: 'hf mf sniff' - adjustments
2018-01-17 00:34:15 +01:00
iceman1001
d60721d131
chg: clean up
2018-01-17 00:30:43 +01:00
iceman1001
9a162c9a79
CHG: 'hf mf sniff' - output adjustments
2018-01-17 00:29:41 +01:00
iceman1001
1b20ff8243
chg, 'hf mf sim' is ok to call without parameter
2018-01-11 22:07:26 +01:00
iceman1001
8f6253c5ed
chg: textual
2018-01-11 21:50:05 +01:00
iceman1001
706287619a
FIX: 'hf mf sniff' - possible mf frame sizes for Desfire is 256 or more
2018-01-11 21:49:27 +01:00
iceman1001
5ea8f73547
FIX: cmd_send has wrong varible definitions, leading to loss of values.
2018-01-11 21:47:27 +01:00
iceman1001
1b61e01f0e
chg: removed whitespaces.
2018-01-09 19:17:21 +01:00
iceman1001
2b093f8059
chg: 'hf iclass' textual
2018-01-09 16:31:54 +01:00
iceman1001
8103f8c7d0
syntax sugar
2018-01-09 16:30:30 +01:00
iceman1001
1d04e8822c
chg: 'hf mf fchk' textual
2018-01-09 16:29:43 +01:00
iceman1001
f865b593d7
chg: 'hf mf fchk' helptext
...
chg: 'hf mf sniff' textual
2018-01-09 16:25:58 +01:00
iceman1001
eed271af5c
CHG: 'hw tune' tuning antenna now can handle bigger antennas than 65v, with shifting 9, it can measure up to 130v.
...
CHG: 'hw tune' - command output and layout changes. I think this is easier to read.
2018-01-09 14:53:17 +01:00
iceman1001
b578e55d17
chg: 'hf 14b snoop' renamed 'hf 14b sniff'...
...
In order to use one command for SNIFFING.. All snoop names will be renamed.
2018-01-06 21:12:28 +01:00
iceman1001
5dc1761943
FIX: solution one, for more avx, avx2, avx512
...
ab0582d672
2018-01-06 18:52:28 +01:00
iceman1001
cd1f5a58f5
ADD: 'script run ntag_3d.lua' - script to program xyz related ntag213f / magic ntag
2018-01-06 09:54:46 +01:00
iceman1001
07d51ec4a4
fix... don't even mention it...
2018-01-06 00:19:52 +01:00
iceman1001
1a2973a319
fix: 'hf mf hardnested' - crashes on SSE2 with mingw / windows, Huge thanks to @merlokk @pwpiwi for bug and fix!
...
https://github.com/Proxmark/proxmark3/issues/404
2018-01-05 18:01:59 +01:00
iceman1001
647d275d18
chg: 'hf felica litedump' - now turns off device when aborted via keyboard, or buttonpress
2018-01-05 17:57:50 +01:00
iceman1001
9a8331b882
textual
2018-01-05 17:42:21 +01:00
iceman1001
0fda0329eb
textual
2018-01-05 17:41:11 +01:00
iceman1001
82dbfba827
chg: 'hf felica litedump' - more stable impl. Will not break when run twice in a row. Still device can be in a loop if 100sec timeout occures. :(
2018-01-05 17:39:04 +01:00
iceman1001
f0a5d10354
chg: 'hf iclass eload' better filename handling
2018-01-02 13:02:55 +01:00
iceman1001
fe9416db23
chg: 'hf iclass' - work in progress. running default_iclass_keys.dic against reader (pm3 as simulation)
2018-01-02 11:17:31 +01:00
iceman1001
c328f68640
fix: part of @pwpiwi 's #534 fixes
2018-01-01 18:57:37 +01:00
iceman1001
d9089e74b4
chg: textual
2018-01-01 18:54:01 +01:00
iceman1001
f92a6ddf7d
FIX: 'hf iclass' - sneaky fread bug. thanks to @bettse who found it
2018-01-01 14:28:53 +01:00
Chris
d5ce45bae7
FIX: 'hf mf chk' / 'hf mf fchk' - t/d param bug. Now it is not place dependent and can also read several dictionary files :)
2017-12-31 19:36:12 +01:00
iceman1001
2abcce598a
lastone
2017-12-27 20:47:34 +01:00
iceman1001
97c176c10e
additions of keys
2017-12-27 20:36:46 +01:00
iceman1001
7d25ab4561
Update loclass license conditions, https://github.com/Proxmark/proxmark3/issues/527
2017-12-27 10:34:51 +01:00
iceman1001
36eb64cef4
fix: making it strings
2017-12-24 11:04:13 +01:00
iceman1001
61b8594cb4
working progress..
2017-12-24 10:59:24 +01:00
iceman1001
4e6140570e
fix: add dummy
2017-12-24 10:57:21 +01:00
iceman1001
dc890104aa
fix: spaces, and remove tabs
2017-12-24 10:56:17 +01:00
iceman1001
289b5fcb0f
chg: adapting to path
2017-12-24 10:51:42 +01:00
iceman1001
e873c1decd
chg: 'hf 15' updated some helptexts
2017-12-24 10:33:14 +01:00
iceman1001
f1e631ef56
chg: adapting path changes.
2017-12-24 10:32:15 +01:00
iceman1001
40b1922187
chg: added emv4 changes.
...
broke out the includes into a variable instead. was getting long
2017-12-24 10:29:50 +01:00
iceman1001
fefac686e8
chg: adapting to new locations, and changes in makefile.
2017-12-24 10:28:46 +01:00
iceman1001
590fd15c3a
chg includes
2017-12-24 10:27:52 +01:00
iceman1001
ba17fe8130
chg: some iclass changes in the making.
2017-12-24 10:27:18 +01:00
iceman1001
a3ec7fd21f
chg: 'hf emv' changes from @merlokk EMV4 commit
2017-12-24 10:26:47 +01:00
iceman1001
1deb171573
add dummy.
2017-12-24 10:07:44 +01:00
iceman1001
ac4ef684e5
fix: cherry picked fix LF SNOOP not working.
...
https://github.com/Proxmark/proxmark3/pull/528
https://github.com/Proxmark/proxmark3/issues/514
2017-12-23 22:17:30 +01:00
iceman1001
77bc60bc52
remov function
2017-12-23 11:24:10 +01:00
iceman1001
18a828d2fd
chg: try to use native byteswapping functions when possible.
...
chg: bits_to_array new function
2017-12-23 09:51:20 +01:00
iceman1001
40dbb6b813
fix: one less block
2017-12-22 12:38:30 +01:00
iceman1001
6327b767fc
fix: 'hf 15 read' - the correct comparison helps out a lot.
2017-12-21 16:02:19 +01:00
iceman1001
c8f087eeb9
fix: 'hf 15 dump' the crc now calcs over the right number of bytes in order to be compared with the check
2017-12-21 15:44:23 +01:00
iceman1001
d894e36b95
chg: textual
2017-12-21 14:30:24 +01:00
iceman1001
231b0df578
CHG: 'hf iclass reader' - the select / which blocks to read / before saying it succeded was corrupt
2017-12-21 13:48:06 +01:00
iceman1001
3634327bef
chg: code cleaning.
2017-12-21 12:42:32 +01:00
iceman1001
70542749bf
chg: moving
2017-12-21 10:15:10 +01:00
iceman1001
b2a5c8e33c
chg: 'hf mf chk' - textual
2017-12-21 10:14:10 +01:00
iceman1001
5eafdbf872
ADD: 'hf iclass check' - increased speed in check keys with new algo.
...
ADD: 'hf iclass' - trying to add the timeout-limits for commands in order to get a more stable iclass communication
2017-12-21 10:13:40 +01:00
iceman1001
c2725bfa99
chg: enhanced rtrim for command prompt.
2017-12-21 10:08:07 +01:00
iceman1001
80722fe067
chg: detect_classic_prng should only report back true/false
...
chg: scripting.c got some code cleaning.
2017-12-18 15:43:45 +01:00
iceman1001
8ffe97c75b
chg: reseting values
2017-12-18 12:15:03 +01:00
iceman1001
bc639bc3ec
fix: adapting to run all strategies.
2017-12-18 12:14:02 +01:00
iceman1001
e6f0672015
chg: strange behavior when running checks with hardnested
2017-12-18 11:29:34 +01:00
iceman1001
7aaa335ab1
chg: 'hf iclass chk' - added option E to target elite keys. added option R to interpret dictionary file as raw (diversified keys) instead.
2017-12-16 19:13:10 +01:00
iceman1001
76fc2cbc2b
chg: 'hf iclass chk' - different output and break the twice-loop when found.
2017-12-15 15:37:00 +01:00
iceman1001
741bb1f485
add: 'hf iclass chk' - empty default keys file for iClass keys
2017-12-14 13:04:21 +01:00
iceman1001
c10d561947
chg: added some more keys from pastebin
2017-12-14 09:58:19 +01:00
iceman1001
982ece97c6
fix...
2017-12-13 20:02:56 +01:00
iceman1001
b734fe5e18
chg: textual, to fit in @uzlonewolf 's PR texts
2017-12-13 19:58:09 +01:00
iceman1001
79ed9c3887
fix: for netbsd ppl, executable dir could be null, (@khorben)
...
8e51b68e83
2017-12-13 19:38:07 +01:00
iceman1001
8d02f4aabc
fix: for netbsd ppl.. 6f4b0fce3a (@khorben )
2017-12-13 19:35:52 +01:00
iceman1001
51d1bb2aaa
chg: 'hf iclass chk' - unsigned long long.
2017-12-13 10:44:21 +01:00
iceman1001
c50c0e49d6
chg: 'hf iclass chk' - adjustments to output
2017-12-13 10:40:20 +01:00
iceman1001
0773e1a663
add: 'hf iclass chk' - iclass check keys functionality. uses input from a default_iclass_keys.dic
2017-12-13 10:18:38 +01:00
iceman1001
8526e74af8
chg: 'hf mf chk' - break on keypress.
...
chg: 'hf mf fchk' - break on keypress.
2017-12-13 10:17:30 +01:00
iceman1001
972fb2e167
chg: micro opt..
2017-12-12 22:08:55 +01:00
iceman1001
453831268a
chg: 'script run mifare_autopwn' - when used with -k parameter, exit after one run.
2017-12-12 20:07:02 +01:00
iceman1001
7f706e1466
chg: 'script run 14araw' - if empty args, show help
2017-12-12 20:06:20 +01:00
iceman1001
4781ee78e8
chg: extracted check-key-fast into its own.
...
chg: added fast check inside nested.
2017-12-12 20:05:36 +01:00
iceman1001
033bc12933
chg: 'hf mf fchk' - adapttions to depth first exits
2017-12-11 22:33:50 +01:00
iceman1001
dd024b5300
chg: 'hf mf fchk' - depth first search
2017-12-11 21:43:29 +01:00
iceman1001
da57e74140
CHG: 'hf mf fchk' - two strategys. depth first for sector 1, AB. and width first with all sectors.
...
first run strategy 1. then 2.
2017-12-11 01:44:55 +01:00
iceman1001
b0f84f1391
chg: 'hf mf nack' - trying a different output
2017-12-10 20:29:59 +01:00
iceman1001
f148d34bc3
chg: 'hf mf chk' - added param h for help
...
chg: 'hf mf fchk' - added param h for help
2017-12-10 09:44:49 +01:00
iceman1001
8fbea68295
fix: 'script run mifare_autopwn' - out of context,...
2017-12-10 09:25:26 +01:00
iceman1001
e5f2198653
FIX: scripting, faulty command vaule for darkside attack.
2017-12-10 09:18:16 +01:00
iceman1001
21d4c5a530
FIX: scripting, darkside attack used faulty value instead of MIFARE_AUTH_KEYA...
2017-12-10 09:15:22 +01:00
iceman1001
97137b80df
chg: 'script run mifare_autopwn' - forgot a lib
2017-12-10 09:07:35 +01:00
iceman1001
79494182cd
chg: 'script run mifare_autopwn' - added a option to use a key.
2017-12-10 09:05:30 +01:00
iceman1001
c0d1fdff75
chg: added default keys
2017-12-09 07:15:54 +01:00
iceman1001
732fe340cb
fix: 'hf search' - 14a detection was wrong. thanks @doegox for point it out.
2017-12-08 22:27:55 +01:00
iceman1001
44280abf62
chg: reverting back to more or less offical pm3 version.
2017-12-07 15:02:15 +01:00
iceman1001
e1a01dd2ff
CHG: uniformed output for failed key retrivals. Now denoted with -------
2017-12-06 23:56:07 +01:00
iceman1001
d34d42b0b8
textual
2017-12-06 21:58:08 +01:00
iceman1001
2bc60a87aa
CHG: 'hf mf chk' - adding default_key array refactoring (@merlokk)
2017-12-06 20:14:18 +01:00
iceman1001
8a69488582
fix: 'hf mf mifare - wrongly executed the parity-zero when not needed.
2017-12-06 19:53:41 +01:00
iceman1001
c6a7cbfc1e
fix: 'hf mf mifare' -1 bug...
...
fix: some better timeouts for prng detection (@merlokk)
2017-12-06 17:46:35 +01:00
iceman1001
1f637d726f
fix to darkside overdue. I needed to remove my old impl..
2017-12-06 17:15:24 +01:00
iceman1001
f59ee2ffeb
chg: textual
2017-12-06 01:20:31 +01:00
iceman1001
56dbf3ea15
chg: 'hf mf nack' - adjustments in return values..
...
add: 'hf 14a info -n' added new parameter, to enable test for nack bug.
2017-12-06 00:34:57 +01:00
iceman1001
01e1442bf8
chg: textual
2017-12-06 00:23:11 +01:00
iceman1001
e5f92935a1
chg: more adjustments
2017-12-06 00:17:49 +01:00
iceman1001
0c0e20eb06
chg: adjustments
2017-12-06 00:12:15 +01:00
iceman1001
2fffe96773
chg: added the append_Crc option
2017-12-05 23:41:04 +01:00
iceman1001
0a1a48df01
chg: 'hf mf nack' - extracted in into mifarehost for easier usage in other cmds like
...
'hf 14a info'
chg: 'hf mf nack' - changes on devices side from @doegox Thanks!
2017-12-05 23:34:52 +01:00
iceman1001
5f87b24493
chg:
2017-12-05 21:07:03 +01:00
iceman1001
c0f91ddd09
revert...
2017-12-05 18:42:57 +01:00
iceman1001
c8a9813261
fix: better avr512 detection (@pwpiwi) https://github.com/Proxmark/proxmark3/pull/507
2017-12-05 18:28:29 +01:00
iceman1001
a43f156370
chg: 'hf mf nack' - minor
2017-12-05 18:04:21 +01:00
iceman1001
6e5038f224
chg: 'hf mf nack' - only test all 256 parities for one nonce when synced.
...
0 nack = has not bug.
1 nack == has bug
x nacks == most likely a clone card which answers nack to all requests.
2017-12-05 17:57:44 +01:00
iceman1001
53d8668e00
ADD: 'hf emv' - more additions by (@merlokk)
2017-12-05 15:44:35 +01:00
iceman1001
08193fd2e5
chg: getting crazy out of sync when running against magic cards.
2017-12-05 12:30:40 +01:00
iceman1001
bea28ae654
chg: wrong var name
2017-12-05 11:54:38 +01:00
iceman1001
984a26370d
chg: 'hf mf nack' better output
2017-12-05 11:53:42 +01:00
Iceman
66e0e18a35
Update Makefile
...
Remove all subversionings like
7.1.1-3 becomes 7.1.1
2017-12-05 07:29:53 +01:00
iceman1001
7b01acd6cc
fix: ref to <ctype.h> for isxdigit()
2017-12-04 21:18:08 +01:00
iceman1001
614255fd75
revert...
...
something is wrong with includes and defines...
2017-12-04 20:35:51 +01:00
iceman1001
7044cf8fdf
chg: double defines..
2017-12-04 20:30:03 +01:00
iceman1001
e02e145fae
draft for a Mifare classic NACK bug detection.
...
the idea is to have a statistically solid conclusion if tag does or does not have the NACK bug.
-in short, ref https://github.com/iceman1001/proxmark3/issues/141
NACK bug; when a tag responds with a NACK to a 8 byte nonce exchange during authentication when the bytes are wrong but the parity bits are correct.
This is a strong oracle which is used in the darkside attack.
2017-12-04 19:36:26 +01:00
iceman1001
07bf77e155
fix: 'hf mfu restore' - printed too many bytes. 8 -> 4
2017-12-03 15:58:37 +01:00
iceman1001
c4b73c8737
chg: better debugging functions.
2017-12-03 15:24:24 +01:00
iceman1001
73a5e3b23d
chg: 'hf mfu eload' - instead of showing a error, it now tells a warning that we only loaded N blocks of data to emulator memory.
...
It always loads the existing blocks into emulator memory.
The previous message made users belive a error had occured when it actually did load.
2017-12-03 15:23:24 +01:00
iceman1001
b89b3399dc
FIX: if receiving array isnt large enough, previously this will smash the stack..
2017-12-02 20:45:53 +01:00
iceman1001
bb916aa999
fix: removed a warning
2017-12-02 19:07:10 +01:00
iceman1001
3b4b7812bf
fix: removed a warning,
2017-12-02 19:01:43 +01:00
iceman1001
d54bb4ddf4
chg: skip if not debug
2017-12-02 18:59:47 +01:00
iceman1001
eb0c0c364c
CHG: EMV changes. https://github.com/Proxmark/proxmark3/pull/493 [@merlokk)
2017-12-02 18:58:33 +01:00
iceman1001
6e144e0121
chg: removed line
2017-11-29 07:19:51 +01:00
iceman1001
2a120ec2e0
fix: no copy the crc
2017-11-29 07:18:43 +01:00
iceman1001
53452ab857
fix: 'hf mfu info' - rfu should n't print pack.
...
fix: 'hf mfu info' - wrong pointer to cli authenticationkey
2017-11-28 21:23:58 +01:00
iceman1001
bed2ff2dba
fix: wrong place.. key got overwritten..
2017-11-28 20:36:29 +01:00
iceman1001
bc9b2af87e
ADD: NTAG213F,NTAG216F specific information in configuration blocks.
...
ADD: insert pwd/pack if specified from cli.
2017-11-28 20:03:46 +01:00
iceman1001
5f58dcfa52
fix: 'hf mfu dump' - wrong.
2017-11-28 09:25:36 +01:00
iceman1001
1299a0b31d
CHG: increased timeout for printing the warning messages. It interupts all loops that already takes this in consideration.
2017-11-28 08:30:25 +01:00
iceman1001
6fa8740abd
fix: 'hf mfu info' - select before testing a new pwdgen.
...
fix: 'hf mfu info' - break after found pwd
2017-11-27 20:04:54 +01:00
iceman1001
b99d759231
fix: compare not assign
2017-11-27 09:23:21 +01:00
iceman1001
f46546c5a9
ADD: 'hf mfu info' - tag identification should now identify NTAG213_F , NTAG216_F (thanks for info @jackfagner)
2017-11-27 09:21:55 +01:00
iceman1001
428e54bb6b
CHG: 'hf mfu' gettype identification, now deals with NTAG213, GetVersion = subtype 04,
2017-11-26 19:16:12 +01:00
iceman1001
1ebf4afd73
CHG: 'hf mfu info' - now also tests for pwdgen algo D.
2017-11-26 16:52:20 +01:00
iceman1001
b5010ddfe8
fix: signed / unsigned errors.
2017-11-26 07:29:05 +01:00
iceman1001
9b573e06a4
ADD: hooking up 'pwdgen algo D' for lua-scripting
2017-11-26 07:08:27 +01:00
iceman1001
0815f19389
ADD: new pwdgen algo, (thanks @jackfagner) who did a great job figuring it out. Read his blog.
...
ref. https://github.com/jackfagner/NfcKey/blob/master/NfcKeyC.c
2017-11-25 08:48:36 +01:00
iceman1001
9959d5c1e7
chg: emv commands should now compile. no testing done.
2017-11-25 08:18:30 +01:00
iceman1001
647411d10d
chg: pointing to new emv cmds. (@merlokk)
2017-11-25 08:06:43 +01:00
iceman1001
4721e7e8a0
add: new found pwd. {@gentilkiwi)
2017-11-25 08:05:15 +01:00
iceman1001
e8e3256f7e
add: compilation order
2017-11-25 08:03:53 +01:00
iceman1001
fa98197961
chg: added some updated string functions (@merlokk)
2017-11-25 08:02:51 +01:00
iceman1001
81ccfa734e
add: 'script run brutesim' - new script to show simple bruteforce by incrementing cardnumber against different readers. Both LF & HF. @kenzycarey
...
(adjusted to fit into same script structure like the rest in iceman fork)
2017-11-25 07:58:56 +01:00
iceman1001
5f695999d2
add: emv - new files from pm3 offical
2017-11-25 03:29:26 +01:00
iceman1001
13ffd7bf97
add: emv changes from pm3 offical.
2017-11-25 03:28:02 +01:00
iceman1001
2f3dbbcaa3
rename: ul_switch_off_field -> DropField (inside cmdhf14a.c)
...
chg: Fix memory bounds error (@wsmoses)
c3511781a1
2017-11-11 23:23:01 +01:00
iceman1001
02af3b9e1d
CHG: (@pwpiwi) d940ebfbad
2017-11-10 23:24:05 +01:00
iceman1001
25b173ea20
chg: 'hf 14a reader' - @pwpiwi 7c8115b273
2017-11-10 22:55:33 +01:00
iceman1001
0d149dd949
FIX: buffer overflow. array too short
2017-11-10 21:20:54 +01:00
iceman1001
9b4e52b89e
CHG: dropfield
2017-11-10 20:49:56 +01:00
iceman1001
8b83db2c1b
ADD: 'hf 14a apdu' @merlokk
2017-11-10 20:47:31 +01:00
iceman1001
a3e923c529
add: emv
2017-11-10 20:09:22 +01:00
iceman1001
23506bd1d7
add: first part emv @merlokk
2017-11-10 20:08:28 +01:00
iceman1001
30ceea4aea
chg: cleaning up some function calls.
...
fix: check to see clock is bigger than zero.
2017-11-09 19:15:56 +01:00
iceman1001
3b91a33eec
fix: assume graphbuffer data only
2017-11-06 15:45:23 +01:00
iceman1001
dd0b11c0ef
fix: ..its not noise ...
...
fix: only assume Graphbuffer values 128 -> -127 ...
2017-11-06 15:43:15 +01:00
iceman1001
e3ac1c586f
chg: noise detection
2017-11-06 15:32:46 +01:00
iceman1001
31be64824e
syntax sugar
2017-11-06 15:28:03 +01:00
iceman1001
423de2ba44
CHG: removed unused function
2017-11-06 15:08:36 +01:00
iceman1001
881c7115a7
CHG: centralized the LF signal properties LOW/HIGH/MEAN/AMPLITUDE/ISNOISE into one struct.
...
CHG: 'data raw ar' - didn't take in consideration the command line parameter CLOCK.
2017-11-06 15:06:42 +01:00
iceman1001
d89fb5ab39
chg: helptext
2017-11-05 18:33:10 +01:00
iceman1001
de5b06c3d3
rem: outdated script
2017-11-05 17:44:41 +01:00
iceman1001
3b1c01cd13
CHG: 'lf search' - hitag/cotag wrong return values
...
CHG: is_justnoise - safety checks
CHG: 'hitag reader' - debug printing
2017-10-30 22:20:08 +01:00
iceman1001
54e8a0ae2b
change demod printing
2017-10-30 20:33:11 +01:00
iceman1001
9632d91240
FIX: absolute value when comparing against threhold
2017-10-30 20:03:36 +01:00
iceman1001
db56ca11a3
FIX: detect noise signal by measuring amplitude of signal.
2017-10-30 19:18:30 +01:00
iceman1001
6f948be842
CHG: some average / mean functions to enhance justNoise functions.
...
FIX: 'lf t55xx' - verifying that collected signal is not just noise..
2017-10-30 16:44:04 +01:00
iceman1001
d5a1e4c7d4
fix: 'em' - return negative to a bool is not ok
2017-10-30 16:19:15 +01:00
iceman1001
d1566728e2
more fflushes.
2017-10-30 15:10:32 +01:00
iceman1001
92858d39d4
fix: flushing some output..
2017-10-30 15:08:20 +01:00
iceman1001
6b78a8711d
ADD 'hf 14a info' : new command (old reader command) (@merlokk)
...
This enables use ut get a 14a reader function, if you want to do all other tests, go for this new command.
2017-10-30 12:29:02 +01:00
iceman1001
ee1612870c
CHG: 'info' unified helptext.
...
ADD: 'hf 14a info' - skeleton function
2017-10-30 12:17:32 +01:00
iceman1001
fdf1566c23
FIX: 'hf 14a reader' - detection of magic refactored, all test now assumes turn on/off readerfield.
2017-10-30 12:01:34 +01:00
iceman1001
59fbf1e354
chg: don't blindly trust other ppls changes
2017-10-29 20:07:45 +01:00
iceman1001
b5842e8c1b
fix: usb_cdc don't report that pm3 device is selfpowered.. (since its not by default)
2017-10-29 19:28:23 +01:00
iceman1001
76e139701a
chg: @merlokk 's minor adjustment to waitCmd
2017-10-29 19:26:34 +01:00
iceman1001
f6d2d508b4
rem: removed old references to google code.
2017-10-29 19:25:34 +01:00
iceman1001
994248265d
FIX: changing the result booleran when sending over serial.
2017-10-29 19:22:03 +01:00
iceman1001
74842edf1d
CHG: flush stdout, https://github.com/Proxmark/proxmark3/pull/443 (@doegox)
2017-10-24 14:27:02 +02:00
iceman1001
666284b130
chg: matching versionnumber...
2017-10-23 23:31:20 +02:00
iceman1001
6a4a084843
chg: remove redudant key (@cjbrigato)
2017-10-23 21:29:20 +02:00
iceman1001
e1ff9e66ab
chg: another one key
2017-10-23 21:17:31 +02:00
iceman1001
e312115844
rem: duplicate key.
2017-10-23 14:12:04 +02:00
iceman1001
e39907690f
CHG: more known keys
2017-10-23 14:08:19 +02:00
iceman1001
14cf93f523
chg:... banner.. not showing.. I should rethink sundaymornings coding sessions
2017-10-22 11:27:22 +02:00
iceman1001
dbb392c212
chg: ...NOT showing banner.. before it was enforcing it :)
2017-10-22 11:07:37 +02:00
iceman1001
2aa17c0ddc
chg: not showing banner when executing direct from shell
2017-10-22 11:05:25 +02:00
iceman1001
d2dd6eed6a
UPD: pm3_mfdread.py - updates from original repo (@zhovner) 96d0ac184a
2017-10-22 10:25:14 +02:00
iceman1001
d15cf5ff2f
CHG: pip:ing, command, lua, from CLI has less output.
2017-10-21 15:01:23 +02:00
iceman1001
dc23a6d5ce
chg: commandline mode execution now has less output
2017-10-21 14:50:29 +02:00
iceman1001
80573aa7f6
fix: 'proxmark3.exe -c zzzzz' command from cli didnt work
2017-10-21 14:24:23 +02:00
iceman1001
5da60668dc
chg: Serialnumber is shorter. Will be better for OSX ppl
2017-10-21 13:07:07 +02:00
iceman1001
1fd6d95729
chg: remove a warning 'extern'
2017-10-21 13:00:36 +02:00
iceman1001
b27a9920b1
ADD: https://github.com/Proxmark/proxmark3/pull/417 (@merlokk)
...
CHG: https://github.com/Proxmark/proxmark3/pull/434 (@pwpiwi)
2017-10-20 20:39:57 +02:00
iceman1001
4b63f940f1
CHG: FeliCa implemenation by @satsuoni
2017-10-20 20:27:44 +02:00
iceman1001
cdaef14759
fix: forgot param
2017-10-20 18:24:04 +02:00
iceman1001
2cf3a0adb7
chg: helptext
2017-10-20 18:00:58 +02:00
iceman1001
d350bfb561
fix: broken function
2017-10-20 18:00:13 +02:00
iceman1001
d77e8233c0
fix: pr #435 (@tisf) OSX has issues with liblua.
2017-10-20 17:53:49 +02:00
iceman1001
53333f22c8
fix: hw status (and USB comm in general) PR #434 : (@pwpiwi)
2017-10-20 16:32:42 +02:00
iceman1001
79dd43dbd2
ADD: string functions (@merlokk)
2017-10-20 14:39:42 +02:00
iceman1001
e574e89553
syntax sugar
2017-10-20 14:38:50 +02:00
iceman1001
31191382fc
CHG: adapt to be similar as other cmd*.c files
2017-10-20 14:37:50 +02:00
iceman1001
b99b2dd30f
FIX: stderr -> stdout
2017-10-19 13:41:55 +02:00
iceman1001
6f05fdfc88
CHG: fpga_comress sending no-error messages to stderr (@merlokk)
...
36b1cdd1b4
2017-10-19 13:28:58 +02:00
iceman1001
16028f7d33
CHG: appmain now calls cmd_recieve as it should
...
CHG: flasher - removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client, wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes. usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
2017-10-17 20:58:17 +02:00
iceman1001
d3654ab41c
chg: some debug
2017-10-12 15:20:41 +02:00
iceman1001
08c65427bc
fix: 'hf mf fchk' - wrong number of params to printf
2017-10-11 13:24:54 +02:00
iceman1001
f04723d3f5
fix: 'hf mf fchk' - some strange output when only using the default keys (no dictionary file)
...
fix: 'hf mf fchk' - helptext corrected
fix: 'hf mf fchk' - allow to call with just 1 argument
2017-10-11 13:20:39 +02:00
iceman1001
7f544803e7
CHG: shorter sleep from 1000 -> 500
2017-10-10 15:00:37 +02:00
iceman1001
8136decadd
ADD: hooking up the new felica commands
2017-10-10 14:59:58 +02:00
iceman1001
9757a8f078
ADD: some felica defines
2017-10-10 14:33:27 +02:00
iceman1001
19c2e89ba6
ADD: 'hf felica' - New subgroup of HF commands is started. Not finished yet, but its a step.
2017-10-10 14:24:14 +02:00
iceman1001
28c3aa61ce
fix: fpga_compress : now handles more than two files (@satsuoni)
2017-10-08 15:01:55 +02:00
iceman1001
feea1a45d9
FIX: 'script run legic_clone' - correct getoptions pattern
2017-10-05 17:34:33 +02:00
iceman1001
5eb6836587
fix: 'script run 14araw' - correct getoptions pattern.
2017-10-05 17:32:20 +02:00
iceman1001
9701643fdd
CHG: NO_RATS adjustments to luascripts.
2017-10-05 16:17:09 +02:00
iceman1001
2ca0ea8cb4
ADD: 'hf mf fastchk' - new command, improved check keys functionality. It uses a bunch of techniques to get a speedup.
...
Using a dictionary file with 421keys,
Current implementation of checkkeys takes 300 sec.
This implementation of checkkeys takes 250 sec.
I implemented it as a separate command so it will be easier to compare between the old and new checkkeys.
Its also doing much on deviceside, which is a step to much funnier standalone modes :))
2017-10-05 16:00:56 +02:00
iceman1001
a4b4a1a9a2
FIX: iso-14443a RATS optional (piwi)
2017-10-01 22:06:06 +02:00
iceman1001
8dbc84dd07
syntax sugar
2017-09-28 22:37:25 +02:00
iceman1001
20465e17b3
CHG: removing some doubles
2017-09-28 22:36:45 +02:00
iceman1001
7607da55f7
FIX: unify all calls..
2017-09-28 22:33:55 +02:00
iceman1001
a68887ce2d
FIX : #402 https://github.com/Proxmark/proxmark3/pull/402 (piwi)
2017-09-28 22:31:20 +02:00
iceman1001
08bf63c748
fix: double free shouldn't happen now
2017-09-26 22:22:23 +02:00
iceman1001
c567aecb2e
CHG: 'hf list' - now gets a timeout instead of stalling if device doesnt answer..
2017-09-26 17:16:24 +02:00
iceman1001
b18920b9f9
CHG: enables proxmark3 client to reconnect to serial port without exiting / restarting.
2017-09-26 17:04:25 +02:00
iceman1001
f054f5da32
CHG: gcc7 warnings accoring to PR#401 https://github.com/Proxmark/proxmark3/pull/401/files
2017-09-26 17:02:18 +02:00
iceman1001
b746a114ec
fix: clock_gettime for Apple OSX (piwi) https://github.com/Proxmark/proxmark3/pull/393
2017-09-20 10:31:19 +02:00
iceman1001
14550557be
CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation.
...
* client/Makefile
* common/Makefile.common
2017-09-18 22:33:22 +02:00
iceman1001
28f1f23d48
chg: easy printing of MAKE variables
...
Usage::
make print-FLASHTOOL
cd bootrom; make print-APP_CFLAGS
cd client; make print-GCC_VERSION
2017-09-18 18:59:51 +02:00
iceman1001
dd870ece28
fix: 'hf iclass sim 4' array out-of-bounds write.
...
chg: 'hf iclass loclass' nice output
2017-09-18 15:31:53 +02:00
iceman1001
5f2589f6cc
chg: (piwi)
2017-09-17 19:34:46 +02:00
iceman1001
a091feb5ee
upd: added more key
2017-09-15 17:14:02 +02:00
iceman1001
55a1ef1549
ADD: case insensitive commands :) finally, you can write LF SEARCH ...
2017-09-15 14:45:26 +02:00
iceman1001
4e7c987cbd
chg: 'hf iclass sim' not save when no mac-responses was collected.
2017-09-14 13:05:46 +02:00
iceman1001
c9294076e3
chg: some found keys on forum.
2017-09-14 11:14:52 +02:00
iceman1001
b439c76c6e
CHG: changed name on define. Its now called CMD_UPLOAD_SIM_SAMPLES_125K .. Since we upload to device.
2017-09-14 11:13:10 +02:00
iceman1001
9c9daae30f
chg: swapped return value to bool
2017-09-14 11:08:24 +02:00
iceman1001
0c2c6f3fd7
CHG: 'hf mfdes info' : Now checks for 7b uid's. This will remove some faulty claims of tagidentifications.
2017-09-14 11:06:49 +02:00
iceman1001
179748a5df
add: Fix detection of AVX512 support for Apple clang compiler #392 (piwi)
...
de1e68d34b
2017-09-12 21:45:37 +02:00
iceman1001
98bc685632
add: 'hf iclass sim 4' - new mode, to adapt sim 2 to readers in keyroll mode.
2017-09-12 08:45:38 +02:00
iceman1001
45d46ab0d5
fix: 'hf iclass sim 2' - last CSN didn't seem to work. replaced it with two new ones.
2017-09-07 16:14:33 +02:00
iceman1001
6d98779ff8
chg: 'hf 15 read' - nice output and with lock info
...
chg: 'hf 15 readmulti' - nicer output and with lock info
You can still break the client if you ask to read too many blocks at one time.
I suggest 'hf 15 dump' instead for that purpose
2017-09-06 22:04:00 +02:00
iceman1001
6542633c0e
chg: 'hf 15 write' wrong helptext :)
2017-09-06 12:58:32 +02:00
iceman1001
a130b58c82
add: 'hf 15 dump' added save data to file. It saves two files (EML/BIN)
2017-09-06 12:55:21 +02:00
iceman1001
f4d703edf0
chg: monero
2017-09-05 15:25:35 +02:00
iceman1001
1c5d040ceb
chg: 'hf 15 findafi' - informativ message
2017-09-05 10:34:31 +02:00
iceman1001
2c1e2a9f3a
CHG: 'hf 15 findafi' - added the possibility to cancel loop with buttonpress
2017-09-05 10:31:27 +02:00
iceman1001
b526492d3d
fix: 'hf 15 dump' memset bug
2017-09-05 09:53:20 +02:00
iceman1001
9d0ce1e874
chg: 'hf 15 reader' minor output changes
...
chg: 'hf 15 info' minor output changes
2017-09-05 08:25:23 +02:00
iceman1001
59af999763
chg: 'hf 15 info' - this fixes some of the bugs. For instance, get_systeminfo responses doesn't have a CRC. No need to verify crc :)
...
Also if prepare command fails, not finding uid, don't continue...
2017-09-05 00:25:53 +02:00
iceman1001
3e6bf31d13
CHG: got tired of the sub command line 'hf 15 cmd', so I moved them and change names on those most confusing commands. Also added some helptext changes. This will make the commands seem "similar" to the other HF commands like : 14a/14b/iClass/legic
...
renamed commands:
'hf 15 read' -> 'hf 15 samples : it also downloads the collected samples direct. So you can try 'hf 15 demod' afterwards to see if you can demodulate the signal.
'hf 15 dumpmem' -> 'hf 15 dump' : wil also need a save to file option
'hf 15 cmd sysinfo' -> 'hf 15 info' : yep, shorter and not working at the moment. breaks when tag doesn't respond to 0x2B.
'hf 15 cmd raw' -> 'hf 15 raw'
'hf 15 cmd raw' -> 'hf 15 raw'
new commands
'hf 15 list' : just a shortcut to print the tracelog
'hf 15 restore' : the idea is to read a file and restore the blocks back to a tag. *to be implemented*
2017-09-04 23:45:35 +02:00
iceman1001
26e6e269d1
chg: 'script run 14araw' got some local functions now
2017-09-04 22:49:33 +02:00
iceman1001
85b1c6bdfb
add: 'hf 15 list' is now possible, since I like to be able to call both "hf list 15" and "hf 15 list"...
...
chg: 'hf list 15' better annotations, the flags doens't define the command anymore
chg: device side, iso15, experimenting with different settings.
The tag still doesn't answer to 0x002B not 0x202B---uid--- commands.
2017-09-04 22:48:35 +02:00
iceman1001
508fa76915
ADD: 'hf list 15' - added annotation for ISO15693
2017-09-04 18:38:57 +02:00
iceman1001
ec07e2e006
FIX: 'hf 15 *' commands - the demod should work better now and as a bonus I've added some tracelogging. The timer is not quite correct yet but its a start.
...
sample:
hf 15 reader
hf list raw
2017-09-04 13:56:57 +02:00
iceman1001
c0948b5d7b
chg: 'hf 15 *' first rehaul of the iso15693 commands. Call it a refactor, Started adding helptext, 'h' parameter, usage of sprint_hex
...
chg: cmdhf15.h - extern keyword in headerfile
2017-09-01 20:34:17 +02:00
iceman1001
c75ce57dfd
chg: added clearCommandBuffer();
2017-08-31 15:16:12 +02:00
iceman1001
11e72b4064
add 'hf mf decrypt' - added a helptext
...
chg 'hf mf decrypt' - increased the available input data array.
2017-08-30 19:13:49 +02:00
iceman1001
0c6f601f72
chg: updated the reveng 1.4.4 -> 1.5.2
...
'reveng -g 11223344' still breaks.
2017-08-29 18:05:56 +02:00
iceman1001
c5616dfe76
minor corrections..
2017-08-29 15:47:26 +02:00
iceman1001
9f54a5e4b9
fix 'hf 14a read' needs a disconnect if failed.
...
fix 'hf mf csave' now prints which card size it is trying to dump
2017-08-29 14:47:17 +02:00
iceman1001
1737081a5d
fix 'hf mf csave' the 'i' parameter is renamed to 'o', since its a output filename..
...
fix 'hf mf csave' the 'i' parameter would take the whole inputed command string as filename.. it now correctly takes the string after 'o '...
2017-08-29 14:40:34 +02:00
iceman1001
f10cc4a3ae
FIX: 'hf 14a reader' - set timeout for waiting on response for inital call. This will enable the command not to get "stuck"
2017-08-29 14:37:09 +02:00
iceman1001
a971c03877
chg: the version text layout
2017-08-29 08:46:26 +02:00
iceman1001
0fdb3feb19
minor textual chg
2017-08-28 22:31:30 +02:00
iceman1001
7484a0dd1e
fix: 'hf mf cgetsc' - a missing array and some new output layout.
2017-08-28 21:25:29 +02:00
iceman1001
6bae0b8590
chg: 'script run formatMifare' - added the 'x' parameter. when using this parameter, the generated commands will also be EXECUTED against your card. This will wipe your card.
2017-08-28 17:35:50 +02:00
iceman1001
fdd4186aa0
chg: 'hf mf cload/csave' - same output with regards to blocks as eload/esave
2017-08-28 17:22:29 +02:00
iceman1001
d8c72242a2
chg: some more fflush...
2017-08-28 17:18:54 +02:00
iceman1001
97452c056c
chg... and fflushing stdout...
2017-08-28 17:13:48 +02:00
iceman1001
0d3208eb95
fix: 'hf mf cload' - the newline chars \d\a was forgotten. buf too small.
...
chg: 'hf mf cload/csave/eload/esave' - ui feedback...
2017-08-28 17:10:23 +02:00
iceman1001
bd71e15289
fix: 'hf mf cload' - too small buffer, needs one more byte for the NULL-terminator
2017-08-28 09:39:20 +02:00
iceman1001
292a4ca602
'hf 14b sniff' - removed stuff which wasn't very useful. cleaner now. Not sure if it works :(
...
'hf iclass sniff' - playing with this one. Don't expect it to work yet :(
- increase dma_buffer_size to 256
- moved initialization to a own function. Just looks cleaner :)
- change the debug output to follow MF_DBGLEVEL
'hf mf sniff' - unnecessary cast removed
2017-08-27 19:41:24 +02:00
iceman1001
3764b02a2e
FIX: when running on ssh, client would fail. see https://github.com/Proxmark/proxmark3/pull/387 (thanks @uzlonewolf)
2017-08-27 08:50:55 +02:00
iceman1001
80d2a01ea6
fix: 'hf mf nested' - got an initialized bug from the monster merge
2017-08-27 00:37:11 +02:00
iceman1001
9e3cfdc4f5
chg: 'lf indala' demod fixes, https://github.com/Proxmark/proxmark3/pull/385 (@marshmellow42)
2017-08-26 13:51:49 +02:00
iceman1001
163510ca55
# is not //....
2017-08-26 13:20:15 +02:00
iceman1001
cd59616e24
banner for linux ppl.
2017-08-26 13:18:34 +02:00
iceman1001
fda4a25f51
and some more adjustments..
2017-08-26 12:59:10 +02:00
iceman1001
94f70caa7a
when you need to add too much changes at the same time...
...
fix: 'hf mf hardnested' test cases doesn't need to verify key.
add: 'hf mf ' - collect nonces from classic tag.
chg: switch_off on armside, a more unified way, so we don't forget to turn of the antenna ...
chg: renamed 'hf iclass snoop' into 'hf iclass sniff' in an attempt to make all sniff/snoop commands only SNIFF
chg: 'standalone' -> starting the work of moving all standalone mods into a plugin kind of style, in its own folder.
2017-08-26 12:57:18 +02:00
iceman1001
26f786bfe4
chg: removed some warnings in ubuntu17.04
2017-08-25 20:28:16 +02:00
iceman1001
dc202ee498
FIX: fixes some off missing chars, now the @GCC_GTEQ_490 contains a 1 or 0.
...
ADD: makefile, print-%, added an easy way to output Makefile variables, you call make with the var you want to print like this:: make print-GCC_GTEQ_490
2017-08-23 08:12:07 +02:00
iceman1001
2c198f75f5
FIX: gcc version | gcc -dumpversion only exists on later gcc versions. This fix address this problem by using gcc -version instead. Thanks to @winguru
...
https://github.com/iceman1001/proxmark3/issues/123
2017-08-23 07:37:49 +02:00
iceman1001
33a994aa3f
syntax sugar
2017-08-19 16:14:30 +02:00
iceman1001
d13bbcd466
chg: 'hf iclass sim 2' - added a new set of CSNS.
2017-08-19 16:13:36 +02:00
iceman1001
19439605d3
chg: 'hf iclass loclass' output newline.
2017-08-19 09:52:17 +02:00
iceman1001
823a814cf6
FIX: some possible null - ref bugs in 'iclass' , 'iso15693' deviceside.
...
FIX: 0 is not a reference.
FIX: iso15693 - wait wasn't implemented
chg: 'hf 15' getTagInfo_15 renamned.
chg: 'hf iclass loclass' some output got newline
2017-08-19 09:49:41 +02:00
iceman1001
db515ba6c4
chg: 'hf iclass sim' - turning of antenna after simulation is done.
...
chg: 'hf iclass sim' - use @holiman 's 8 csn instead of the original @carl55 (15), and a new first entry csn, to see if the old one got blacklisted.
2017-08-18 10:23:46 +02:00
iceman1001
1d6b0c0c6a
fix: compilation error on nethunter (piwi)
2017-08-16 14:15:16 +02:00
iceman1001
2b58d4fd34
updated commments
2017-08-15 23:09:39 +02:00
iceman1001
fec33d7d74
CHG: 'script run calc_di' - added the possibilty to write to binary file :)
...
CHG: 'script run calc_mizip' - added the possibilty to write to binary file :)
2017-08-15 22:01:44 +02:00
iceman1001
926277507a
chg: added the possibility to read tag.uid
2017-08-15 21:23:55 +02:00
iceman1001
b3d0bf697a
some output
2017-08-15 15:12:56 +02:00
iceman1001
c37d2d84c7
another helper
2017-08-15 15:11:57 +02:00
iceman1001
69c8970201
FIX: https://github.com/iceman1001/proxmark3/issues/122
...
this should fix the ~ (tilde) bug I introduced...
In lua, you need to evaluate false ie; statement == false, not like in C-style ~statement
2017-08-13 15:06:30 +02:00
iceman1001
eae8c2f7be
chg: unify debug messages for FSK demod in AWID,HID,IO,PARADOX,PYRAMID, all neat and same.
2017-08-11 20:48:54 +02:00
iceman1001
dc0e0aa93f
syntax sugar
2017-08-11 18:15:01 +02:00
iceman1001
1b4b753d98
scraped some more keys out on GH
2017-08-11 18:14:31 +02:00
iceman1001
b4d7ed4862
chg: 'lf awid brute' - added verbose logging option
...
chg: 'lf hid brute' - added verbose logging option
2017-08-11 18:13:58 +02:00
iceman1001
6ad546fa13
chg: removed extern on print_lock mutex. Since there is two of these, in proxmark3.c and ui.c
2017-08-11 11:40:25 +02:00
iceman1001
734ca940e9
fix: unified lf clone printouts of blocks.
2017-08-11 11:38:54 +02:00
iceman1001
bd4d1ec74e
Fixes: lf simpsk - make sure Carrier input is ok.
...
fix: 'lf awid sim' - Clk param is used CorreCt
fix: 'lf HID sim' - unified way logging
fix: 'lf indala sim' - adding a draft simulation Command
fix: 'lf io sim' - unified way logging
fix: 'lf nedap sim' - getting bits is wrong still..
fix: 'lf paradox sim' - Helptext
lfdemod.C got some reworked loops, still some debug messages to be ...
2017-08-10 14:19:57 +02:00
iceman1001
78f01b0ffa
ADD: 'lf paradox sim' - started with sim command
2017-08-09 21:00:03 +02:00
iceman1001
117003bdb2
fix. 'lf io demod' - removed stange size check.
...
fix: 'lf io sim' - now uses the clock variable correct
fix: 'lf io clone' - Q5 now has correct clock 64 instead of 50
2017-08-09 20:59:16 +02:00
iceman1001
7b050e9afe
FIX: 'lf gprox sim' - now correctly simulates gProx
2017-08-09 19:59:03 +02:00
iceman1001
a4dd4eb5b5
CHG: updated some helptext, moved commands
2017-08-09 18:52:35 +02:00
iceman1001
3384999c83
CHG: some help text edited and rearrange the commands to be in the same order
2017-08-09 18:33:30 +02:00
iceman1001
aa711b2d92
chg: 'hf 14a cuids' - now can be interrupted with keyboard press
2017-08-09 09:26:41 +02:00
iceman1001
507b74da15
CHG: added some more keys (thanks @ntk)
2017-08-09 09:25:36 +02:00
iceman1001
c583570a3d
minor styleish
2017-08-06 16:31:01 +02:00
iceman1001
69b7c149e3
CHG: 'usb communication' voliatile boolean variable to signal between threads isn' threadsafe. Test to switch to the c11 builtin atomic
2017-08-01 09:21:06 +02:00
iceman1001
3911c0a13e
Some debugstatements
2017-07-31 20:45:16 +02:00
iceman1001
0a58e8f0fe
CHG: macro T5555_SET_BITRATE is used for clearity
2017-07-31 16:05:33 +02:00
iceman1001
3c2fa8d4f3
chg: better text
2017-07-31 15:58:14 +02:00
iceman1001
6df9012de5
chg: 'script run mifare_autopwn' added the prng_test, to make sure it only attacks weak cards.
2017-07-31 15:53:26 +02:00
iceman1001
d5153b2446
warnings on ubuntu
2017-07-31 15:46:22 +02:00
iceman1001
ef136096a3
fix: darkside also take blockno / keytype arguments. Think that block 0 might be lock in the access rights.
2017-07-31 15:45:01 +02:00
iceman1001
b31fd98055
CHG: correct texts, changes to local functions
2017-07-31 15:26:53 +02:00
iceman1001
e598aec890
lf t55xx commands works again. Need to find a better sprinf_bin_break function
2017-07-31 15:12:38 +02:00
iceman1001
2a4685312a
chg: (merlokk) debugstatements
2017-07-31 13:50:55 +02:00
iceman1001
83cd6a7761
CHG: 'hf mf nested' - (merlokk) 76fcccd109
...
CHG: 'hf mf hardnested' added same verification also here.
2017-07-31 13:37:41 +02:00
iceman1001
0acc606be3
lf search is working :)
2017-07-31 12:31:39 +02:00
iceman1001
1bf452e842
FIX: 'lf search' should work now again.
2017-07-31 11:46:35 +02:00
iceman1001
91898babc0
FIX: data plot AutoCorrelate slider, window too big, now limited to number of samples.
...
enhanced debugstatements,
'lf em 410x_demod' vs 'lf em 410x_read' now read does the same as all other LF, and demod too...
2017-07-30 21:21:02 +02:00
iceman1001
0e31ed346a
minor adjustments..
2017-07-30 11:15:48 +02:00
iceman1001
19a2c05de0
FIX: ubuntu complains about sleep...
2017-07-30 09:30:42 +02:00
iceman1001
e449e2ba88
fix: QT complains about non-static data member initializers
2017-07-30 09:26:31 +02:00
iceman1001
f28da2da6e
monster merge...
...
all those changes marshmellow did.. and more...
2017-07-30 09:17:48 +02:00
iceman1001
02983ae6ee
fix: awk script now correctly takes the substring on both mingw and ubuntu
2017-07-28 10:31:24 +02:00
iceman1001
9ca75c1cfd
disable some debug output
2017-07-28 03:00:28 +02:00
iceman1001
830796cbef
chg: the lualib file mf_default_keys.lua is now automatically created with "make clean && make all".
2017-07-28 02:45:58 +02:00
iceman1001
30b70bb388
adjusted to remove the usb_cmd.lua..
2017-07-28 02:05:03 +02:00
iceman1001
e5b8235fc9
needed to be removed...
2017-07-28 02:01:14 +02:00
iceman1001
b038bd6142
another time.t
2017-07-28 01:47:21 +02:00
iceman1001
c96ccd9a03
more time_t issues
2017-07-28 01:42:40 +02:00
iceman1001
83adc96d81
some missing include inttypes..
2017-07-28 01:37:55 +02:00
iceman1001
3d53f941aa
some time_t issues
2017-07-28 01:35:49 +02:00
iceman1001
80e9798165
remove the old uart file
2017-07-28 01:08:12 +02:00
iceman1001
c91b945651
and another missing include
2017-07-28 00:53:57 +02:00
iceman1001
bee9e986f1
..and the AskEdgeDetect
2017-07-28 00:50:27 +02:00
iceman1001
86237b629f
some more adjustments
2017-07-27 23:00:49 +02:00
iceman1001
998d752bd5
more directionalThreshold...
2017-07-27 22:17:16 +02:00
iceman1001
16b494fa71
only mingw has this problem..
2017-07-27 22:10:12 +02:00
iceman1001
a797314dab
more adaptations
2017-07-27 22:05:54 +02:00
iceman1001
76e3ee838d
some QT problems..
2017-07-27 21:42:22 +02:00
iceman1001
33503112c1
more autocorrelate..
2017-07-27 21:40:43 +02:00
iceman1001
c6f5b0fb92
missing some inttypes...
2017-07-27 21:38:41 +02:00
iceman1001
f1544dc4bf
the AutoCorrelate...
2017-07-27 21:36:49 +02:00
iceman1001
4431e418f8
more dummies...
2017-07-27 21:33:16 +02:00
iceman1001
6ca92fa4ed
and the QT part of monstermerge..
2017-07-27 21:32:15 +02:00
iceman1001
70b58e46b1
sleep in the makefile ,
2017-07-27 21:23:58 +02:00
iceman1001
234acf74ff
forgot the sleep...
2017-07-27 21:22:05 +02:00
iceman1001
5222785d69
some dummy files in order to keep folder structure ok when compiling..
...
removed some comments
2017-07-27 21:19:39 +02:00
iceman1001
475a19b937
part of monstermerge.
2017-07-27 20:59:54 +02:00
iceman1001
a8569849d6
part of monstermerge..
2017-07-27 20:58:59 +02:00
iceman1001
6519ae6f88
part of monstermerge...
2017-07-27 20:48:49 +02:00
iceman1001
8f262aa1bf
ADD: num_CPUs(void) method from pm3 master
...
CHG: clean up in util.c
ADD: seems like mingw doesn't have scandir. Had to add one. *untested*
2017-07-27 09:36:16 +02:00
iceman1001
46a0ec7130
CHG: removed old TRUE/FALSE defines... some left still..
2017-07-27 09:28:43 +02:00
iceman1001
86bbd8f563
ADD: param_getlength , gets the string length of one parameter
2017-07-26 18:17:20 +02:00
iceman1001
e4ae456772
FIX: 'lf hid sim' - it now prints the id correct
...
ref https://github.com/Proxmark/proxmark3/issues/364
2017-07-26 09:41:09 +02:00
iceman1001
b149fdc67b
FIX: 'script run mifare_autopwn' some print statements
...
FIX: 'script run mfkeys' correct author, added copyright
2017-07-24 13:00:40 +02:00
iceman1001
6c4d1560e9
ADD: 'script list' - now sorts the scripts in alphabetic order. It needs the extra define, in order to scandir and alphasort to work.
...
and this made our own version of le32toh function complain. So this is removed from util.c and where it was used a new define replaced it (LE32TOH)
2017-07-23 10:24:30 +02:00
iceman1001
db34c61aa0
add: a script needed for new way of compiling the proxmark3 project
2017-07-22 14:04:18 +02:00
iceman1001
c4c3bedb8a
FIX: 'script run mfkeys' Script was mistakingly only checked first testkeys block with 85 keys. Since the selection in testkeys list was not taking lua way of ranges, it only sent zeros.
2017-07-22 14:02:51 +02:00
iceman1001
72f6ed45eb
FIX: 'script run formatMifare' https://github.com/Proxmark/proxmark3/pull/362 bad comparision value
2017-07-22 14:00:54 +02:00
iceman1001
478b9c7270
chg: some reorder, renaming
2017-07-17 14:28:57 +02:00
iceman1001
124df841d6
chg: some extern definitions on functions in the header file
2017-07-17 14:28:13 +02:00
iceman1001
d2f19521a7
fix: 'hf mfu restore r' it now uses the newly written pwd for all further authentications needed.
...
- it also tries to save the special blocks, and configurationblocks in a certain order.
2017-07-17 14:27:11 +02:00
iceman1001
fe5c33092d
ADD: 'hf 14a reader' - added Mifare Classic Ev1 1k/4k identification.
2017-07-16 10:18:19 +02:00
iceman1001
da32472099
chg: 'hf mfu restore' added the parameter 'r', to read the password from the dump file and write to a magic ntag 21* , to be used together with the parameter 'e'
2017-07-15 14:03:11 +02:00
iceman1001
1b6176995f
chg: 'hf mfu restore' swapped some parts so to write special areas first and configblocks last.
2017-07-14 21:24:36 +02:00
iceman1001
195102e9ae
fixes
2017-07-14 21:22:03 +02:00
iceman1001
e8015142cd
fix: TRUE/FALSE -> bools
...
fix: 'iclass' filepath 255, to use FILE_PATH_SIZE
fix: unified params test
2017-07-14 20:54:11 +02:00
iceman1001
ec16d16d05
fixes: removal of TRUE/FALSE defines into bools
2017-07-14 16:20:34 +02:00
iceman1001
d2f79fa83f
ADD 'lf nexawatch' by marshmellow42
...
ADD 'lf securakey' by marshmellow42
ADD 'lf pac' by marshmellow42
chg: parity.h got some love from pm3 master.
2017-07-14 15:51:12 +02:00
iceman1001
c5e04ba927
fixes: removed bad references.
...
chg: 'hf mfu restore e' added the special block writes options
2017-07-14 08:47:23 +02:00
iceman1001
b99fa57e42
fix: wrong variable
2017-07-13 23:37:09 +02:00
iceman1001
7cf0bf19e5
FIX: 'mfu authentication' bug where the pack-length was wrong
...
ADD: 'hf mfu restore' - added a restore from file command, see helptext for instructions
CHG: some help-text updates and refactored to functions
CHG: 'hf mfu gen' - added the possibility to read uid from card as input
CHG: 'hf mfu dump' - refactored out the dump-printing
2017-07-13 13:10:46 +02:00
iceman1001
de97a6f1b0
fix: removed on warning of unused variable.
2017-07-11 19:38:36 +02:00
iceman1001
ed54dc8e17
FIX: 'dumptoemul.lua' doesn't add the last newline in generated eml file.
...
FIX: 'dumptoemul-mfu.lua' doesn't add the last newline in generated eml file.
FIX: 'dumptoemul-mfu.lua' correctly gets the UID from bin file, previously took wrong data.
2017-07-11 19:37:59 +02:00
iceman1001
8980e0ab66
some more keys
2017-07-11 18:31:53 +02:00
iceman1001
310d0da9a4
fixes.. to bool
2017-07-11 18:31:10 +02:00
iceman1001
17a8e69e90
ADD: 'hf mfu info' type detection now support NTAG_I2C_1K_PLUS, NTAG_I2C_2K_PLUS
...
ADD: 'hf mfu info' ul-ev1 pwd tests are now correct
ADD: 'ul ev1 authentication' now deals with magic tags and NACK messages correct.
ADD: 'hf mfu pwdgen' added the option 'r' to read uid from tag instead.
2017-07-11 17:52:01 +02:00
iceman1001
1f9534e2cc
CHG: broke out some help texts and improved them.
...
CHG: 'hf mf csave' now save mini,1k,2k,4k and to both a bin and eml file.
2017-07-11 17:45:23 +02:00
iceman1001
8bc17414fd
new coverity scan complains..
...
fix 'lf hitag' bit comparisions wrong
fix 'standalone mode' logically dead code
2017-07-07 15:45:40 +02:00
iceman1001
4406f4ee2a
CHG: removed some #DEFINE TRUE/FALSE
2017-07-07 12:52:51 +02:00
iceman1001
5f18400cbe
FIX: 'hf iclass reader' marshmellows fixes.
...
CHG: removing some #define TRUE
2017-07-07 12:38:49 +02:00
iceman1001
dd98b934bc
CHG: 'hf iclass readblk' - should be able to read block 0,1 on all cards without key.
...
CHG: 'hf iclass reader' - two rules according to datasheet
if app_limit is less than 0x6, app_limit should be 0x6
if app_limit is bigger than 31/0x1F on 2kb picopass, the app_limit should be 26/0x1A
2017-07-05 12:05:53 +02:00
iceman1001
a211877853
CHG: 'script run didump' - got some remake. unfinished.
...
CHG: some default keys
2017-07-04 20:23:47 +02:00
iceman1001
3ca3d401c0
FIX: some adjustments to prng detection
2017-07-04 20:11:25 +02:00
iceman1001
fa8da9e651
some updated scripts
2017-07-04 20:05:50 +02:00
iceman1001
4d18909596
ADD: 'hf 14a read' - detection if found Mifare Classic tag has a weak or hardend PRNG. Thanks to @doegox for implementing it in nfc-tools/mfoc Its a beauty :)
2017-06-26 21:45:22 +02:00
Iceman
d82de9223a
Update default_pwd.dic
2017-06-21 15:24:41 +02:00
iceman1001
de048b0436
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2017-06-09 14:49:35 +02:00
BOURDY Romain
bf413f1b87
Start fixing legic.lua ! Now loads dumps fine
2017-05-17 18:52:30 +02:00
iceman1001
bafb2e1455
ADD: di token list
2017-05-08 10:14:09 +02:00
BOURDY Romain
d063559fc4
Add more VIGIK Keys
2017-04-29 16:50:57 +02:00
iceman1001
e093a375ef
CHG: added key gen algo. removed inparameter.
2017-04-29 01:08:19 +02:00
Iceman
8c9facb7b5
Update cmdhficlass.c
...
fix: 'hf iclass dump' now uses rawkey option even for credit key.
2017-04-27 16:30:14 +02:00
Iceman
08cc2c36d8
fix: 'hf mf chk'
...
Dictionary files will load wrong if they exceed 256lines.
2017-04-26 19:52:03 +02:00
Gator96100
dccc3e2c66
When compiled with MinGW use march=x86-64 instead of march=native
2017-04-23 15:27:00 +02:00
Gator96100
aff903d99f
Fix crashes when compiled with a different cpu
2017-04-22 23:36:43 +02:00
iceman1001
2d0341403e
ADD: script to change uid on a UL magic tag which uses backdoor commands
2017-04-20 15:29:45 +02:00
iceman1001
8aa789b195
CHG: updated topaz imp to match PM3 Master (piwi)
2017-04-19 03:41:51 +02:00
ikarus
926ea42b76
FIX: hf legic crc data parameter 'd' was inconsistently declared.
2017-04-14 11:24:49 +02:00
Iceman
d840622789
Update default_keys.dic
2017-04-05 17:28:46 +02:00
Iceman
450714d641
Update default_keys.dic
2017-04-05 17:27:09 +02:00
Iceman
4d78c76faf
Update default_pwd.dic
...
added a new cloner pwd
2017-04-04 17:22:49 +02:00
n4k
94ea581d83
Fix missing null byte : my_executable_directory
2017-04-02 20:16:45 +02:00
Iceman
107b43d31c
Merge pull request #92 from RobDeBagel/patch-1
...
Remove unnecessary x86 SSE 4.2 popcnt GCC flag
2017-03-29 22:48:31 +02:00
angelsl
396772c93a
Fixes for compiling on Android
2017-03-30 01:41:07 +08:00
Robert Jones
9640aa75a6
Remove unnecessary x86 SSE 4.2 popcnt GCC flag
...
-mpopcnt is only a valid flag for x86 platforms with SSE 4.2. Breaks on anything else, e.g. ARM
Builds/runs fine without this flag. I don't see any reference to popcnt instruction so I'm not sure what this is there for.
2017-03-29 14:09:00 +11:00
Luca
8361ba2266
Updated clone/sim cmd help + minor text fixes
2017-03-18 15:19:51 +01:00
iceman1001
966c111e8c
chg: too many \ slashes
2017-03-14 08:37:13 +01:00
iceman1001
f1202c3fa9
textual (piwi)
2017-03-14 08:30:46 +01:00
iceman1001
76a608af8e
CHG: extern methods.
...
ADD: BSWAP_64
2017-03-14 08:30:17 +01:00
Iceman
33936c2155
Merge pull request #89 from angelsl/mfsetmod
...
Add Mifare Classic EV1 set load modulation command
2017-03-10 16:46:12 +01:00
iceman1001
905c55de2b
ADD: analyse nuid - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1 has this option as a activation sequences. This NUID is also used for authenticate (cuid), not the block0 data.
...
ref: http://www.gorferay.com/mifare-and-handling-of-uids/
2017-03-10 09:48:36 +01:00
angelsl
ece631fd06
Add Mifare Classic EV1 set load modulation command
2017-03-09 21:37:16 +08:00
iceman1001
86fdf240e0
ADD: starting merge @holiman 's graphic branch.
2017-03-09 11:21:25 +01:00
iceman1001
be67483e63
syntax sugar
2017-03-09 11:19:30 +01:00
iceman1001
b9534ca070
FIX: introduced a bug in luascripts when adding the "safe ascii chars" to ConvertHexToAscii. Now its optional.
2017-03-09 10:26:01 +01:00
iceman1001
672d72de89
CHG: lf visa2000 demod - adding the commandcall, allowing for demods of graphbuffer. (@marshmellow42)
...
CHG: `lf visa2000 read` - adapting number of samples, from 12000 -> 12500. (@marshmellow42)
2017-03-07 08:26:17 +01:00
iceman1001
6795b3da93
CHG: compiler warning about not using fscanf return value.
2017-03-06 19:24:50 +01:00
iceman1001
57778a4630
CHG: renamed struct sector -> sector_t
...
CHG: defines on armside
CHG: #define WIN32 -> _WIN32
CHG: started to enhance "hf mf chkkeys"
REM: removed some duplicates etc in default keys.
2017-03-06 19:11:08 +01:00
iceman1001
318bae20de
removed some duplicates.
2017-03-06 14:47:24 +01:00
iceman1001
dc873169cf
FIX: lf visa2000 actually the parity is on the whole id.
2017-03-05 17:13:43 +01:00
iceman1001
fb26bb5436
FIX: lf visa2000 - identified unknown nibble in checksum. Is not checksum, but the even parity of the last 2bytes in ID.
2017-03-05 16:56:24 +01:00
iceman1001
e0a241f76e
CHG: plotting of clock
2017-03-04 14:36:09 +01:00
iceman1001
5b8cc7cf26
textual change @4m4rOk
2017-03-04 14:35:39 +01:00
iceman1001
2ec645e9d7
chg: more keys.
2017-03-04 14:34:08 +01:00
iceman1001
9833360b25
chg: clock marking for ask/fsk/psk, using @marshmellow42 's addition to get startindex.
2017-03-03 11:36:07 +01:00
iceman1001
1ec412d97d
FIX: moved from lfdemod.c -> graph.c SetGraphClock.
2017-03-02 21:15:01 +01:00
iceman1001
aa9b584f5c
FIX: removing nonexistent include file.
2017-03-02 21:10:35 +01:00
iceman1001
c6e5c7ea46
CHG: data plot- the marking of clock, looks better without borders. It only connected to ASK. STT mark also looks better.
...
Still problem with finding the startindex...
2017-03-02 21:00:51 +01:00
iceman1001
a47ded5b54
ADD: data detectclock - added clock blocks in plot window. Its a draft. Not working for all clocks.
...
ADD: STT is now marked as a block in plot window, instead of Marshmellow42 's two lines.
2017-03-02 14:53:50 +01:00
iceman1001
a9eeb57698
CHG: Added PR #220 from PM3 Master. ref: https://github.com/Proxmark/proxmark3/pull/220
2017-03-01 20:14:46 +01:00
iceman1001
4eabb8ad38
CHG: minor LF adjustments.
...
CHG: `lf visa2000` - removed askedgedetect, it seemed it destroyed more than enhanced.
2017-02-28 16:55:16 +01:00
iceman1001
a8fd088d8b
FIX: lf search - em410x demod was a bit greedy.
2017-02-28 14:47:25 +01:00
iceman1001
026ac759a5
help text
2017-02-28 14:09:10 +01:00
iceman1001
62cdba0568
CHG: hf em commands. Client side now has same commands as Peter Fillmores 14atagfuzz repo. OBS: not all exists on deviceside yet!
2017-02-28 14:08:15 +01:00
iceman1001
f24edfec54
CHG: hf 14a read - started to add a Magic tag gen2 detection. SKipping it for now. Can't decide to put in on deviceside or in client.
...
FIX: `lf read` - ophs.. it works again.
ADD: `lf em 4x05--` - added a chipset definition
CHG: better kali fix - from @pwpivi
2017-02-28 08:16:02 +01:00
iceman1001
8db18d2f15
ADD: hf 14a read - now can detect the newer magic generation 1b. In output 1A (old version, where all hf mf c* commands works) 1B is the newer.
2017-02-27 19:18:38 +01:00
iceman1001
41611deef9
CHG: some of @marshmellow42 's ref: 2b11c7c750
...
CHG: `lf em 410x` - when demoded to all zeros, it wasn't printed so some noninitalized tags just gets a empty "found em410x tag" message. Hav'nt decided on how to go further with it.
2017-02-27 14:04:50 +01:00
iceman1001
c3a15ba92f
FIX: should be defined earlier.
2017-02-26 22:01:38 +01:00
iceman1001
d216a5711b
CHG: one step closer to finish merging @marshmellow42 's 4x05 changes.
2017-02-26 21:32:51 +01:00
iceman1001
b87ad7964e
FIX: some compiler problems caused by PM3 master commit 4197a3f6ff for Kali users.
...
discussed about in isssue ref: https://github.com/Proxmark/proxmark3/issues/218
*untested on icemanfork*
2017-02-26 21:30:47 +01:00
iceman1001
1b6cc9746e
FIX: removing compiler warning about double const.
...
thanks to @spaceteddy ref: https://github.com/iceman1001/proxmark3/issues/83
2017-02-26 21:28:06 +01:00
iceman1001
d32691f1da
FIX: hf mf sim - authentication works again.
...
CHG: `lf em`- renamed.
CHG: removed functionality in whereami.c, not needed.
2017-02-25 23:00:20 +01:00
iceman1001
6ac2301423
CHG: forgot some changes to previous commit.
2017-02-24 15:00:49 +01:00
iceman1001
b804b9cdb8
ADD: @pivipw 's changes "making lua paths".
...
ref:: 4197a3f6ffhttps://github.com/Proxmark/proxmark3/issues/217
where GetModuleHandleEx doesn't exist in mingw (old proxspace 2013 environment).
Use the docker container or linux...
2017-02-24 14:59:38 +01:00
iceman1001
01f082a60f
CHG: lf read - forgot a var
2017-02-24 14:17:36 +01:00
iceman1001
165b92dc35
CHG: lf read - optional timeout, to be used when configured a threshold limit.
2017-02-24 14:15:36 +01:00
iceman1001
5215a87442
CHG: @Marshmellow42 's fixes. ref: e88096ba25
2017-02-24 01:14:47 +01:00
iceman1001
f7c1147ab8
chg; PRIu32 becomes %u. Lets return to whats working - %lu
2017-02-23 01:21:25 +01:00
iceman1001
3919356baf
CHG: 64?
2017-02-23 00:58:52 +01:00
iceman1001
07bc72b880
CHG: continue code cleanup.
...
REM: removed stdint.h , since we are using c99 when compiling.
2017-02-23 00:32:14 +01:00
iceman1001
9c624f67b3
chg: @piwi's code cleanup and some more.
...
ref: 43534cbad2
2017-02-23 00:03:10 +01:00
iceman1001
d25518be59
FIX: wrong varname, Good catch of @jamchamb 4b12061bee
2017-02-20 21:03:04 +01:00
iceman1001
19d9376c16
CHG: added some comments when changing the HAS_512_FLASH macro directive.
...
CHG: 'make cli' - needs lualibs to compile. well, and more stuff ofcourse.
2017-02-20 11:47:10 +01:00
iceman1001
17a9ca0cdc
FIX: memcpy bug...
2017-02-19 23:52:09 +01:00
iceman1001
9932c55a4a
CHG: lf em - refactored @marshmellow42 's em paritycheck.
...
ADD: `bootrom/Makefile` got some options. It shouldnt change anything.
2017-02-19 23:24:19 +01:00
iceman1001
9bef1216b9
ADD: added dkjson.lua for json support
2017-02-19 23:21:59 +01:00
iceman1001
5e9d59fe2a
syntax sugar
2017-02-19 01:34:45 +01:00
iceman1001
5ebba500dc
CHG: prints if command is NACK,
2017-02-19 01:34:21 +01:00
iceman1001
f054036a10
chg: analyse chksum - now respects the mask variable,
2017-02-19 00:13:32 +01:00
iceman1001
4ac9f07840
CHG: lf em - added @marshmellow42 's changes
2017-02-19 00:12:35 +01:00
iceman1001
03d73c0b8d
FIX: lf guard sim - helptext change and increase arguments expected check to 3
2017-02-17 07:48:00 +01:00
mdp
da952d12a6
Fix args number and example for guard
2017-02-16 19:35:26 -08:00
iceman1001
36dc0b4370
ADD: some more keys
2017-02-16 22:50:25 +01:00
iceman1001
080e1114c8
CHG: a message..
2017-02-16 21:59:57 +01:00
iceman1001
6f93185537
CHG: lf em - some minor psk detection changes.
2017-02-16 21:52:14 +01:00
iceman1001
1a4b907335
CHG: some minor changes from @marshmellow42
2017-02-16 21:44:25 +01:00
iceman1001
516dbac210
CHG: lf em - some minor refactoring in 4x50 commands
2017-02-16 19:48:50 +01:00
iceman1001
bd09006a8c
CHG: 'lf em4x' - the em4x50 demod didn't calc ASKDemod_ext with a refenence bool.
...
CHG: 'lf em4x' - refactored the code for emd4x50 demod
2017-02-16 16:38:09 +01:00
iceman1001
62dc7d4a6f
CHG: @marshmellow42 's em4x50 changes
...
ADD: 'analys chksum' - added a BSD styled 4 and 8 bit shift checksum
2017-02-16 09:53:47 +01:00
iceman1001
f9f5f45000
CHG: lf em - @marshmellow42 's latest changes
2017-02-15 16:58:29 +01:00
iceman1001
dd015c5915
ADD: 'script runt remagic' - the Mifare Classic s50 (1k) magic tag restores now also all sector trailers. Default A/B keys is 0xFFFFFFFFFFFF.
2017-02-14 15:54:10 +01:00
iceman1001
ab2167c47b
FIX: 'hf mfu dump' - the ascii printing would print control-chars, which could hang client. Unprintable chars is replaces with a DOT
2017-02-14 15:52:28 +01:00
iceman1001
573e8d72c7
FIX: 'EMV compiling' - Makefiles are very picky about how things are done. its parser is a bit paranoid. So, to make things easier and more correct.
...
- armsrc/Makefile when commenting out functionality, move it below the comment otherwise APPS_CFLAG breaks to early. See WITH_LCD
- common/Makefile.common enable / disable EMV, uncomment two lines. then make clean && make all. flash, MIGHT NOT work on 256kb devices
FIX: missing break in appmain.c made it go to iclass function..
2017-02-13 15:32:48 +01:00
iceman1001
4c8fe2e976
CHG: some minor adjustments.
2017-02-13 11:06:30 +01:00
iceman1001
d56ee2b1db
chg: trying to generalize the EMV build
2017-02-13 11:05:42 +01:00
iceman1001
4bf036f226
fix: some compiler warning when the #define is not matching.
2017-02-13 11:03:45 +01:00
iceman1001
2839f12e86
FIX: some compiler warnings, sscanf is using unsigned int.
2017-02-13 11:01:32 +01:00
iceman1001
2c601080c3
add: xorcumb
...
chg: from veritcal to horizontal printing.
2017-02-13 10:59:50 +01:00
iceman1001
e513cf8a31
chg: added a key
2017-02-13 10:59:03 +01:00
iceman1001
ff9c043da2
FIX: T5555/Q5 datarate when used in "Q" parameter, consequential fix in lf commands. (RF-2/2) ie: ((64-2)>>1)
...
ADD: Marshmellow42 's timing fixes for em4305.
2017-02-13 10:58:28 +01:00
iceman1001
c7ea35a9fb
chg: textual changes
2017-02-07 22:29:24 +01:00
iceman1001
464f6dc571
CHG: lf hid wiegand got some love. Still not correct.
2017-02-07 22:27:28 +01:00
iceman1001
bd94b97883
CHG: syntax sugar
2017-02-07 22:26:42 +01:00
iceman1001
cb1ba30a5e
FIX: first attempt to clean up EM4x50 commands.
...
- `lf em4x readwordPWD` merged into `lf em4x readword` See help text
- `lf em4x writewordPWD` merged into `lf em4x writeword` See help text
- `lf em4x readword` now download the collected signal data after command.
On device side the lfops.c has gotten some love. Code cleaner, increased EM_START_GAP from 55 FC to 56 FC, because of how our microsecond(us) clock works with 21.3us increments.
TODO: `lf em4x em4x50read` needs to be factored to use @marshmellow42 's ASKdemod instead of trying to do itself.
2017-02-07 22:26:06 +01:00
iceman1001
5ed5e418c9
CHG: testing to set 460800 baudrate as default, if it fails, go to 115200 baudrate. For Linux/Win. Works great in my environments.
2017-02-06 02:33:08 +01:00
iceman1001
6a1687cc3e
ADD: 'hf emv' - forgot to add some file
2017-02-05 22:16:50 +01:00
iceman1001
2e8d938bef
ADD: 'hf emv' - from @peterfillmore emv fork. A bit cleaned up and moved around. Should compile
2017-02-05 21:56:47 +01:00
iceman1001
3e83ff2159
CHG: '-DWITH_EMV' - fixing some compilation errors when compiling with peter fillmore's emv code. Warning a 256kb Proxmark3 device will only have 7% memory left if you enable this
2017-02-05 21:09:36 +01:00
iceman1001
e772774ba1
chg: more debug statements to find sending errors
2017-02-04 15:02:36 +01:00
iceman1001
3f84d47369
ADD: 'lf search' - @marshmellow42 's check if signal is noice.
2017-02-04 12:41:30 +01:00
iceman1001
cf5a79de33
ADD: 'hf 14a read' - correct identify Aztek tags, instead of claiming it to be "not mfu".
2017-02-04 12:32:14 +01:00
iceman1001
52108cabf3
CHG: 'lf cotag read' - added the raw output and the repeating byte pattern is 16bytes, so we only collect that many bytes from card
2017-02-03 00:07:55 +01:00
iceman1001
d228198808
fix: those pesky semicolons..
2017-02-02 21:32:46 +01:00
iceman1001
a330987de1
CHG: 'lf cotag demod' - now finds FC/CN Thanks to @marshmellow42
...
CHG: 'lf search' - now detects COTAG
2017-02-02 19:15:36 +01:00
iceman1001
96b516e180
CHG: minor fixes in setting arrays and error messages.
2017-02-02 15:39:35 +01:00
iceman1001
5f5b83b743
ADD: 'lf cotag read' - COTAG can be read now.
2017-02-02 15:32:21 +01:00
iceman1001
4401050bcc
ADD: 'hf standalone 14a mode", added "mifare 4k" detection.
...
ADD: 'hf 14a sim' - added mifare 4k simulation.
2017-02-01 14:41:06 +01:00
iceman1001
507afbf3e6
CHG: 'lf cotag read' - it now follows "lf config" settings when collecting signaldata.
2017-02-01 14:11:11 +01:00
iceman1001
bdf387c7ef
CHG: temporary disable hitag2_uid detection. Loop times out sometimes.
2017-01-31 22:38:02 +01:00
iceman1001
b828a4e168
CHG: 'lf snoop' - now automatically downloads samples after finished. (annoying step to do over and over)
...
FIX: 'lf snoop' - now turns of LF antenna after snoop.
FIX: 'lf cotag read' - now waits until the ACK cmd arrives before downloading samples.
2017-01-31 16:11:57 +01:00
iceman1001
71aa1ff824
FIX: fixes warning for "%zu" string formatspecifier on MINGW systems. (Thanks to @marshmellow42 for this one)
2017-01-31 05:33:24 +01:00
iceman1001
1cec48cc0e
ADD: added the writedumpfile function from "14araw.lua" into utils.lua
...
ADD: `ufodump.lua` - added the Aztek dump script. Since its an unknown tag hence the name.
2017-01-30 16:51:07 +01:00
iceman1001
84bdbc1917
FIX: 'hf 14a sim x' - adjusted and shows messages when verbose.
...
FIX: 'hf mf sim x i' - same as above.
In general we only use Moebius attack for "sim x", that means a clean up on device side code. simpler to understand. It still tries to gather 8 different collections of nonces combo. When one is complete, it get sent to client which runs moebius direct.
2017-01-29 23:09:23 +01:00
iceman1001
2ce218042d
CHG: 'hf 14a sim e' - it now has a parameter for setfoundkeys to emulator memory.
...
CHG: textual changes.
2017-01-29 13:21:17 +01:00
iceman1001
7e735c1398
FIX: 'hf 14a sim x' - this fixes the error with using moebius attack and sim. Updating the nonce variable doesn't change the premodulated response. And it should update everytime it gets a command. One concering issue is that this takes time. Successfully works with two PM3. One acting reader, another sim.
2017-01-29 11:29:15 +01:00
iceman1001
76c0ec0ba8
FIX: missed include. for boolean defines
2017-01-27 10:56:14 +01:00
iceman1001
4653da4331
ADD: lf cotag - added first try at basic functionality to read samples from Cotag. In lfops.c is the startup sequence that needs to be tested out.
2017-01-27 10:49:34 +01:00
iceman1001
bdebc8dbab
CHG: removed a -L path for OSX
2017-01-26 23:49:05 +01:00
iceman1001
2d3f8e5fa7
ADD: some defines to make headerfiles behave better.
...
CHG: syntax sugar
2017-01-26 14:23:05 +01:00
iceman1001
e069d740e3
still wrong...
2017-01-25 08:40:55 +01:00
iceman1001
4431b482d7
CHG:forget the "base"..
2017-01-25 08:36:51 +01:00
iceman1001
f364f71294
chg: known key is treated as a string.
2017-01-25 01:11:34 +01:00
iceman1001
137f207a8d
CHG: removed a dublett
2017-01-25 00:24:18 +01:00
iceman1001
b946d5f7f9
ADD: 'script run hard_autopwn' - a lua script which should run hardnested attack against all sectore and keytypes (A|B).
2017-01-25 00:23:13 +01:00
iceman1001
ced742717d
CHG: should remove a compiler warning on OSX
2017-01-23 23:12:41 +01:00
iceman1001
c840385eff
CHG: increase sample amount, since it found too few bits
2017-01-20 22:11:59 +01:00
iceman1001
53484563d7
CHG: lowered the samples read.
2017-01-20 22:06:53 +01:00
iceman1001
360a5b1b3c
FIX: the HID-Flasher depends on libusb to be able to compile On OSX the 'include paths' is different when using homebrew.
...
This project compiles on Ubuntu with libusb-dev installed. Lets see if it compiles on OSX....
2017-01-20 19:25:42 +01:00
iceman1001
1b75698cb7
FIX: 'lf hitag2' forgot to add some of @marshmellow42 's changes. Lf search should works just fine now.
2017-01-20 18:26:03 +01:00
iceman1001
69784c3801
ADD: 'lf search' - added @marshmellow42 's hitag2 identification
2017-01-20 10:09:06 +01:00
iceman1001
a38f5a0704
FIX: @marshmellow42 's fixes for enhanced STT and AskDemod. Now the "lf presco read" works on cargs with strong/clean/clipped waves
2017-01-20 10:03:53 +01:00
iceman1001
7898d3b55f
syntax sugar
2017-01-18 22:57:20 +01:00
iceman1001
316493876a
FIX: 'data print' - now don't crash the client when demodbuffer is empty
...
CHG: 'guard' - the Guard output more unified.
2017-01-18 22:55:37 +01:00
iceman1001
42c235e7ef
ADD: T55XX_WRITE_TIMEOUT to make sure all WaitForResponseTimeout for t55xx behaves the same.
...
CHG: removed some "DONE!" device prints..
CHG: unified some "clone" commands output.
2017-01-18 22:54:27 +01:00
iceman1001
ea7ce7fb68
CHG: removed duplicates entries
2017-01-18 20:22:15 +01:00
iceman1001
388d8618c7
CHG: moved definition and includes into header file
2017-01-18 20:19:42 +01:00
iceman1001
6df022667d
CHG: spelling mistakes. (
2017-01-18 20:19:08 +01:00
iceman1001
efbf81da52
FIX: 'hw tune' - peakf shouldn't be compare with voltages limits :)
2017-01-18 13:35:00 +01:00
iceman1001
bb52291837
CHG: 'hw tune' adhjusted the NON_VOLTAGE limit to 0.999v, below this value the antenna is considered not connected.
2017-01-18 13:18:03 +01:00
iceman1001
bf35008962
CHG: 'lf t55xx recoverpw" - added the possibility to cancel the command when pressing 'enter' key.
2017-01-18 11:27:17 +01:00
iceman1001
243f899b92
CHG: 'hw version' - change to "Proxmark3"
2017-01-17 22:59:14 +01:00
iceman1001
f56b1fae2d
FIX: sprint_bin_break didn't print the last digit in array.
2017-01-17 22:58:16 +01:00
iceman1001
3e5b5bb2da
ADD: 'lf t55xx detect' - added a search for known config blocks, if found it will select it. Usually when indala (psk) configured tags generates serveral possible configblocks. The found config block is set, not need to manually set it anymore. :)
2017-01-17 22:07:40 +01:00
iceman1001
9682ed9aaa
CHG: increased the t55xx writeblock timeout
2017-01-16 22:39:33 +01:00
iceman1001
81b7e89434
CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679
...
CHG: added some documentation about what arguments does.
CHG: 'data tune' - added flush after printf.
2017-01-16 21:06:51 +01:00
iceman1001
aed36ae5bd
ADD: 'install.sh' blacklist rules installed aswell. run as root to install.
2017-01-16 15:02:10 +01:00
iceman1001
d3fd5fd6d8
CHG: unused variables and remove of compiler warnings.
2017-01-16 15:00:40 +01:00
iceman1001
1cc80785e5
ADD: sprint_ascii function.
2017-01-16 14:47:24 +01:00
iceman1001
cf94c75b7e
CHG: 'lf t55xx' the no-time limit waiting for the device to ACK when transfering data from device to client, is changed to 8 seconds.
...
CHG: 'lf t55xx dump' - added ASCII printing of dumped data blocks.
2017-01-16 14:46:42 +01:00
iceman1001
c621ae0614
CHG: 'data zerograph' - array out-of-bounds fixed.
...
CHG: syntax sugar
2017-01-16 14:44:37 +01:00
iceman1001
3acac886bc
ADD: 'lf search' - added a rudimentary identification of IDTECK tags, will demod to PSK1, if fails it tries to PSK1 inverted demod.
2017-01-12 00:04:36 +01:00
iceman1001
ceb34a3c1b
CHG: syntax sugar
2017-01-11 23:09:47 +01:00
iceman1001
197c8f3f42
CHG: syntax sugar, minor spelling mistake
2017-01-11 23:08:59 +01:00
iceman1001
719000b7f4
syntax suger
2017-01-11 23:02:38 +01:00
iceman1001
fbc2bace4a
CHG: 'lf hid wiegand' - remaking the wiegand calcs
2017-01-11 23:02:07 +01:00
iceman1001
db289ea7d7
CHG: syntax suger
2017-01-11 23:01:15 +01:00
iceman1001
9a6bc2feb4
CHG: 'lf noralsy' Added tag allocation year in demod output.
...
CHG: 'lf noralsy clone|sim' Added tag allocation year as input parameter
2017-01-11 23:00:08 +01:00
iceman1001
3b875041dc
FIX: 'hf 14a reader' - when card SAK was 0x00, it calls GetHF14AMfU_Type() to try to identify if it is a UL/NTAG etc. The bug is that it ignored the return value.
...
when return_value == UL_ERROR, it shall not print the mfu tagtype annotation.
---faulty behavior
proxmark3> hf 14a reader
UID : 65 93 7f d1
ATQA : 00 04
SAK : 00 [2]
Tag is not Ultralight | NTAG | MY-D [ATQA: 00 04 SAK: 00]
TYPE : MIFARE Ultralight (MF0ICU1) <magic>
proprietary non iso14443-4 card found, RATS not supported
Answers to chinese magic backdoor commands: NO
2017-01-11 22:00:17 +01:00
iceman1001
042db564ba
CHG: 'hf iclass replay' added help text.
...
CHG: 'hf iclass snoop' added help text.
CHG: 'hf iclass reader' added help text.
ADD: 'hf iclass reader' added the possibility to read only one tag instead of looping.
CHG: 'sprint_hex_ascii' function now replaces unprintable chars with '.', added this call to printIclassDumpInfo
2017-01-10 22:21:16 +01:00
iceman1001
76c74bf9ad
CHG: 'hf iclass decrypt' - adjusted the loops, to only decrypt Application 1. However I've noticed not all blocks in Application 1 is encrypted. :/ Still needs to be adjusted.
...
CHG: 'hf iclass reader' - added some output accessrights from the CopyReader source code.
And ofcourse, moved around stuff, like the usages in cmdhficlass.c
2017-01-10 18:23:05 +01:00
iceman1001
a0a61c91cc
CHG: adding the HID wiegand calcs again. Still need to set the bit37 indicator etc.
2017-01-09 22:17:43 +01:00
iceman1001
dd83c4572b
CHG: coverity complains about not reading the value from mifare_send_short
...
CHG: ubuntu 14.04 gcc4.8.4 complains about mem_avail still. Don't know why.
2017-01-09 22:15:36 +01:00
iceman1001
38a30dbf18
CHG: forgot to remove unused function.
2017-01-06 00:02:52 +01:00
iceman1001
e585a58ed1
CHG: looks bad but works.
2017-01-06 00:01:14 +01:00
iceman1001
08439eea22
CHG: textual changes.
...
CHG: remove unused #includes and added some comments
2017-01-05 15:56:52 +01:00
iceman1001
87c10b2a0f
CHG: some indala output is now only in debug mode
...
CHG: added 34|37 bits AWID format. I'm guessing 37bit is wrong since the parity is still there. Which it shouldn't
2017-01-05 15:55:19 +01:00
iceman1001
29f649c5ce
CHG: change the indala output abit, to only show when in debug mode. (ie: data setdebug 1)
2017-01-05 15:53:32 +01:00
iceman1001
c48211f7ed
ADD: 'lf animal' commands. CLONE/SIM/READ/DEMOD of FXD-B animal tags. Still some work left.
2017-01-05 01:51:47 +01:00
iceman1001
f80cd7e687
syntax suger, some tabs fixed
2017-01-03 19:33:21 +01:00
iceman1001
ea1c1ca6f8
CHG: 'analyse hid' added @holiman 's permute functions to the output to verify
2017-01-03 19:32:24 +01:00
Iceman
0b63a0fe2a
Merge pull request #63 from micolous/log-nonce
...
nonce2key: printf->PrintAndLog
2017-01-03 19:19:38 +01:00
iceman1001
deba67ab57
CHG: cleaning up stuff
2017-01-03 01:20:03 +01:00
iceman1001
34c3082338
CHG: added a key B wien,
2017-01-02 22:00:56 +01:00
Iceman
1772cf8bdd
fixed warning about size_t
...
CHG: warning needs %lu string formatter
2016-12-26 20:43:20 +01:00
Iceman
ef31a8b453
fix a warning
...
CHG: size_t is unsigned. switched to the correct string formatter
2016-12-26 20:39:13 +01:00
Michael Farrell
59152dcb05
nonce2key: printf->PrintAndLog
2016-12-24 10:09:01 +10:00
Michael Farrell
faad338efe
Fix some missing include statements which impact using proxmark3 client as a library.
2016-12-23 17:35:50 +10:00
iceman1001
62d0bbf62f
ADD: new found cloner pwd.
2016-12-20 09:25:02 +01:00
iceman1001
bb73c58d9a
CHG: made some debugs statements more clear, when "LF SEARCH" is used with "DATA SETDEBUG 1"
2016-12-19 15:32:18 +01:00
iceman1001
8cdf15c2b3
CHG: 'lf awid brute' - extra check if device gotten offline
...
CHG: 'lf t55x7 brute' - extra check if device gotten offline
CHG: 'lf nedap' - Nedap is supposed to be Diphase.
2016-12-19 14:55:58 +01:00
iceman1001
92014925d6
CHG: 'LF VISA2000' adding askedgedetection when decoding allows for some traces to be correct demodulated.
2016-12-16 19:06:19 +01:00
iceman1001
3375daee9e
CHG: 'LF VISA2000 CLONE' fixed the wrong blocknum index in output. Thanks @martin for pointing it out.
2016-12-16 12:50:44 +01:00
iceman1001
0a7e86db81
ADD: 'LF VISA2000' added one checksum test when demod / clone / sim
...
CHG: 'LF NORALSY' when chksum fails, return 0, to indicate for LF SEARCH that it failed.
2016-12-16 12:47:49 +01:00
iceman1001
32da0a464e
ADD: 'analyse chksum' added a nibble xor calc - calcSumNibbleXor
2016-12-16 12:05:38 +01:00
iceman1001
c08c796e8d
CHG: enhanced the debug output for some LF demod/decode
2016-12-16 12:04:37 +01:00
iceman1001
22eece1e2d
ADD: 'LF NORALSY' clone/sim/read commands. Partly done. some crc works, but whole format in not mapped yet.
...
ADD: 'LF SEARCH' added noralsy detection
2016-12-15 18:04:30 +01:00
iceman1001
d48175d4f4
FIX: 'lf presco' demod fixes.
...
ADD: 'lf search' now also looks for Presco.
I know that the helptext is wrong (d should be p)
2016-12-15 00:01:31 +01:00
iceman1001
371535d566
ADD: forgot to add the files
2016-12-14 23:26:14 +01:00
iceman1001
9945a928c7
Syntax suger
2016-12-14 23:25:28 +01:00
iceman1001
eb911aa8d6
ADD: 'lf visa2000' commands. (SIM/CLONE/READ) almost finished.
...
CHG: 'lf xxxxx' reduced number of samples from 30000 -> 20000 in "lf xxxxxx read" commands.
CHG: 'data samples' - didn't honor the silent parameter. It now output less for the 'lf xxxxxx read' commands.
2016-12-14 23:23:16 +01:00
iceman1001
dc3a58466d
CHG: 'lf search' changed output to be visible when debugging for IO prox
2016-12-13 12:27:40 +01:00
iceman1001
8b2a5d400a
FIX: 'hf iclass dump' / 'hf iclass readtagfile' - the faulty output from these commands are now fixed.
2016-12-09 14:38:51 +01:00
iceman1001
c5af4b5d8c
CHG: 'hf iclass dump' - output fixes
...
CHG: 'hf iclass readtagfile' - output fixes
2016-12-08 18:02:48 +01:00
iceman1001
541231b805
REM: removed a double entry. it seems 'hf mf check' doesnt uniq-sort this file.
2016-12-08 18:01:54 +01:00
iceman1001
b7f40ee2ad
CHG: added a check if err variable is NIL.
2016-11-22 11:55:23 +01:00
iceman1001
d1e197e9ec
FIX: the changes to uart.c timings seems to have fixed my problem with the pm3 device getting unresponsive.
...
CHG: "script run hard" now iterates all sectors on the tag and output the table style like "hf mf chkkey" do.
2016-11-22 01:58:11 +01:00
iceman1001
e108a48ac4
ADD: added the 'hf mf hardnested' to be called within LUA scripts.
...
ADD: 'script run hard' - a first try for a lua script to run the hardnested attack on a complete tag.
2016-11-21 16:08:12 +01:00
iceman1001
711ae19fca
CHG: Cleaning up
2016-11-18 11:31:52 +01:00
iceman1001
09bb01c73d
ADD: "analyse hid" - new function that implements the 'heart of darkness' hid/iclass permute function. Its converted from the php-solution found in the paper to C. Ref: https://github.com/akw0088/HID-Card-Copy/blob/master/key-permutation/permute.php
2016-11-17 18:20:44 +01:00
iceman1001
fa5974bbf3
FIX: @matrix latest fixes
2016-11-16 22:31:09 +01:00
iceman1001
f07ffa7672
FIX: "hf mf hardnested" - removed the call to free_candidates_memory, on my ubuntu env it crashes all the time with it.
2016-11-16 19:19:06 +01:00
iceman1001
da8279796e
FIX: that time.h issue is different on POSIX systems and WINDOWS system and in C...
2016-11-16 18:52:13 +01:00
iceman1001
a877bc2f01
FIX: wrong compile define used, __WIN32 should be _WIN32
2016-11-16 18:42:56 +01:00
iceman1001
7d159efe40
FIX: & 0xFF instead of uint8_t
2016-11-16 18:38:15 +01:00
iceman1001
1ca5dce0f4
FIX: removed some warnings about time_t in non-windows systems. This appeared since I fiddled in proxmark.h
2016-11-16 18:36:21 +01:00
iceman1001
3105b814c9
CHG: added the ping command to the header file.
2016-11-16 18:17:01 +01:00
iceman1001
06d09c98eb
CHG: "hf mf hardnested" - fixes and additions.
...
- freeing candidate lists after generate_candidates calls.
- longer timeout when waiting for responses (it takes a while to collect 58 nonces per call) From 3sec to 6sec
- if best_first_byte[0] (best guess) has been the same for 3 nonces calls in a row, it enters the generate_candidates test.
- when total_added_nonces increases but does not enter generate_candidates tests, it now increases the threshold_index variable. Make the output look better
Known bugs still.
- TestIfKeyExists sometimes crashes the client, still after the null check.
- proxmark3 device doesn't answer calls after entering brute_force call and fails finding a key, where it should start collecting nonces again. This bug doesn't make sense.
2016-11-16 18:16:14 +01:00
iceman1001
2618e313bf
CHG: textual change
2016-11-16 17:45:12 +01:00
iceman1001
4d812c139b
CHG: "hf mf hardnested"
...
- latest clean up from @matrix
- the device still doesnt answer when brute_force call fails. I've been trying to get the device to init after the brute_force call.
2016-11-15 12:49:13 +01:00
iceman1001
97f86b7a61
chg: removed a useless clearing of key_count. From @matrix 090682764b
2016-11-15 12:13:15 +01:00
iceman1001
71ac327ba8
FIX: 'hf mf hardnested' @matrix e0828439bf
2016-11-08 13:27:50 +01:00
iceman1001
360caababf
FIX: decrease 2^39 -> 2^38. its a big searchspace anyway.
...
FIX: changed output and rearranged collecting nonces logic.
Still problems with "hard" keys, the device stops responding after a "bruteforce" / "generate_candidates" call.. Very strange. shouldnt'
2016-11-07 22:41:18 +01:00
iceman1001
87a513aa1d
FIX: "hf mf hardnested" when "key found" exting the do-while loop doesn't need to wait for device to respond.
2016-11-07 11:54:32 +01:00
iceman1001
8e4a0b3585
FIX: "hf mf hardnested" merging of @matrix commit bd8249afec
2016-11-07 11:11:14 +01:00
iceman1001
7fd676db11
FIX: @matrix 869a03c2c6
...
it still counts down the good bytes,
and I fixed the elapsed time.
2016-11-05 14:54:25 +01:00
iceman1001
713f5d019c
CHG: still issues left.
2016-10-29 23:58:59 +02:00
iceman1001
5e14319d2c
FIX: several calls to nonce2key/nonce2key_ex has problems with not clearing up memory pointers laying around.
...
Still exists problem which needs to be dealt with.
2016-10-29 22:12:38 +02:00
iceman1001
60c33f7aa8
CHG: minor textual change to fit the minimum two calls nature for the zero parity attack
2016-10-29 21:45:36 +02:00
iceman1001
b403c30091
FIX: the time_t calls under mingw needs a #define _USE_32BIT_TIME_T 1 to be correct. It seems to work in "hf mf mifare" but not in "hf mf hardnested"
2016-10-29 21:42:46 +02:00
iceman1001
19693bdc06
FIX: 'hf mf mifare' - special zero parity attack vector now works. Thanks to the dude who figured this vector out: @douniwan5788 (sorry for comments, I was clearly wrong.) @piwi - for proving me wrong.
...
this version uses int64_t (signed) to signify end-of-lists (-1). It also needs its own compare function for the qsort. I didn't merge this into existing code which uses uint64_t. (too lazy)
2016-10-29 21:41:02 +02:00
Gabriele Gristina
e7f43e92e9
Merge remote-tracking branch 'upstream/master'
2016-10-29 15:19:55 +02:00
iceman1001
c3c12b5571
CHG: clean up
2016-10-28 16:37:26 +02:00
iceman1001
ba39db376c
CHG: just some parameter / variable name changes. Nuttin' special.
2016-10-28 16:37:01 +02:00
Michael Farrell
32beef538e
hf {14a,mf} sim: v is for verbose
2016-10-27 23:37:00 +11:00
Michael Farrell
dfdbfa0702
hf mf sim: Be less verbose by default, add option "m" to turn maths back on (Issue #45 )
2016-10-27 23:37:00 +11:00
Gabriele Gristina
236e8f7cc6
fixup code
2016-10-26 01:14:56 +02:00
iceman1001
9f02f471db
FIX: too small string?
2016-10-23 00:58:40 +02:00
iceman1001
be26ef45b4
FIX: valgrind complains about something here...
2016-10-23 00:50:23 +02:00
iceman1001
520d06e856
CHG: init the char array.
2016-10-23 00:38:09 +02:00
Michael Farrell
b6e05350b2
hf mf sim: Multiple fixes (iceman1001/proxmark3 #45 )
...
- Fix `hf mf sim` to use nonce_t structures, so key recovery works
- Increases verbosity on the key recovery functionality
- Fix use-after-free for k_sector
- Add help info on `e` option to `hf mf sim`
2016-10-22 21:53:53 +11:00
Michael Farrell
53f7c75a38
hf 14a: Fix typos in manufacturer list
2016-10-22 14:24:17 +11:00
iceman1001
2dcf60f3df
CHG: "hf mf hardnested" - less printing
...
CHG: some filehandles = NULL.
2016-10-21 16:06:53 +02:00
Gabriele Gristina
bbcd41a6e5
Speedup Mifare Plus Attack v2.2 (cleanup code)
2016-10-21 01:06:57 +02:00
Gabriele Gristina
0325c12f35
Speedup Mifare Plus Attack v2.1 (stable)
2016-10-21 00:43:43 +02:00
Gabriele Gristina
64c87a8c5f
Merge remote-tracking branch 'upstream/master'
2016-10-20 20:00:06 +02:00
iceman1001
36d87eeff0
FIX: client crash for global id, and removing my previous fix.
2016-10-20 17:31:23 +02:00
iceman1001
ed28bbe5ae
CHG: some debug statements instead, 'H' for helptext.
2016-10-20 01:51:27 +02:00
iceman1001
3c6354e99a
FIX: strange bug in "lf em em410xwatch" , which the client crasches when it reads a valid em tag.
2016-10-20 01:50:30 +02:00
iceman1001
d115f9a454
CHG: making printed statement a debug statement.
2016-10-20 01:16:32 +02:00
iceman1001
015e3b8170
syntax suger. never mind this
2016-10-20 00:41:34 +02:00
iceman1001
bd46dec63b
CHG: found even more keys
2016-10-19 21:27:34 +02:00
iceman1001
100fe0a5ee
textual suger
2016-10-19 21:26:56 +02:00
Gabriele Gristina
383a1fb368
Speedup Mifare Plus Attack v2
2016-10-19 00:13:53 +02:00
iceman1001
88f503735c
FIX: @aczid's fix 957702be9c
...
from original @matrix 057d2e9147
2016-10-18 18:45:29 +02:00
Gabriele Gristina
057d2e9147
Speedup Mifare Plus Attack v1
2016-10-18 01:21:56 +02:00
iceman1001
62254ea5a7
FIX: Since some changes in "hf mf chk" usbcommand package, this script has not been working. It now calls and gets the results back from the device.
...
CHG: changed the output listing to look like the other key-tables.
2016-10-17 17:20:33 +02:00
iceman1001
4ce2037b2a
ADD: found some more keys on the web
2016-10-17 13:16:27 +02:00
iceman1001
da1f16d6ef
CHG: increased debug output for Em410x
2016-10-16 21:50:41 +02:00
iceman1001
2a1a6aa382
FIX: "hf legic write" - removed a warning message and made the overwrite question working.
2016-10-14 16:39:38 +02:00
iceman1001
1f247f6ac6
ADD: "hf legic wipe" - it autodetects tagtype and fills all bytes from offset 7 to end with zeros.
...
Fills a legic tag memory with zeros. From byte7 and to the end.
Usage: hf legic wipe [h]
Options:
h : this help
Samples:
hf legic wipe
2016-10-14 15:23:20 +02:00
iceman1001
25cb718daf
FIX: this should remove a warning.
2016-10-10 21:55:18 +02:00
iceman1001
4697964f6a
CHG: "script run emlu2dump" now can read old legic hex-ascii dumps. (with spaces) and convert to a binary file
...
CHG: "script run emlu2html" now can read old legic hex-ascii dumps. (with spaces) and convert to a generic html file
These changes makes it easier to for old legic dumps to be used with the new "legic dump/restore/eload/esave" commands
2016-10-10 10:59:16 +02:00
iceman1001
f9eeab99a4
chg: textual changes.
2016-10-09 16:04:31 +02:00
iceman1001
564c9ae2b6
FIX: increased time-out to match 2.7sec it takes to write 256bytes.
2016-10-09 15:49:59 +02:00
iceman1001
539fd59ebe
CHG: "hf legic write" - now writes on the limits better.
...
CHG: "hf legic restore" - now restors :)
CHG: "hf legic rdmem" - now has a nice offset row above the read data. try: 'hf legic rdmem 0 100'
2016-10-09 15:41:31 +02:00
iceman1001
367996567b
CHG: "hf legic restore" - added a filesize and cardsize check
2016-10-08 19:25:23 +02:00
iceman1001
cd79d97223
CHG: syntax suger
2016-10-08 19:14:35 +02:00
iceman1001
f9b5377fd0
CHG: reordered the "hf search" internal checks. The iclass check takes 4.5sec to time-out...Incredible slow to identify.
2016-10-08 19:14:09 +02:00
iceman1001
5b9fb6f454
REM: "hf legic load" has been removed. It doesnt have a purpose anymore.
...
REM: "hf legic save" has been removed. It doesnt have a purpose anymore.
CHG: "hf legic restore" started with the logic for the restore. Some compares and write to tag left.
2016-10-08 19:10:46 +02:00
iceman1001
59fc313d99
CHG: help text
2016-10-07 20:49:26 +02:00
iceman1001
c2ab5e8c4e
FIX: "hf list legic" annotation now correct prints byte and value for "legic write" command
2016-10-07 20:23:57 +02:00
iceman1001
b816886806
FIX: one send command bug fixed. Turns out that uint16_t is too small for 21/23bits size. Who figured?
2016-10-07 19:11:38 +02:00
iceman1001
f0fa663814
CHG: "hf legic write" got a make over in how its called. Now called with 'offset' and 'data'
...
'hf legic write o 10 d 11223344' - this will write 4 bytes (0x11,0x22,0x33,0x44) to tag from offset 10 (0x0A)
2016-10-07 11:58:14 +02:00
iceman1001
ac42d5be85
chg: syntax suger
2016-10-07 00:18:02 +02:00
iceman1001
1bf1db845f
CHG: syntax suger
2016-10-07 00:17:18 +02:00
iceman1001
f6e01a3493
Renamed the calccrc8 functions and command.
2016-10-07 00:14:02 +02:00
iceman1001
5a08545794
ADD: added a compiling flag -DHAS_512_FLASH i common/Makefile.common, to be used for PM3 devices with 512KB. Original commit from @hewitt
2016-10-07 00:12:09 +02:00
iceman1001
77e1bab94a
REM: "hf legic writeraw" has been removed.
...
FIX: "hf legic eload" uploads now correct to device mem.
2016-10-06 19:34:53 +02:00
iceman1001
0e8cabed8d
ADD: "hf legic eload" - Load binary file to emulator memory. Use "h" for help text
...
ADD: "hf legic esave" - Save emulator memory to binary file. Use "h" for help text
2016-10-06 19:13:23 +02:00
iceman1001
9015ae0f5d
CHG: "hf legic dump" now automatically detects tagtype and dumps accordingly.
...
CHG: still #define codestyle should it be with or without semicolons?
2016-10-05 22:58:06 +02:00
iceman1001
00271f774a
FIX: undeclared var on deviceside,
...
FIX: "hf legic dump" is almost there.
2016-10-05 22:07:32 +02:00
iceman1001
633d068682
CHG: command name changes..
...
old "hf legic info" is now "hf legic reader"
old "hf legic read" is now "hf legic rdmem"
old "hf legic decode" is now "hf legic info"
ADD: new command "hf legic dump", which will autodetect tagtype and dump all mem to a binary file.
2016-10-05 21:42:13 +02:00
iceman
f8f62cebc6
CHG: execution mode
2016-10-05 17:57:01 +02:00
iceman
77e72e8b1b
CHG: execution mode
2016-10-05 17:56:44 +02:00
iceman1001
c15e07f11d
CHG: making timings a bit tighter == faster read of tag. Like 1ms for whole tag.
...
FIX: off-by-one bug in read-byte-loop.
2016-10-04 23:08:39 +02:00
iceman1001
e1a0ed65ff
FIX: forgot a LEN in print message.
2016-10-04 21:42:56 +02:00
iceman1001
1daa1226fd
CHG: reading a complete MIM1024 takes about 2.8sec. This timeout is changed to 3sec now.
2016-10-04 21:41:21 +02:00
iceman1001
7a8db2f678
CHG: "hf legic read" - increased timeout values client side, reading MIM1024 takes a bit of time
2016-10-04 21:26:19 +02:00
iceman1001
86087eba00
Textual changes in helptext. Still no clear.
2016-10-04 18:43:11 +02:00
iceman1001
7bc3c99e7e
CHG: "hf legic write" started to change this command to the updated code
2016-10-04 18:05:55 +02:00
iceman1001
77a689dbeb
CHG: revert legiccrc8 to old algo.
...
CHG: "hf legic decode" now loads EML memory
CHG: legic timings is better.
2016-10-04 00:07:07 +02:00
iceman1001
0b0b182fe2
CHG: changed to use BigBuff_Eml memory instead of big_buff_malloc.
...
CHG: downloading eml memory from device should use uint's
CHG: "hf legic read" has a different printing. It now prints 32bytes / row
2016-10-03 23:24:59 +02:00
iceman1001
5660920679
FIX: the "hf list legic" on MIM1024 wrapped around readingbyte 255 due to a too small varible size. Causing the upperbits to drop silently
2016-10-02 12:29:18 +02:00
iceman1001
61f97ca7ad
CHG: annotation now only print relevant help text given selected protocoll.
2016-09-29 21:37:19 +02:00
iceman1001
c649c43389
CHG: finally, the ticks timer does what it is supposed to do. 32bits and working.
2016-09-29 21:36:43 +02:00
iceman1001
fabef615ec
CHG: added addresize to legic select struct.
...
CHG: TIMER, it turns out the TC0, TC1 and TC2 is only 16bit. So adjust to use two clocks to get a 32bit timer.
CHG: code clean up in legic device side. consistency with variable names..
2016-09-29 17:43:39 +02:00
iceman1001
ce1cccd697
UPD: got the latest updates (@badboy) from @zhovner mfdread.
2016-09-29 14:18:21 +02:00
iceman1001
f2ba788536
ADD: @zhovner 's mfd file parser https://github.com/zhovner/mfdread Looks really nice the parsed fileoutput.
2016-09-29 12:23:35 +02:00
iceman1001
a39944216d
CHG: a select_legic function with structs and stuff and
2016-09-29 12:23:09 +02:00
iceman1001
d7e24e7c5f
CHG: 'hf list legic' doesn't print the parity now.
...
CHG: 'hf legic read' the device side timings is starting to look much better. HUGE Thanks to @will-rbnt for endless checks and logic analyser feedback. Without his effort this would not work. What does work? We can now use ANY IV in legic. The PM3 Master version is flawed, will only work with IV=0x55.
---still broke--- my crc implementation.. I know I'm about to look into it.
2016-09-28 21:37:08 +02:00
iceman1001
323e05cc20
CHG: added the verbose flag, to make the output in "hf search" lesser.
2016-09-26 21:39:04 +02:00
iceman1001
3c6542087e
CHG: @ikarus23 removed all missleadning warnings for GCC6.1.1.
2016-09-26 21:38:19 +02:00
iceman1001
3e750be37c
ADD: started to add a legic detection to "HF SEARCH"
2016-09-26 20:01:23 +02:00
iceman1001
f1f7430ae0
CHG: removed the ubuntu build variable which is no needed anymore to build on ubunutu.
...
CHG: Some warnings in cmdhflegic.c is solved.
2016-09-26 17:19:35 +02:00
iceman1001
7c91c8bf24
CHG: and now that I do actually check on bitlenght, I can get a better annotation yet again. Looking at it raises a question, acknowledge is 0x19 or 0x39, they just don't match up with tagtype identification of 0x0D, 0x1D, 0x39. I'll need to look at a 1024 tags response in a trace with a valid reader.
2016-09-26 12:58:11 +02:00
iceman1001
faabfafe30
CHG: using bitsend to determind the legic annotation in "hf list legic" makes false positives much less.
2016-09-26 12:26:37 +02:00
iceman1001
1c59e80aba
CHG: fix a "indent" warning.
2016-09-26 11:01:33 +02:00
iceman1001
7d0efb37d8
CHG: the "indent" software warns about some assingments. I've tried to fix them.
2016-09-26 10:37:00 +02:00
iceman1001
f885043422
FIX: "hf 14a read" / "hf mf *" / "hf mfdes info" and failure when calling these commands serveral times in row.
...
For long transactions the sspclock compare with >1 instead of >=1 .. Now the timer resets properly.
CHG: use some #define constants for iso-commands.
2016-09-23 21:28:07 +02:00
iceman1001
22f4dca88c
CHG: extracted some timers functionality, to get unified access to a timer/clock which counts in ticks. Moved stuff from util.c
2016-09-21 19:03:32 +02:00
iceman1001
4490a47690
ADD: some new mifare key found,
2016-09-20 23:20:27 +02:00
iceman1001
87342aadbc
CHG: adjusted timing according to @sentinel 's traces
2016-09-14 16:18:04 +02:00
iceman1001
111c6934d4
CHG: Small steps, the waiting time between frames was unclear. At least now the tags answers to a readbyte command after the setup phase.
2016-09-12 09:19:49 +02:00
iceman1001
76471e5d17
CHG: reverted back from the idea of measureing in (us) microseconds, the timer is too raw, gives 10-15us delays. Now we are measuring ticks, which is (1 us = 1.5ticks)
...
like it was before. ie: 80us = 80*1.5 = 120ticks.
2016-09-11 11:14:12 +02:00
iceman1001
f72669f366
ADD: since the client now calls legic prng, this is needed here too.
...
CHG: the OS X QT4 vs QT5 detection. NOT fixed yet.
2016-09-09 11:58:53 +02:00
iceman1001
ad5bc8cc8c
In my attempts to make the LEGIC code better, its not working now. Timings if off.
...
CHG: switching to US clock.
CHG: better trace annotation for legic
CHG: Legic prng can now give a x bits in once.
2016-09-09 11:56:20 +02:00
iceman1001
1b12afbd9f
CHG: better annotation for 'legic'
2016-09-07 12:36:46 +02:00
iceman1001
e619ddc071
FIX: Better legic annotation, show which byte was targeted during read and write commands.
2016-09-03 12:20:12 +02:00
iceman1001
b98827ffc3
FIX: IV now is trunckated to 7bits in 'hf legic read,write, writeraw'
...
FIX: IV LSB bit is always set, in 'hf legic read,write, writeraw'
2016-09-03 12:19:05 +02:00
iceman1001
c71c5ee156
ADD: started to add tracelog in legic
...
ADD: remake of legic codebase.
ADD: started with a annotation for LEGIC in 'hf list'
2016-09-02 16:25:54 +02:00
iceman1001
5b4664e79f
CHG: Adding clarity to the command helptext.
2016-09-01 20:36:42 +02:00
iceman1001
d801514d88
CHG: Supressing output for LF or HF antenna values if zero, in 'hw tune' command
2016-09-01 20:36:10 +02:00
iceman1001
22635d611e
FIX: Only need to print a uint32_t,
2016-09-01 16:10:25 +02:00
iceman1001
56d0fb8e4d
FIX: bug in nextwatch demod, which if the found psk bits was smaller than the preamble the client crashed.
...
REM: removed some debugstatements
2016-09-01 16:09:31 +02:00
iceman1001
3fc01243b0
CHG: A repaint the plot window should be done to make sure its visual.
2016-08-31 19:24:18 +02:00
iceman1001
4c543dbd3f
ADD: added a simple averging filter function. input parameter K, can be 1 to 8
...
ref: http://www.edn.com/design/systems-design/4320010/A-simple-software-lowpass-filter-suits-embedded-system-applications
2016-08-29 20:29:31 +02:00
iceman1001
7aa24806f4
FIX: the check for formatlen was wrong.
...
Still missing the other formats, only 26bit in this one.
2016-08-26 22:31:45 +02:00
iceman1001
ffa306de61
CHG: starting to add the legic changes.. *work in progress*
2016-08-26 17:19:27 +02:00
iceman1001
89603cbddc
FIX: minor adjustments to 'lf awid bruteforce'
...
FIX: making the 'lf hid bruteforce' to work the same way as the awid one..
2016-08-26 17:18:48 +02:00
iceman1001
f121b478a1
FIX: 'lf awid bruteforce' cleaning up all debug messages
2016-08-26 16:35:30 +02:00
iceman1001
ba1324a5fe
some text changes.
2016-08-24 14:58:50 +02:00
iceman1001
760157f50b
CHG: added a verification to see if the found candidate key was able to validate against tag. If not ok, start darkside attack again.
2016-08-24 14:10:30 +02:00
iceman1001
02d5a58388
CHG: Changed the number of times the call to prng_successor is called.
2016-08-24 12:32:05 +02:00
iceman1001
39d43ccc21
CHG: syntax suger.
2016-08-24 12:31:09 +02:00
iceman1001
2c9e30908c
CHG: updated Reveng version from 1.4.0 -> 1.4.4 .
...
---snippet from their update log:
1.4.4 27 July 2016
Added 5 new algorithms, CRC-8/AUTOSAR, CRC-8/OPENSAFETY, CRC-16/OPENSAFETY-A, CRC-16/OPENSAFETY-B and CRC-32/AUTOSAR from the CRC Catalogue.
Added a build option to verify the order of the preset and alias tables at compile time.
1.4.3 14 July 2016
Added algorithm CRC-16/CMS from the CRC Catalogue.
1.4.2 8 July 2016
Added algorithm CRC-16/PROFIBUS from the CRC Catalogue.
1.4.1a 29 June 2016
Fixed a regression that caused the Windows release to crash on older systems.
1.4.1 27 June 2016
-P sets the Width value just like -k.
pcmp() quickly returns when the comparands are identical.
Added resources for the Windows executable.
2016-08-21 20:51:29 +02:00
iceman1001
bc908d8f9d
ADD: Mifare Desfire defines
2016-08-14 17:38:54 +02:00
iceman1001
af17926620
chg; syntax suger
2016-08-14 17:38:11 +02:00
iceman1001
f2abf6732b
help text adjustments
2016-08-14 17:11:42 +02:00
iceman1001
ab74872d40
ADD: added a sanity check in T55x7 commands info/trace/detect against useing the commands when device is in offline but user didn't use '1' in arguments.
2016-08-14 17:04:40 +02:00
iceman1001
7e08450dcc
add: annotage Mifare Desfire. from 3102c1bae3 (diff-93cfa90a992ea759349344d0de98029e)
...
Thanks @johannesStoye
2016-08-14 16:29:39 +02:00
iceman1001
2b6ffe75a8
chg: remove a char..
2016-08-10 16:29:23 +02:00
iceman1001
4ab54914e3
CHG: more struct errors.. my bad,
2016-08-10 16:28:23 +02:00
iceman1001
31cf804877
CHG: removed some debug statements, added another. Change the crapto1.c, lets see if the special attack works better now against chinese clones.
2016-08-10 16:25:56 +02:00
iceman1001
823ad2e186
CHG: minor code cleaning in 'hf 14a reader'
2016-08-10 16:24:49 +02:00
iceman1001
56f1aaa234
CHG: on a slow usb connection it seems the pingcmd which stops the bruteforce on deviceside doesnt get there. Lets send three pings to make sure the device gets it.
2016-08-10 16:23:59 +02:00
iceman1001
6067df30c5
FIX: at least now the special zero parity attack, repeats and doesn't crash. However it doesn't find the key either :(
2016-08-10 10:55:29 +02:00
iceman1001
86db8973b0
CHG; still looking at 14b, this time started to look at the tracelog times not working.
2016-08-09 23:13:18 +02:00
iceman1001
59e933fc3f
started fixing the paritiy == 0 special attack against chinese clones with bad prng, which hasnt been working for ages.
2016-08-09 23:11:07 +02:00
iceman1001
05442fa6f7
fix: wrong spelling
2016-08-09 12:15:26 +02:00
iceman1001
f5291a6ce1
FIX: Travis CI complains about missing stdbool.h includes
2016-08-09 12:11:11 +02:00
iceman1001
10c4231ec7
ADD: 'lf awid brute' is now possible to give a starting cardnumber. if given, the bruteforce loops from it as a mid point. Testing one step up, then one step down until it reaches 65535 and 0.
...
CHG: 'lf awid brute' inputs are now changed, take notice to new format.
2016-08-09 11:56:06 +02:00
iceman1001
3d4207f3b6
syntax suger
...
chg: added clearCommandBuffer(); before calls to sendcommand.
2016-08-09 09:12:16 +02:00
iceman1001
8a5b3c2a45
CHG: textual fixes in help text
...
CHG: better exit message for 'lf awid bruteforce'
2016-08-09 09:10:26 +02:00
iceman1001
9bfd93ec15
FIX: delay was parsed incorrect into a uint8_t...
...
CHG: help text fixed
2016-08-08 22:17:15 +02:00
iceman1001
934dfd728d
ADD: Added a delay in ms to 'lf awid brute' Thanks to @crayon for the idea.
2016-08-08 22:09:51 +02:00
iceman1001
471f89b8bd
FIX: the cmdline parsing was a bit too hard. Thanks to @crayon for pointing out there were a bug here.
2016-08-08 21:27:53 +02:00
iceman1001
d9ed4e1914
ADD: J-Run's 2nd phase tool mf_key_brute ref: https://github.com/J-Run/mf_key_brute Estimated time to search keyspace is ~18min.
...
J_Run's 2nd phase of multiple sector nested authentication key recovery
You have a known 4 last bytes of a key recovered with mf_nonce_brute tool.
First 2 bytes of key will be bruteforced
Usage: hf mf keybrute [h] <block number> <A|B> <key>
options:
h this help
<block number> target block number
<A|B> target key type
<key> candidate key from mf_nonce_brute tool
samples:
hf mf keybrute 1 A 000011223344
2016-08-08 17:49:30 +02:00
Alexis Green
170e7c9c51
FIX: erroneous semicolon
2016-08-07 20:07:25 -07:00
iceman1001
b62cbadb61
CHG: fixes to match the new arguments to the darkside attack (keytype A|B and blocknumber) in mifare_autopwn.lua script.
2016-08-07 21:19:11 +02:00
iceman1001
16658b1ff1
CHG: moved some TEA crypto stuff from 14b into analyse.
2016-08-07 21:08:17 +02:00
iceman1001
5def0b3c74
CHG: increased the script-filename column width from 16 to 21.
2016-08-07 21:05:09 +02:00
iceman1001
a152dea7b4
textual changes.
2016-08-07 18:50:25 +02:00
iceman1001
fa5118e730
CHG: some calyspo stuff
2016-08-04 21:57:40 +02:00
iceman1001
f0e183ece4
CHG: marshmellow42 's improved "hf mf sim x"
2016-08-04 21:57:18 +02:00
iceman1001
52eeaef568
CHG: moved a defince arraylen into util.h and changed to uppercase.
2016-08-04 21:54:11 +02:00
iceman1001
df007486f5
ADD: @donwan581 select keytype for the darkside attack.
2016-08-04 21:51:26 +02:00
iceman1001
26778ea772
FIX: coverity scan 133850, again. Why on earth did the 7 come from. I removed it.
2016-08-03 12:09:16 +02:00
iceman1001
c5d886170c
fix: COVERITYSCAN 133871, fix one part, breaking another. shouldnt have changed to uint8_t since it can never be negative.
2016-08-03 11:57:40 +02:00
iceman1001
e8fecd72bc
FIX; coverity scan 133850, & operation should keep only topbit of lower nibble.
...
CHG: tabs fixed
2016-08-03 10:01:37 +02:00
iceman1001
a28d34f407
Coverity Scan 133850, need to ask @jason about this one.
2016-08-03 09:32:07 +02:00
iceman1001
01629305d8
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-08-03 09:30:01 +02:00
iceman1001
8a8de2cb6d
FIX: 133853, If you have 3items in a array, don't start with index 4 or 3, mental note to self, stop coding when you are tired.
2016-08-03 09:28:54 +02:00
Alexis Green
987c59849e
FIX: CoverityScan 123358 and 133864 - Unchecked return value
2016-08-02 22:44:36 -07:00
Alexis Green
3f5bcc3b92
FIX: CoverityScan 121362 - Pointer to local outside scope
2016-08-02 16:12:44 -07:00
iceman1001
80920fac96
FIX: forgot a semicolon
2016-08-03 00:42:23 +02:00
iceman1001
fd9212e183
FIX: CoverityScan 133857, cast to uint32_t will stop eventual problems. However its a uint_16 so it shouldnt be a problem to start with.
2016-08-03 00:15:26 +02:00
iceman1001
34c81fe01c
FIX. COVERITYscan 133860, initialize to zero. This function is still not working but at least now it doesnt crash the client.
2016-08-03 00:13:33 +02:00
iceman1001
5fe0a11dfe
FIX: CoverityScan, 1333853, out-of-bounds, well, if I have 3 items in a array, don't start reading 4...
2016-08-03 00:10:21 +02:00
Alexis Green
e31a0f736e
FIX: LEGIC - potential stack corruption calculating CRC from user input
2016-08-02 14:10:33 -07:00
Alexis Green
0892708119
FIX: CoverityScan 123465 - Resource leak
2016-08-02 13:57:44 -07:00
Alexis Green
5147ec6959
CHG: LEGIC - allow offline mode due to existing offline command
2016-08-02 13:51:58 -07:00
iceman1001
e719470c46
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-08-02 16:06:40 +02:00
iceman1001
5f7e30f8d5
FIX: CoverityScan 133858 -uninitialized data
2016-08-02 16:05:50 +02:00
iceman1001
aeb128e2bb
chg: another way of checking a array for NULL
2016-08-02 16:04:57 +02:00
Alexis Green
6e321dd8f3
Fixing warning:
...
warning: ignoring return va 'scanf', declared with attribute warn_unused_result [-Wunused-result]
2016-08-01 13:03:46 -07:00
Alexis Green
22e31cd087
Fixing clang compilation warning
...
warning: shifting a negative signed value is undefined [-Wshift-negative-value]
2016-07-31 22:35:16 -07:00
iceman1001
9f52c9db28
FIX: removed a compiler warning, the stringlen is not used anymore.
2016-07-31 22:03:46 +02:00
iceman1001
af4308b97b
CHG: Moved some includes, defines, structs from .c into header file.
2016-07-31 22:00:49 +02:00
iceman1001
cc4c8fd6cf
FIX: getting rid of a compiler warning message.
2016-07-31 21:59:29 +02:00
Alexis Green
415e9f00d5
Adding a 'recoverpw' command for T55xx to try to recover corrupt password written by a handheld cloner by fiddling with bits in the expected password.
2016-07-31 12:33:03 -07:00
iceman1001
a0c7eea77a
CHG: moved out some help-texts into its own usage-functions.
2016-07-31 11:37:19 +02:00
iceman1001
00abc7c1ab
CHG: Moved a 'include' statement to header file
2016-07-30 19:37:15 +02:00
iceman1001
955228691e
REM: cleaning up some commented code.
2016-07-30 19:36:48 +02:00
iceman1001
d0724780ab
FIX: Found a minor bug in 'LF CMDREAD' where it on device side didn't compare with the right char 'h' instead of 'H'. Re-wrote that whole part anyway, I changed periods to be max 0xFFFF in length, doubtful that a zero or one delay will be bigger than 65535...
2016-07-30 19:30:53 +02:00
iceman1001
dc6c90c376
CHG: The jablotron demod now deals with the strangeness of hex symbols A-F in cardid the same way a reader prints it.
2016-07-29 23:30:40 +02:00
iceman1001
dae31af21e
ADD: Binary Encoded Digit -> Decimal
...
ADD: Decimal -> Binary Encoded Digit
Ie
decimal 2345 becomes 0x2345
and
hex 0x2345 becomes decimal 2345
2016-07-29 23:29:37 +02:00
iceman1001
514ddaa2ff
CHG: help text changes in cmdlfjablotron.c
...
CHG: increase byte size to uint16_t in crc.c CRC16Legic
2016-07-29 20:58:52 +02:00
iceman1001
f5538c1c4e
chg: textual change.
2016-07-29 20:53:56 +02:00
iceman1001
ddbe76d3c6
CHG: redundant 'return' statement removed
2016-07-29 14:32:13 +02:00
iceman1001
29ce214c65
CHG: better printing output of card ID
...
CHG: better detecting in preambl. 16bits with 1, and a zero bit. Also cleared this topbit when cloneing and simulating.
2016-07-29 14:31:39 +02:00
iceman1001
8ae9b358f8
CHG: textual changes to help text.
...
CHG: removed the 'd' as input, the clone/sim commands is simpler.
CHG: printing of card ID is now zero padded.
2016-07-29 13:46:05 +02:00
iceman1001
6c28395106
ADD: LF JABLOTRON functionality. with clone/sim and detection in LF SEARCH.
...
CHG: removed no-existing crc8ja code
FIX: a check in ASKbiphaseDemod to make sure graphbuff is not empty.
2016-07-29 11:04:12 +02:00
iceman1001
e92948c60c
FIX: that OEM variable that is unused.
2016-07-28 22:22:34 +02:00
iceman1001
ba4ad25b37
FIX: Fixed some warnings I didn't take notice off.
...
- memcpy should have been "memset"
- forgot to add function declaration into header file.
2016-07-28 22:17:44 +02:00
iceman1001
758f5ee3e5
CHG: removed the wiegand converting, since I'm not happy with how its implemented. This is rework in progress.
2016-07-28 21:50:54 +02:00
iceman1001
1e2bb9c9f4
CHG: trying to figure out why I can't get the seconds out..
2016-07-28 21:48:53 +02:00
iceman1001
53b3c3e816
ADD: Added some new analyse functions like CHKSUM ADD/SUBTRACKT with one's complement
2016-07-28 21:47:52 +02:00
iceman1001
c827ffb098
spacing..
2016-07-28 21:46:27 +02:00
iceman1001
3e134b4c20
CHG: merged the forum user @jason 's fixes to LEGIC. *UNTESTED*
...
CHG: changed the CRC implementations.
2016-07-28 21:41:44 +02:00
iceman1001
83dad64b91
ADD: some new usb commmands from EMV, and for LEGIC.
2016-07-28 21:16:02 +02:00
iceman1001
91d4cda48b
CHG: removed the linking to radixsort.c
2016-07-28 20:42:46 +02:00
iceman1001
4ccdc189bd
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-07-28 20:41:54 +02:00
iceman1001
1f1d974f02
CHG: added a comment
2016-07-23 18:33:30 +02:00
iceman1001
2de9622f0e
CHG: some clearing of memory
2016-07-23 18:31:20 +02:00
k02a
39814f19ab
Addition of depending library flags...
...
Inclusion of termcap library or ncurses library solves the compilation errors on some Linux distributions, for example a currently updated Slackware Linux 14.2 x86_64 vanilla distribution (which I run).
Output:
bash-4.3# make -C proxmark3
[...]
g++ -DQT_SHARED -I/usr/lib64/qt/include/QtGui -I/usr/lib64/qt/include/QtCore -Wall -O3 obj/proxmark3.o obj/uart.o obj/util.o obj/sleep.o obj/nonce2key/crapto1.o obj/nonce2key/crypto1.o obj/nonce2key/nonce2key.o obj/nonce2key/crypto1_bs.o obj/loclass/cipher.o obj/loclass/cipherutils.o obj/loclass/des.o obj/loclass/ikeys.o obj/loclass/elite_crack.o obj/loclass/fileutils.o obj/mifarehost.o obj/parity.o obj/crc.o obj/crc16.o obj/crc64.o obj/iso14443crc.o obj/iso15693tools.o obj/data.o obj/graph.o obj/ui.o obj/cmddata.o obj/lfdemod.o obj/cmdanalyse.o obj/cmdhf.o obj/cmdhf14a.o obj/cmdhf14b.o obj/cmdhf15.o obj/cmdhfepa.o obj/cmdhflegic.o obj/cmdhficlass.o obj/cmdhfmf.o obj/cmdhfmfu.o obj/cmdhfmfhard.o obj/cmdhfmfdes.o obj/cmdhftopaz.o obj/cmdhw.o obj/cmdlf.o obj/cmdlfio.o obj/cmdlfhid.o obj/cmdlfawid.o obj/cmdlfem4x.o obj/cmdlfhitag.o obj/cmdlfti.o obj/cmdparser.o obj/cmdmain.o obj/cmdlft55xx.o obj/cmdlfpcf7931.o obj/cmdlfviking.o obj/cmdlfpresco.o obj/cmdlfpyramid.o obj/cmdlfguard.o obj/cmdlfnedap.o obj/pm3_binlib.o obj/scripting.o obj/cmdscript.o obj/pm3_bitlib.o obj/aes.o obj/protocols.o obj/sha1.o obj/sha256.o obj/cmdcrc.o obj/reveng/preset.o obj/reveng/reveng.o obj/reveng/cli.o obj/reveng/bmpbit.o obj/reveng/model.o obj/reveng/poly.o obj/reveng/getopt.o obj/tea.o obj/prng.o obj/radixsort.o obj/bucketsort.o obj/proxgui.o obj/proxguiqt.o obj/proxguiqt.moc.o -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm ../liblua/liblua.a -ldl -L/usr/lib64/qt/lib -lQtGui -lQtCore -o proxmark3
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetstr'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tputs'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `BC'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetent'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetflag'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgoto'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `UP'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `tgetnum'
/usr/lib64/gcc/x86_64-slackware-linux/5.3.0/../../../../lib64/libreadline.so: undefined reference to `PC'
collect2: fel: ld returnerade avslutningsstatus 1
Makefile:172: receptet för målet "proxmark3" misslyckades
make[1]: *** [proxmark3] Fel 1
make[1]: Lämnar katalogen "/home/github/iceman1001/proxmark3/client"
Makefile:12: receptet för målet "client/all" misslyckades
make: *** [client/all] Fel 2
make: Lämnar katalogen "/home/github/iceman1001/proxmark3"
2016-07-22 13:52:12 +02:00
k02a
e13ccb6b3f
Inclusion of unused oem variable
...
When compilation of the current source code, I am getting the warning of setting the unused variable "oem". I have included this, along with minor spelling corrections/language updates in the menu system.
gcc -std=c99 -O3 -mpopcnt -march=native -g -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall -DHAVE_GUI -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED -c -o obj/cmdlfhid.o cmdlfhid.c
cmdlfhid.c: I funktion "CmdHIDWiegand":
cmdlfhid.c:292:11: varning: variabeln "oem" sätts men används inte [-Wunused-but-set-variable]
uint32_t oem;
^
Before:
pm3 --> lf hid wiegand 0 101 2001
HID 26 bit | FC: 101 CN: 2001 | Wiegand Code: 0000002004CA0FA2
[...]
HID 40 bit | FC: 101 CN: 2001 | Wiegand Code: 0000000000000FA2
After:
pm3 --> lf hid wiegand 0 101 2001
HID 26 bit | OEM: 0 FC: 101 CN: 2001 | Wiegand code: 0000002004CA0FA2
[...]
HID 40 bit | OEM: 0 FC: 101 CN: 2001 | Wiegand code: 0000000000000FA2
2016-07-22 09:49:02 +02:00
iceman1001
36e78d669c
CHG: added some includes / libarys for HomeBrew AND QT5 compiling on MAC OSX. They are commented away, but if you need it replace the other two lines and uncomment.
...
All credit to @koalazak [ref] ed1525805c
2016-07-21 17:26:17 +02:00
iceman1001
81ba7ee837
CHG: minor changes to code, mostly newlines, change a value to #DEFINE END_OF_LIST_MARKER
...
CHG: GOOD_BYTES_REQUIRED changed from 28 > 13, makes it nonce collecting part faster, but the fail rate goes also up. its a value to fiddle with.
2016-07-20 12:02:08 +02:00
iceman1001
9d7e9935af
syntax suger
2016-07-07 02:10:09 +02:00
iceman1001
2d1885f1d1
CHG: Now it prints the correct UID bytes etc.
2016-07-07 02:09:16 +02:00
iceman1001
e0530dbcec
Applied @icsom 's fixes from: b577582490
2016-06-22 09:33:21 +02:00
iceman1001
ac36c57789
FIX: this should fix the compilation error for MAC users.
2016-06-20 13:32:22 +02:00
iceman1001
3c61ee4338
chg: added to print the author.
2016-06-20 13:31:51 +02:00
iceman1001
180ec86ef0
@marshmellow42 's fix the AskEdgeDetect cleaning tool. de53156e1e
2016-06-20 13:26:45 +02:00
iceman1001
f3cbb7bc7b
CHG: wrong minor version value. 0x1 -> 0x0 for desfire ev1 detection
2016-06-15 09:22:55 +02:00
iceman1001
d118e70f5d
CHG: Thanks to @Mackwa for looking up the expected Desfire EV2 major version byte.
2016-06-14 10:21:52 +02:00
iceman1001
5558d935bd
ADD: added the skeleton for analysing dates in a given byte array.
2016-06-13 21:55:52 +02:00
iceman1001
288c6845a7
ADD: added some identification on between old Desfire, Desfire EV1 and Desfire EV2
...
DEL: removed two old des-commands files which wasn't used.
2016-06-13 19:05:50 +02:00
iceman1001
ddaecc0826
FIX: this corrects the bug when running "hardnested" serveral times a faulty wrongsized key is returned. Just needed to clear the variable every run.
2016-05-31 13:11:04 +02:00
Pavel Zhovner
57eba86be6
Typo in hf 14a sim help
2016-05-26 20:10:03 +03:00
Iceman
26922aefd7
Update cmdlfawid.c
...
FIX: when writing the timeout was triggered, Increased it to make the writing part stable.
2016-05-21 09:42:41 +02:00
iceman1001
2fdc489bb4
CHG: printing of progress dots is better now.
2016-05-19 12:47:23 +02:00
iceman1001
890ae3dd43
ADD: added a comment about the Q5, which I think is wrong in these commands. Needs to be tested.
2016-05-16 21:40:19 +02:00
iceman1001
a45882e20a
ADD: added 'lf io sim <version> <facility.code> <cardnumber>' to the sim command
...
ADD: added 'lf io clone <version> <facility.code> <cardnumber>' to the clone command
2016-05-16 21:39:40 +02:00
iceman1001
6648776f2a
CHG: added the possibility to "remagic" the new found Mifare Ultralight tags, which answers to chinese backdoor commands for uid change.
...
The script now deals with to different kind of tags. Mifare Classic 1k gen1 and Mifare Ultralight gen1 (7bytes uid)
-Classic will get UID: 01 02 03 04
-Ultralight will get UID: 53 80 71 02 00 D9 80
2016-05-15 19:27:04 +02:00
iceman1001
8fd9bfb0e3
ADD: added the possiblity to use AWID formatlength of 26 and 50.
...
'LF AWID SIM'
'LF AWID CLONE'
'LF AWID BRUTE'
2016-05-14 22:40:04 +02:00
iceman1001
6a4271d186
CHG: Changed cardnumber printing from %d (signed) to %u (unsigned) for AWID50, it now prints correct in all cases. Thanks to @ntk for reminding me about it.
2016-05-14 14:34:35 +02:00
iceman1001
204b708424
ADD: AWID 50bit demod, thanks to @FrancoisM and @ntk
2016-05-13 22:34:49 +02:00
iceman1001
812513bf90
ADD: Added a new main command group "analyse", first one is the find the missing XOR in a LCR, it was a python script under /tools/xorfind.py
2016-05-10 15:30:46 +02:00
iceman1001
8085377413
CHG: output when finding key it the same as from the client.
2016-05-10 07:51:05 +02:00
iceman1001
fed1227777
CHG: just made the autopwn script main loop a bit more verbal
2016-05-10 07:40:27 +02:00
iceman1001
df82844c05
FIX: more paths for readline and Mac Os X
2016-05-06 19:52:04 +02:00
iceman1001
b01e7d206d
FIX: a define which was wrong
2016-05-06 19:30:43 +02:00
iceman1001
9d590832a1
FIX: This tries to fix the memalign issued on MAC OS X, which it doesn't have. However its standard Malloc is already 16byte memaligned.
...
ref: http://stackoverflow.com/questions/196329/osx-lacks-memalign
2016-05-06 19:09:29 +02:00
iceman1001
0fa87186cf
CHG: hardnested needs malloc.h, which on Darvin (Mac OS X) needs a path to.
2016-05-06 19:01:33 +02:00
iceman1001
e75bc417f1
ADD: added a lua script which calculates mifare keys based on a uid diversification
2016-05-06 10:19:15 +02:00
iceman1001
04da5cd92b
FIX: it seem the fcntl returns -1,.. which made the flasher fail.
2016-05-05 21:13:12 +02:00
iceman1001
532bcd7145
CHG: Nedap demod, now verifes with first parity.
2016-05-04 10:34:16 +02:00
iceman1001
b85385a058
CHG: removed a warning about unused variable. Lets see if perror works.
2016-05-03 09:16:05 +02:00
iceman1001
c71f4da9bc
CHG: increased the preamble
...
CHG: from inverted to non-inverted. 2 of the forum samples is non-inverted.
Block 0: 00150080
2016-05-02 21:21:43 +02:00
iceman1001
d34a0b0cc7
FIX: dual definitions of variable size
2016-05-02 15:15:06 +02:00
iceman1001
96faed2124
CHG: added the ASK/Biphase demod of signal for NEDAP demod.
...
ADD: 'LF SEARCH' now also checks for NEDAP.
2016-05-02 14:06:08 +02:00
iceman1001
56bbb25a41
ADD: started with a NEDAP demod, read, clone and sim functionality.
...
The encrypted part is not solveabled today.
2016-05-02 13:42:06 +02:00
iceman1001
ea1ee62e55
CHG: better helptext
2016-04-29 22:24:08 +02:00
iceman1001
ffeb77fdc6
CHG: the 14b is getting better, since I added the fpga waiting signaling I found in "14a emgetcmd" etc.
2016-04-29 22:23:32 +02:00
iceman1001
7bcddfabde
FIX: mental note to self, don't forget to adjust messages to new logic
2016-04-27 20:03:54 +02:00
iceman1001
a644fef0bb
FIX: Mental note to self, bitnumber 4 is used, not the value 4 which would be bitnumber 3... when deciding if request is REQB or WUPB
2016-04-27 19:54:29 +02:00
iceman1001
45c0c48c49
CHG: Just changed the order of printing, so the messagde FoundKey is printed last.
2016-04-27 11:22:17 +02:00
iceman1001
dccddaef77
CHG: "hf 14b sim" - Added the possibility to call it with a PUPI/UID. Sample: "hf 14b sim u 11223344"
2016-04-27 11:21:29 +02:00
iceman1001
fd3be901ea
removed commented code
2016-04-26 21:30:54 +02:00
iceman1001
c98ab35140
textual change.
2016-04-26 21:30:04 +02:00
iceman1001
a420e5c163
chg; no more crash when getting partial usb packages.
2016-04-25 23:15:12 +02:00
iceman1001
ed69e099a1
FIX: @Aczid suggested this to fix a Coverity scan warning.
2016-04-25 14:30:13 +02:00
iceman1001
18b90cce48
CHG: this fixes an annoying fault of not running CONNECT in raw command...
2016-04-24 21:44:19 +02:00
iceman1001
222bdb1cb3
Syntax suger
2016-04-24 21:43:38 +02:00
iceman1001
9965e0d1f8
CHG: this should remove a Coverity Scan warning.
2016-04-24 21:42:42 +02:00
iceman1001
c0afa86f75
FIX: this commit solves a sneaky bug in 'LF VIKING' commands. The getVikingBits dropped the highest byte in the uid while creating the datablocks for the clone.
...
ADD: added some extra message in debugmode when looking at viking tags.
2016-04-24 21:41:45 +02:00
iceman1001
21d359f68f
CHG: we don't want to assert inside the pm3 client.
...
CHG: better message when failed to find the key.
CHG: revert nonces check, 12 -> 100
2016-04-23 19:09:07 +02:00
iceman1001
1c38049bcb
CHG: commented away some of the debug printf statements in hardnested.
2016-04-23 18:33:27 +02:00
iceman1001
cd777a0545
FIX: Some Coverity Scan warnings. fread, not initialised etc etc
2016-04-23 18:23:46 +02:00
iceman1001
b9fc3e8eb7
RM: removed some old reference inside some old proggies...
2016-04-23 13:03:27 +02:00
iceman1001
2813c42f98
CHG: moved some params.
2016-04-23 13:02:51 +02:00
iceman1001
be6e909c5b
FIX: time printing, like difftime in MINGW enviroments needs to use 32b time.
2016-04-23 13:02:20 +02:00
iceman1001
9ea10847ea
CHG: timeing in chk keys,
2016-04-23 12:26:29 +02:00
iceman1001
fa0e0b109f
CHG: moved out some usage_methods for help texts.
...
CHG: added some time in the darkside, nested, hardnested, chk commands.
2016-04-23 12:18:34 +02:00
iceman1001
5dc8b8fe27
CHG: unified some text messaged.
2016-04-23 11:43:02 +02:00
iceman1001
d948e0d140
CHG: 'hf mf chk' now correctly tests to read key B, when we specify target keytype B or ?.
...
CHG: 'hf mf chk' now correctly init all sector keys to 0xFFFFFFFFFFFF, so it looks unified.
2016-04-23 11:32:37 +02:00
iceman1001
2e350b19f7
FIX: there were no "memfree" call, there were only "free"
2016-04-21 12:15:36 +02:00
iceman1001
3130ba4b21
ADD: added @azcid 's bitsliced BF solver for @piwi 's hardnested command. Awsume work! The original patch demanded some tweaking to work in mingw.
...
This is not tested for other systems so far.
2016-04-21 10:26:00 +02:00
iceman1001
f7c1a934d0
CHG: "hf 14a sim" now uses mfkey32 and mfkey32_moebius as methods to retrive the key in attack_mode.
2016-04-18 13:20:17 +02:00
iceman1001
6c84c90017
FIX: this fixes the "hf mf sniff l d f" command, which has been broken for a while. The cuid is correct used for decrypting.
...
FIX: The flushing of logentries.
ADD: "hf mf sniff" - added the sniffing of UID's with a uidlen of 10.
Whats left? The key is not always found even if we use the "mfkey64" approach.
ADD: added the parity_zero attack in "hf mf mifare". Still not working since piwi's changes to the iso14443a.c, maybe needs a param to tell it to collect nonces for this special attack.
CHG: extracted some help-texts into usage_* methods. Changed some text as well
FIX: "hf mf sim" command now uses both mfkey32 and mfkey32_moebius version to find the key in attack mode.
CHG: "hf mf sim" also now defaults to emul_memory to read a 4 byte UID.
2016-04-18 13:18:02 +02:00
iceman1001
cd91e41cb5
FIX: this fixes the mftry32, mftry32moebius and trymf64 implementations. Which is used in the "hf mf sim x" and "hf 14a sim x" built in attacks.
...
ADD: added the nonce2key version which should be able to find the key when the collected PARITIES is ZERO.
2016-04-18 13:08:18 +02:00
iceman1001
c805748f34
ADD: added a method for le32toh. Converting bytes to uint32_t .
...
CHG: correct use of FILE_PATH_SIZE in the tracelogging functions.
2016-04-18 13:05:35 +02:00
iceman1001
ce211cef39
FIX: corrected the FLAG_NR_AR_ATTACK
2016-04-18 13:02:36 +02:00
iceman1001
40f6f2ff50
ADD: started to add a BUTTERWORTH filter, not working yet.
2016-04-14 11:37:17 +02:00
iceman1001
0e32bf46e7
CHG: added the ascii output for the pwd.
2016-04-14 11:32:43 +02:00
iceman1001
0194ce8fc8
ADD: simulating can now handle triplesized UID (10b)
...
CHG: moved some mifare #DEFINES into protocols.h (ACK,NACK..)
2016-04-14 11:09:17 +02:00
iceman1001
7ee74a8ebd
CHG: Swapped to using the DEFINES.
2016-04-14 11:05:27 +02:00
iceman1001
01c78dabc3
CHG: syntax suger
2016-04-11 15:26:55 +02:00
iceman1001
2daa0d0b1e
CHG: doesnt flush the printf() calls
2016-04-10 13:34:27 +02:00
iceman1001
cbdcc89ae7
CHG: free the malloc:d memory in the crc8 function.
...
CHG: use the new GetEMLfrombigbuff method.
ADD: added a usage_legic_read
2016-04-10 13:18:11 +02:00
iceman1001
407697dfe3
ADD: more keys
2016-04-09 19:46:57 +02:00
iceman1001
bae363d860
ADD: more keys..
2016-04-09 19:45:28 +02:00
iceman1001
9e43f09ade
removed some old code,
...
rename a function, that tries to add IIRfilter Butterworth on a signal. Lets see if I can get it to work on Graphbuffer data one of these days.
2016-04-05 04:51:06 +02:00
iceman1001
5774b2b44d
ADD: added a WIN sample.
2016-04-05 04:48:05 +02:00
iceman1001
d40d64ef0d
CHG: old code calls outdated command. Even if it works in my fork, it doesnt work in PM3 master.
2016-04-05 04:47:42 +02:00
iceman1001
12b998cbd8
ADD; Some 7816 error codes
2016-04-05 04:46:25 +02:00
iceman1001
13629a71d3
minor adjustements, found some comments.
2016-04-05 04:45:07 +02:00
iceman1001
ef085a5948
CHG: adjusted two arrays in scripting.c to mirror the added models in reveng 1.4.0
2016-04-05 04:43:54 +02:00
iceman1001
4534ec060a
CHG: and the Makefile needs also to be updated
2016-04-05 03:35:47 +02:00
iceman1001
ca98f30c53
CHG: forgot one file for the RevEng update
2016-04-05 03:35:12 +02:00
iceman1001
0a25987730
Add; some keys
2016-04-05 03:34:46 +02:00
iceman1001
a78a3d9dc3
CHG: Updated RevEng1.31 to 1.40
...
--snipped changelog
1.4.0 24 February 2016
* Added 11 new algorithms, CRC-4/INTERLAKEN, CRC-7/UMTS,
CRC-8/LTE, CRC-8/SAE-J1850, CRC-11/UMTS, CRC-16/LJ1200,
CRC-24/BLE, CRC-24/INTERLAKEN, CRC-24/LTE-A, CRC-24/LTE-B,
CRC-30/CDMA, and 4 new aliases, CRC-12/UMTS, CRC-16/LTE,
CRC-16/UMTS, CRC-32/INTERLAKEN, from the CRC Catalogue.
* Eliminated string comparison when testing if a model name is
an alias.
* Split off presets into preset.c.
* Eliminated bogus calls to bsearch() in preset.c.
2016-04-05 03:34:03 +02:00
iceman1001
c3559d162a
textual changes
2016-03-23 14:04:10 +01:00
iceman1001
b9e66427b7
Forgot some breaks, and a faulty comparision of a set bit.
2016-03-23 14:03:41 +01:00
iceman1001
186ad6037c
ADD: added the ETU and Frame wait time based on the Frame wait integer value.
2016-03-23 14:02:50 +01:00
iceman1001
06eb3b1a8c
coverity fixes for my latest changes.
...
Forgot some breaks in 7816 annotation, and presco used an uninitalized char array.
2016-03-22 08:40:20 +01:00
iceman1001
774560e39e
CHG: no parity tests for ISO_7816_4 annotation
2016-03-21 22:07:55 +01:00
iceman1001
5de71ee6bf
CHG: enter a define for TIMEOUT
2016-03-21 22:07:23 +01:00
iceman1001
ab6d8a4c47
CHG: fixed the commands, its now valid calypso 7816 commands.
2016-03-21 22:06:51 +01:00
iceman1001
0fcfad0ee6
CHG: testing for windows clients to get a higher baudrate. Was 9600, testing 115200 as for non_win.
...
CHG: testing to set USB 2.0 standard, instead of USB1.1 ...
2016-03-21 22:05:59 +01:00
iceman1001
4bf0f73d76
increased a number of calypso commands for selecting files and trying to read them
2016-03-20 21:30:40 +01:00
iceman1001
452aab1e59
ADD; first try at reading calypso tags
2016-03-20 20:22:35 +01:00
iceman1001
7fa7e812fc
ADD: added @marshmellow42 's changes to "lfdemod"
2016-03-20 19:39:06 +01:00
iceman1001
f400ff6519
CHG: not sure if this clearCommandBuffer helps when sending usbpackages from lua scripts. Having trouble with these usbpackages in 14B code.
2016-03-20 19:35:43 +01:00
iceman1001
a930542b0a
FIX: the lua script hf_reader.lua now works with 14B tags.
2016-03-20 19:34:34 +01:00
iceman1001
eb7eab8570
code cleanup.
2016-03-20 19:33:59 +01:00
iceman1001
6fc68747f6
ADD: well, starting with a luascript for reading calypso tags, made me remake the 14b raw command on client and device side. Sorry @marshmellow42 , but this one broke your "hf 14b info" implementation. I fixed the "hf 14b read" and the hf search. So not to bad, but still a bit broken. The 14b raw device side is now very similar to 14a raw. Which is good. There is a Standard 14b 0x050008 detection and STmicroelectronic 0x0600 detection on deviceside. This removes a lot of code client side.
...
I also made the SRi read functions better by combining them. The demodulation / uart code should be the same as last summers changes. The device side code can now be even smaller.
2016-03-20 19:33:07 +01:00
iceman1001
790e8eae09
ADD: @icsom changes and additions to lua scripts for LEGIC
2016-03-20 19:25:48 +01:00
iceman1001
e3f9c50d81
ADD: changed the annotation for 14b, it now shows WUPB/REQB and number of slots we used.
2016-03-20 19:24:14 +01:00
iceman1001
77d1a423d5
CHG: minor changes to this lua script. One case it returns NIL, which makes it behave better.
2016-03-13 07:17:26 +01:00
iceman1001
aaa1a9a2dc
CHG: Added calling clear bigbuff to zero out it also, instead of just "free" it.
...
ADD: downloading the EML part from BigBuffer specially.
2016-03-12 09:03:28 +01:00
iceman1001
6c68b84a6e
@Marshmellow42 additions:
...
ADD: Q5 to 'LF PYRAMID'
ADD: ST sim addition to SIM ask.
REF: 29ada8fc08
2016-03-07 18:53:02 +01:00
iceman1001
4e8fa8b448
ADD: get a updated script from @icsom
2016-03-06 13:26:13 +01:00
iceman1001
1f3d5401a6
FIX: adding a silent mode for Topaz detection.
...
FIX: adding a silent mode for 14B detection.
2016-03-06 13:21:42 +01:00
iceman1001
3607b5a96a
ADD: Added the autodetection of Topaz to "HF SEARCH"
...
FIX: Fixed a minor bug in "HF SEARCH" where it always found a "14b" tag, making the command never test for other formats afterward the 14b test.
The 14b detection is not good still, conflicting return values is main reason for this bug
2016-03-06 12:40:04 +01:00
iceman1001
38e4191705
CHG; a fix for "HF TUNE", I always were annoyed with the hf tune where it printed one value per row endlessly. So this fixes that, it uses "\r" to print on the same row. Works on MINGW/WINDOWS. Havn'nt tested it on Linux yet. But it looks good now.
2016-03-06 10:35:25 +01:00
iceman1001
eb891c385e
ADD; added Marshmellow42 's fixes for indala and stuff.
...
CHG: updated the CHANGELOG.md
2016-03-06 07:56:44 +01:00
iceman1001
0db11b71ef
ADD: Added the HitagS from @spenneb ref: https://events.ccc.de/congress/2015/Fahrplan/events/7166.html
...
PM3 Master PR: https://github.com/Proxmark/proxmark3/pull/167
Adjusted the ENUM names to fit in my fork. We need a better namestandard for it.
2016-03-04 19:06:47 +01:00
iceman1001
7f0cb92e0d
CHG: Added @icsom 's changes to his legic.lua script.
2016-03-01 07:07:56 +01:00
iceman1001
ff3e074478
CHG: some minor changes to the 14b, the read 14b lua,
2016-03-01 07:03:00 +01:00
iceman1001
c728b2b4cf
FIX: Added @marshmellow42 's fix for ASK/Biphase simulation on deviceside.
...
CHG: Added @marshmellow42 's refactoring of "gprox-II" demod.
2016-03-01 06:57:02 +01:00
iceman1001
07291f87d8
ADD: finished of the "LF GUARD SIM" command. needs testing.
2016-02-28 23:28:38 +01:00
iceman1001
0d2c590974
ADD: num_to_bytebitsLSBF function.
...
ADD: lf guard clone - works... needs some checking.
ADD: added a option to "addparity" to set zero on fixed pos.
2016-02-28 22:43:21 +01:00
iceman1001
733eb42022
ADD: Added three legic luascript from @iscom (Mosic) Great work!
2016-02-28 14:50:49 +01:00
iceman1001
2453ca6529
CHG: better not to show the unfinished commands..
2016-02-27 19:48:19 +01:00
iceman1001
50564be0f8
ADD: Started to add a "LF GUARD CLONE/SIM" functionality. *not working* all thats needed now is fixing the transformation from FacilityCode/CardNumber -> raw data for t55x7.
2016-02-27 19:47:10 +01:00
iceman1001
98c799ba49
BUG: smash stack in addParity call. Didn't take in consideration that it adds bits per parity to the array..
2016-02-27 19:21:49 +01:00
iceman1001
90639dd1cc
FIX: lets see if this fixes the pyramid clone crash on OSX
2016-02-27 18:57:49 +01:00
iceman1001
69c4516d32
chg: minor changes to text, explaining current implementation for "lf pyramid clone/sim" only works for 26bits.
2016-02-27 12:12:05 +01:00
iceman1001
220d638d92
ADD: started to add a lua script for reading 14b tags, will help when making scripts against iso 14443b tags.
2016-02-27 09:24:40 +01:00
iceman1001
4b3655e7f4
FIX: spelling misstakes.
...
FIX: output of block number should be two digits for nicer layout
FIX: strange branching in the pyramid demod in cmddata.c, it will now always print the unknown length message
FIX: another go at the coverity scan bug in proxmark3.c. (resource leak for cmd)
2016-02-27 09:21:19 +01:00
iceman1001
ce9a7cbf33
ADD: "LF PYRAMID SIM"
2016-02-26 22:40:13 +01:00
iceman1001
581b31fb8a
FIX: "LF PYRAMID CLONE" now works.
2016-02-26 22:10:27 +01:00
iceman1001
f087591d59
FIX: calcs wiegand correct, adds wiegand parity correct, adds checksum correct, add even parity to blocks correct.
...
- when ran it clones nice, the "lf search" finds a pyramid och checksom is ok. However, the wiegand decode is wrong.
Something about where in bitarray to put the startformat bit and wiegand bits...
2016-02-26 21:11:56 +01:00
iceman1001
f6af1cf0ad
FIX: the 14b crc was called wrong in LUA. You enter a hexstring already, and get a hexstring back.
2016-02-25 17:51:02 +01:00
iceman1001
71cb7328e3
ADD: added some pyramid commands. //not finished.
2016-02-25 17:49:48 +01:00
iceman1001
683180cb60
ADD: added a simple test of known pwd algos based on uid.
2016-02-24 08:31:46 +01:00
iceman1001
b9411ebac8
ADD: added a simple sleep function. Thanks to Mosci
2016-02-23 08:24:01 +01:00
iceman1001
a75d63f19b
ADD: added the crc8legic to Lua. call it with core.crc8legic
...
also a helper function to take a hexstring and calc the crc on it, was added inside utils.lua
Call it inside a lua-script like this:
local utils = require('utils')
local data = '01020304'
local crc = utils.Crc8Legic(data)
print (uid, ('%02x'):format(crc))
2016-02-22 17:50:32 +01:00
iceman1001
c0f15a05b3
ADD: Marshmellows fixes for "lf t55xx" and "lf cmdread" ref: https://github.com/Proxmark/proxmark3/pull/166/files
2016-02-21 17:44:25 +01:00
iceman1001
b03006794f
CHG: removing some time-debug statements.
...
CHG: increased the time-out message 2sec, in proxmark, to make "hf mf chk" work better.
CHG: still trying to solve the "hf mf mifare" WDT_HIT bug.
With these changes, the "hf mf chk" / "Hf mf nested" looks similar and should be a bit faster.
2016-02-19 22:34:39 +01:00
iceman1001
e66ff99cc9
CHG: revert old fiddeling, I should not touch the HIDflasher.
2016-02-19 22:32:38 +01:00
iceman1001
95215e873f
FIX: this free call still annoys Coverity Scan.
2016-02-19 22:31:35 +01:00
iceman1001
0516439959
ADD: Added @marshmellow42 's new ST (sequence terminator detection)
2016-02-19 22:30:19 +01:00
iceman1001
25606bd724
FIX: For ld (linker) there is no "-=", so lets try re-assign ldlibs instead
2016-02-18 23:01:12 +01:00
iceman1001
28d47dc9b4
CHG: textual change in README.md
...
FIX: Mac OSX ld (linker) warning for -L/usr/local/lib, testing to remove it for mac builds.
2016-02-18 21:08:47 +01:00
iceman1001
75cf8623d6
FIX: Undo one of my fixes.. *sigh* need to be more specific when / where to call free.
2016-02-18 20:48:24 +01:00
iceman1001
eb5206bd20
FIX: resource leak, forgot a free
2016-02-18 20:39:41 +01:00
iceman1001
1abd86f17a
CHG: CHange the definition of MAX_GRAPH_TRACE_LEN to match eachother.
...
REM: removed a include header to graph.h in ui.h.
2016-02-18 20:19:33 +01:00
iceman1001
dfc5ee8893
FIX: Removed a double const
2016-02-18 20:08:55 +01:00
iceman1001
45293f1096
FIX: the #define M_PI is now optional. Moved a bunch of header invocations into the ui.h
2016-02-18 20:08:34 +01:00
iceman1001
02ac2ed464
FIX: 256 is too big for uint8_t
2016-02-18 20:07:50 +01:00
iceman1001
805cd07e25
CHG: this makefile should compile on Ubuntu 1404 without problems. The QT4-5 detection is inside MINQW detection part.
2016-02-18 18:55:44 +01:00
iceman1001
fd9552568d
CHG: First step to make my makefile better for other dev.env's These changes makes it look more like PM3 master version. The extra libs are added when MINGW is detected.
2016-02-18 18:43:20 +01:00
iceman1001
6cf8fcb002
FIX: corrected one of my own bugs which made the calccrc8 not accept the input hexstring.
2016-02-18 17:46:11 +01:00
iceman1001
838c15a643
ADD: added some time debug statements to be able to measure execution time.
...
CHG: change the auth_ex method to send usb package faster,
REM: removed some bucketsort changes.
2016-02-17 17:30:37 +01:00
iceman1001
aacb96d7ed
FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and copying in C.
2016-02-17 10:46:08 +01:00
iceman1001
b882b54314
FIX: introduced a bug in a loop by uint8_t inside crapto1.c
...
CHG: textual helptext change in "hf mf nested"
CHG: loop inside "nested". Still not fast enough. I wonder if qsort can be exchanged for radixsort or bucket sort?
2016-02-16 23:46:34 +01:00
iceman1001
7504dc50d5
Merge branch 'master' of https://github.com/iceman1001/proxmark3
...
Conflicts:
armsrc/crypto1.c
2016-02-16 21:43:45 +01:00
iceman1001
a1689f417f
CHG: print_hex_break now prints rownumber instead of byte position
2016-02-16 21:39:25 +01:00
iceman1001
c2a714e3ce
ADD: forgot to add the bruteforce command to the commandtable. *experimental, its a simple bruteforce* *not tested*
...
CHG: some textual changes to helptext.
2016-02-16 21:11:17 +01:00
iceman1001
1fe0992d06
FIX: marshmellow42 's fix using memcpy instead of re-assign pointer.
...
Ref: 38b3509542
2016-02-16 18:15:18 +01:00
iceman1001
f7f844d0ba
CHG: added timeouts for downloading values from device, to make the client more responsive.
...
CHG: still curious for the printf_hex_breaks method, why it behavies strange.
2016-02-16 10:54:41 +01:00
iceman1001
98b2a3a1e9
FIX: the port error 10 on Mac, is fixed by @marshmellow42 , a wrong string format specifier was the root cause.
...
ADD: some other adjustments from @marshmellow42 to the fsk demod identifier string.
2016-02-16 09:24:45 +01:00
iceman1001
b0c2f708bc
CHG: -O4 changed into -O3 to remove some compiler warnings clang, on mac ..
2016-02-15 22:06:17 +01:00
iceman1001
a182a680b0
ADD: a print_hex_break function,
...
CHG: "hf legic decode" looks better.
2016-02-15 22:05:26 +01:00
iceman1001
9827020ac5
CHG: "hf legic decode" now prints nicely. Still a strange bug for first row..
2016-02-15 19:56:08 +01:00
iceman1001
d7fd908447
FIX: change the "hf legid load", to use the WaitForResponseTimeout, instead of locking the client if device doesn't answer.
...
CHG: starting to fix the "hf legic decode" and printing the user segements. *WORK IN PROGRESS*
2016-02-15 15:03:07 +01:00
iceman
5fdf867253
CHG: some timing
2016-02-15 02:49:04 +01:00
iceman
e7902ca0a5
chg: removed testmessage
2016-02-15 02:45:43 +01:00
iceman1001
60bb5ef73b
FIX: "hf legic decode" the stamp_len variable was int, but its used as a uint8_t.
...
FIX: cmdlfem4x.c needed ref to cmdmain.h for clearCommandBuffer
2016-02-14 15:30:26 +01:00
iceman1001
4c36581b96
CHG: clearCommandBuffer(); before calling cmdparser.
2016-02-14 15:24:11 +01:00
iceman1001
c6e0a2ebeb
FIX: Faster data load.
2016-02-14 13:29:20 +01:00
iceman1001
e579e76873
FIX: The "hf legic load" had an bug where it send the read byte as uint32_t to the device.
2016-02-14 12:36:42 +01:00
iceman1001
4469412e88
ADD: adding a presco demod, given 0x10D as preamble, .. *work in progress*
2016-02-14 11:58:25 +01:00
iceman1001
3b920280db
ADD: Calc legic Crc8 method on given input hexstring.
2016-02-14 11:56:54 +01:00
iceman1001
5a6e19e614
ADD: Started to add a Presco LF clone functionality. Can calc Wiegand from printed number.
2016-02-13 20:53:06 +01:00
iceman1001
6bb7609cad
CHG: had to move the SwapBits method.
2016-02-12 16:19:18 +01:00
iceman1001
a11ca2f305
FIX: @wllm-rbnt 's typo fixes
2016-02-12 07:37:10 +01:00
iceman1001
fe144f121d
CHG: Updated Reveng from 1.3.0 -> 1.3.1
...
It now allows of values to be entered as hex i.e. 0x00
2016-02-11 18:28:34 +01:00
iceman1001
df4ee66ea9
CHG: my idea of malloc and free for bucketsort didn't work so well. Back to the original.
2016-02-10 21:44:32 +01:00
iceman
6b10e3294e
CHG: remade the mfchkkeys loop inside nested. This one send multiple keys at once, instead of one by one
2016-02-10 21:44:50 +01:00
iceman
480e2f2394
Merge branch 'master' of https://github.com/iceman1001/proxmark3
...
Conflicts:
client/cmdhfmf.c
client/cmdmain.c
2016-02-10 13:29:23 +01:00
iceman
719b2377be
chg: what?
2016-02-10 13:22:48 +01:00
iceman
847f7404ff
CHG: added some timing messages,
2016-02-10 13:20:23 +01:00
iceman1001
a9e4e78f83
CHG: syntax suger
2016-02-10 13:12:01 +01:00
iceman1001
6f79363dba
Syntax suger
2016-02-10 13:10:27 +01:00
iceman1001
089d061f2d
CHG: Extracted @piwi's bucketsort into separate files under /common
2016-02-10 13:09:33 +01:00
iceman1001
e0b30228e9
FIX: clearing a char array.
2016-02-10 13:07:44 +01:00
iceman1001
9260bcca56
ADD: added a valid pyramid T55x7 configblock.
2016-02-10 13:07:04 +01:00
iceman1001
7177c51334
ADD: added @marshmellow42 's print statement for "lf viking clone".
...
ADD: added a printstatement for "lf viking sim" to make it behave like clone.
2016-02-10 13:06:02 +01:00
iceman
60faf34855
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-02-09 20:58:21 +01:00
iceman1001
022346a195
FIX: @marshmellow's fix for "lf viking clone", wrong mask was applied.
...
see: http://www.proxmark.org/forum/viewtopic.php?pid=19896#p19896
2016-02-09 20:42:59 +01:00
iceman
6c6da3d466
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-02-09 15:53:53 +01:00
iceman
ef9b8b2c2b
empty row..Merge branch 'master' of https://github.com/iceman1001/proxmark3
...
Conflicts:
client/proxmark3.c
2016-02-09 15:53:34 +01:00
iceman1001
ea54ec7395
CHG: Syntax suger
2016-02-09 15:17:07 +01:00
iceman
ca3ed45928
:syntax sugger
2016-02-09 15:04:08 +01:00
iceman1001
66afab80bd
CHG: test of re-adding @piwi's bucketsort to @blapost's crapt1 v3.3 imp.
2016-02-09 14:57:58 +01:00
iceman1001
46a33c182d
CHG: moved a call to "free" to outside of if-statement.
2016-02-09 14:48:42 +01:00
iceman1001
a0048c6967
CHG: increased timeout when calling "hw tune".
2016-02-09 14:46:46 +01:00
iceman1001
9f8fc207a2
ADD: added superchargers types, Thanks to rmaisonneuve for compiling it.
2016-02-07 15:54:25 +01:00
iceman
61dda55df6
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-01-28 22:44:43 +01:00
iceman1001
c9f8bc53c4
REM: commented out a reference to radixsort, which I'vent gotten to work.
2016-01-25 20:32:24 +01:00
iceman1001
d294f5825d
CHG: Syntax suger
...
Experiment: unfolded a loop.
Experiment: speeding up "Hf mf nested"
CHG: removed some default keys from "hf mf nested". It wasn't being used anyway.
CHG: changed the way "hf mf nested" reports back keys
CHG: "hf mf nested" and "hf mf chk" now prints the key-table.
CHG: changed the output list for "hf mf chk"
2016-01-25 20:28:34 +01:00
iceman1001
05e07571a4
FIX: earlier NULL check.
2016-01-25 20:23:44 +01:00
iceman1001
df0dd9e9b6
REM: removed unused code.
2016-01-25 20:22:59 +01:00
iceman1001
109def22c8
FIX: Moved a free() call.
2016-01-25 20:22:00 +01:00
iceman1001
f66114426b
CHG: removed a debug statement
2016-01-21 13:01:07 +01:00
iceman1001
93048e8b8b
CHG: Added the urls to the new Wiki on github inside the flasher.c usuage text.
...
CHG: Syntax suger
2016-01-21 08:02:41 +01:00
iceman1001
5496654aad
CHG: Added some more identifications to token list, courtesy from a forum user
2016-01-21 07:33:55 +01:00
iceman1001
810f53792e
ADD: added the possibility to choose which block num to attack with "hf mf mifare" Before it only worked on block 0.
2016-01-20 22:26:01 +01:00
iceman1001
0920f54c66
CHG: Remake the "hf mf chkkeys" It now prints the found keys like "hf mf nested" does. It also tries to read key B if Key A was found. It also continues to the next key to find, when there is one match. Earlier all keys in .dic file, was tested even if it was found.
2016-01-20 19:51:30 +01:00
iceman1001
e7d099dcaa
CHG: syntax suger, text edit
2016-01-20 17:46:23 +01:00
iceman1001
87b28d31a1
CHG: Syntax suger
2016-01-20 17:45:42 +01:00
iceman1001
05fd71264a
FIX: Coverity Scan complains that the realloc might fail..
2016-01-20 13:03:49 +01:00
iceman1001
bf22fab73b
FIX: Coverity Scans complain about uninitialized usage of struct. Setting s->ODD and s->EVEN to zero should do the trick.
2016-01-20 11:31:24 +01:00
iceman
1156e3e32f
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-01-16 21:54:01 +01:00
iceman
6c38d4c96f
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-01-16 21:50:55 +01:00
iceman
f10646ef74
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-01-13 12:33:09 +01:00
iceman
63852b2f51
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-01-12 21:58:03 +01:00
iceman
b725f2ca21
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-01-12 19:26:56 +01:00
iceman
2c29cba82a
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-01-12 17:18:11 +01:00
iceman
a70991cf6d
Merge branch 'master' of https://github.com/iceman1001/proxmark3
2016-01-12 16:45:32 +01:00
iceman
1f1929a4aa
CHG: maybe this init works better?
2016-01-12 15:57:53 +01:00
iceman1001
5e32cf7575
FIX: #lld -> %#PRIu64" since the arguments are uin64_t
2016-01-19 22:37:17 +01:00
iceman1001
495d7f1326
FIX: Coverity scan, forgot one fread ...
...
CHG: Syntax suger
2016-01-19 22:25:34 +01:00
iceman1001
b112787d4f
ADD: Some instructions for configure CoverityScan using alternative compiler like the ARM-NONE-EABI-GCC
...
FIX: stupid clock() == -1 on systems who doesn't have it..
2016-01-19 21:48:29 +01:00
iceman1001
704d552a77
FIX: Coverity Scans, z_stream.opaque not initialized, use Z_NULL;
2016-01-19 20:28:29 +01:00
iceman1001
886968335b
FIX: Coverity scan, complain on z_stream.opaque is not initialized. Google it,says use: Z_NULL
2016-01-19 20:26:19 +01:00
iceman1001
841d7af0dc
FIX: Coverity Scan warnings on not using the fread return value.
2016-01-19 19:52:01 +01:00
iceman1001
52cf34c1cc
CHG: Syntax suger, space -> tabs. etc.
...
FIX: Coverity Scan says out-of-bounds, Increased the databuffer. Legic List command needs to be re-done.
2016-01-19 19:33:23 +01:00
iceman1001
5f5aa82bb9
FIX: Coverity Scan says fgetc() returns a INT,
2016-01-19 19:32:10 +01:00
iceman1001
67d78d0cde
CHG: syntax suger
2016-01-19 19:31:34 +01:00
iceman1001
89a40c3d1d
REM: removed a print. The printing is done in the calling function.
2016-01-19 18:06:14 +01:00
iceman1001
8130eba4d1
CHG: Syncronized so all different parts uses the same implementation of Crapto1 v3.3
2016-01-19 18:01:16 +01:00
iceman1001
1a4b67382a
FIX: Coverity Scan resource leak
2016-01-19 17:23:36 +01:00
iceman1001
a0f33b6682
CHG: started to clean up the crapto1 imp in client/nonce2key/ folder.
2016-01-19 17:22:18 +01:00
iceman1001
0697080e26
FIX: CoverityScan complains on getchar(), not reading the returning value
2016-01-19 16:58:07 +01:00
iceman1001
639a571810
FIX: Coverity scan, remove a resource leak, wrong varible type.
2016-01-19 16:29:49 +01:00
iceman1001
a429510647
REM: Removed #define llx PRIx64, all these defines are located in proxmark3.h
2016-01-19 16:29:07 +01:00
iceman1001
bb0fc401cc
ADD: another key found
2016-01-18 23:28:34 +01:00
iceman1001
ce161f5633
ADD: added the "llu" macro shortcut as format specifier.
2016-01-16 23:04:19 +01:00
iceman1001
952f3dc78f
CHG: changed output for the "hf mf nested" to show KEY: A or B instead of 0/1
2016-01-16 23:02:54 +01:00
iceman1001
4750877f2d
FIX: Coverity fix with resource leakage
...
ADD: Implemented a addon to "hf mf nested" if there is KEY_A 's found but not the same KEY_B, try just read it from tag.
Makes the command a bit slower when it does these reads. Plus some annoying debug statements,
CHG: changed the output for "hf mf nested" to write Key A or B instead of 0 & 1..
2016-01-16 23:02:04 +01:00
iceman1001
e1ad67eaf2
FIX: Coverity Scan fixes, a bunch of them.
2016-01-16 22:58:44 +01:00
iceman1001
8977988fb6
FIX: forgot a lua object for the call to ConvertAsciiToHex. Thanks @romaric for finding it.
2016-01-15 21:47:32 +01:00
iceman1001
7f975d7e17
FIX: one of these days I will start being more observant about argument order
2016-01-15 15:22:25 +01:00
iceman1001
28093ebc10
FIX: wrong format specifier syntax
2016-01-15 12:53:13 +01:00
iceman1001
621601ecef
ADD: some clocking for 'hf mf mifare', 'hf mf nested', 'hf mf chk'
2016-01-15 12:45:15 +01:00
iceman1001
3e110ad5ee
REM: removed a dublett at end of file.
2016-01-15 12:43:56 +01:00
iceman1001
43d3f76921
FIX: this should remove some warnings while compiling on linux and when running Travis-CI in a docker container.
...
some format specifier for uint64_t
and getting the git history in the perl script.
2016-01-15 12:43:29 +01:00
iceman1001
c2d2a5a6b5
CHG: Tried to unfold some loops inside ARM/crypto1 imp. It can't hurt, feels stabil.
2016-01-13 22:24:12 +01:00
iceman1001
4b2e63be17
FIX: Some <= fix for pwpivi 's hardnested suggested on the Pm3 forum.
2016-01-13 21:51:47 +01:00
iceman1001
738eeccd9d
CHG: Tested to unfold some loops inside the crypto1 implementation to see if it generates some speed ups. Feels ok.
2016-01-13 21:51:06 +01:00
iceman1001
63c236144b
FIX: Coverity, out-of-bounds read, 124 is less than (0x10*8)+2 (130)
...
FIX: Coverity, dead-code, bitcomparison always false. Copy-paste error? but 0x0F can never be equal 0x10.. I guessing its 0x01. @pwpivi have to correct me if its wrong.
2016-01-13 14:53:32 +01:00
iceman1001
54d893143c
FIX: Coverity, out-of-bounds read ...
2016-01-13 14:51:02 +01:00
iceman1001
6b1111d7b8
FIX: Coverity, resource leak, and variable can't be negative,
2016-01-13 13:22:25 +01:00
iceman1001
089f91dc9d
FIX: GCC 4.8 complains the pointer is set before its used in a call to free(). Doesn't complain on Mingw, only Ubuntu.15.10
2016-01-13 13:15:34 +01:00
iceman1001
40a532d97d
FIX: Coverity, strlen(Cmd) can never be lesser than zero.. *douh*
2016-01-13 12:58:10 +01:00
iceman1001
b891758968
FIX: Coverity, resource leaks 'nd more.. in "lf t55xx bruteforce" nasty piece of code...
2016-01-13 12:50:18 +01:00
iceman1001
4b8ee00f0d
FIX: forgot to change a modified call from @pwpivi 's last update.
2016-01-13 12:49:21 +01:00
iceman1001
0d5ee8e245
ADD: @pwpiwi 's latest changes to 'hf mf hardnested'
2016-01-13 09:31:13 +01:00
iceman1001
d16b33feb5
REM: Removed lot of obselete code from before.
2016-01-13 00:24:37 +01:00
iceman1001
3a532acfe1
ADD: "lf hid bruteforce" for a simple bruteforce attact against a HID reader. *work in progress*
2016-01-13 00:16:11 +01:00
iceman1001
d04b71c168
FIX: tcgetattr for Linux in Ukbhit(), should return -1 if fail.
2016-01-13 00:14:08 +01:00
iceman1001
f37fe8cb10
FIX: Coverity, Unchecked return value, CID #121288 , lets do the same check that is everywhere is this call is used.
2016-01-13 00:08:23 +01:00
iceman1001
3f3fdce685
FIX: Coverity, CID# 121351, #121371 , #121372 , old code that is not used any more, I should remove this.
2016-01-13 00:07:14 +01:00
iceman1001
978920b9fc
FIX: textual changes
2016-01-13 00:05:55 +01:00
iceman1001
6178e80e4a
FIX: Coverity, resource leak, CID #121357 , Mat needs to be free
2016-01-12 23:56:15 +01:00
iceman1001
33db73516d
FIX: Coverity, logical vs bitwise operator, remove the extra '&' for it to become bitwise.
2016-01-12 23:42:42 +01:00
iceman1001
95d96ea38a
FIX: Coverity, Unintended sign extension, data[7] would have become int, then uint64_t. Should work better now with adding typecasting.
2016-01-12 23:40:57 +01:00
iceman1001
3906036e11
FIX: Coverity, Resource leak, CID #121361 , filehandle f needs to be free
2016-01-12 23:38:47 +01:00
iceman1001
e683ecb6a5
FIX: Coverity, Resource leak, CID# 121360, keyBlock needs to be free
2016-01-12 23:37:33 +01:00
iceman1001
60daed79db
FIX: Coverity, out-of-bounds write, CID#121340, CID#121341, CID#121342, CID#121343, wrong size in check, sprintf always adds a null terminator, so if filepath would have been 996 chars long, this might had happend... but no more.
2016-01-12 23:35:06 +01:00
iceman1001
f1db8c2207
CHG: Syntax suger
2016-01-12 23:29:05 +01:00
iceman1001
e72d1fbba2
FIX: Coverity, CID#121314, Explicit null dereferenced, in really odd occasions buf would be NULL, and sending NULL to memcpy dereferences it. Not sure about this fix.
2016-01-12 23:27:42 +01:00
iceman1001
395ec4e99c
FIX: Coverity, CID# 121337, Out-of-bounds. In the loop, variable i, can be as much as 1051, overflowing the databuf with size 1024.
2016-01-12 23:16:20 +01:00
iceman1001
5cba446201
FIX: Coverity, uninitialized scalar variable, filename array could be NULL..
2016-01-12 23:10:38 +01:00
iceman1001
628d1cb085
FIX: Coverity, CID #121346 , resouce leak, close filehandle.
2016-01-12 23:06:53 +01:00
iceman1001
f7c30d806c
FIX: Coverity, out-of-bounds, CID#121330, CID#121331, CID#121332, CID#121333,
...
keyNbr has to be smaller then ICLASS_KEYS_MAX (since the Iclass_Key_Table array is initialised with it).
2016-01-12 23:05:10 +01:00
iceman1001
3c40616979
FIX: Coverity, Dereference null return, CID #212329 , filehandle could be NULL
2016-01-12 22:57:23 +01:00
iceman1001
8b15860ed1
FIX, Coverity, Unsigned compared against 0. CID #212326 , keyNBr will never be negative.
2016-01-12 22:53:13 +01:00
iceman1001
ddb748a973
FIX, Coverity, Argument can't be negative, CID #212324 , ftell(f) can be negative, not allowed in malloc.
2016-01-12 22:49:29 +01:00
iceman1001
4bb17c6633
FIX: Coverity , Argument can't be negative, CID #121323 , ftell(f) can be negative, not allowed in malloc.
...
FIX: forgot to close the filehandle :(
2016-01-12 22:47:48 +01:00
iceman1001
9c4e28a445
FIX, Coverity, Argument can't be negative. CID# 212322, ftell(f) can be negative. Not allowed in malloc...
2016-01-12 22:43:28 +01:00
iceman1001
7144c99b07
CHG: syntax suger
2016-01-12 22:42:31 +01:00
iceman1001
e994394a40
FIX: Coverity, Identical code for different branches, CID #121315 , added a message and different return value.
2016-01-12 22:37:35 +01:00
iceman1001
4c685ac887
FIX: Coverity, unintended sign extention, CID #121363 , (numbits << 16) becomes int, then uint64_t. But the signness might set all upper bits to 1 in the process.
2016-01-12 22:33:54 +01:00
iceman1001
28415b5d90
FIX: Coverity, unchecked return value, CID #121292,..
...
basicallty the flush queue commmand is replaced with clearCommandBuffer();.
2016-01-12 22:30:22 +01:00
iceman1001
1d42f25fcd
FIX: Coverity, out-of-bounds write, CID# 121336, s_index should take factor in consideration when looping. Not sure about this one.
...
FIX: another thing struck me, the g_index wasn't increased, meaning the "un-decimation" always worked on the same first byte of GraphBuffer.
2016-01-12 22:15:49 +01:00
iceman1001
fc893f8e33
FIX: minor fixes to the HID wiegand generation command. Still not complete
2016-01-09 17:20:06 +01:00
iceman1001
5cc88edfaf
CHG: syntax suger
2016-01-09 17:19:09 +01:00
iceman1001
dd79e03a1a
ADD: a new pwdgen algo Nicknamed C, (Huge props to @Bettse for everything) also added to the "hf mfu info" command. However, that will not work given the system's lockbits.. :( Maybe I'll add a function to test all imp pwdgens given a UID without making a authentication call to tag.
...
ADD: BSWAP_32 macro, for changing endianness.
2016-01-09 17:17:36 +01:00
iceman1001
dd0434a6ed
FIX: @marshmellow42 's cleanup of includes.
2016-01-08 15:29:06 +01:00
iceman1001
7f6ccd3926
FIX: coverty scan defects.
...
- bigbuf.c is comparision correct (iLen versus numofparity)
- cmdhfepa.c resourceleak, add a call to free
- cipherutils.c resourceleak, added calls to free
2016-01-08 15:28:24 +01:00
iceman1001
fcb1cdba15
REM: code cleanup.
2016-01-08 14:31:27 +01:00
iceman1001
c46ea881a4
FIX: coverty scan, resourceleak in "hf mf sniff", added call to 'free' befor return.
...
FIX: coverty scan, overflow in "hf 14a raw", added an extra len check against USB_CMD_DATA_SIZE
2016-01-08 14:30:56 +01:00
iceman1001
f4fbfb83e2
ADD: @go_tus 's code to generate wiegand codes from FacilityCode/SiteCode and Cardnumber. Almost there, formatlength supported is 26,34,35,37,38,40,44,75,84, when its finised.
2016-01-08 14:28:13 +01:00
iceman1001
ab7bb49475
FIX: coverty scan reveals some resourceleaks and overruns, which is supposed to be fixed now.
...
/armsrc/des.c overflow 7 instead of 6
/client/cmdlfhitag.c overflows traclen
/client/util.c sprint_bin_break overflows.
/client/cmdhficlass.c need to free memory after malloc.
ADD: RotateRight macro in util.h
2016-01-08 14:25:10 +01:00
iceman1001
69e312afe7
ADD: added a Q5 parameter for "lf t55xx wipe",
...
the default config blocks is:
t55x7 : 000880E0
t5555 (Q5) : 6001F004
2016-01-04 10:13:38 +01:00
iceman1001
fe8042f29a
ADD: added @pwpiwi 's corrections to "hf mf hardnested"
2016-01-04 10:11:20 +01:00
iceman1001
09181a5462
code clean up, added some comments to hitag
2016-01-03 17:17:44 +01:00
iceman1001
a531720ae6
added @pwpiwi 's latest changes to "hf mf hardnested"
2016-01-03 17:16:50 +01:00
iceman1001
58962d4c3e
added @broken_bad's imp of showing T555/Q5 trace data. (with my modifications ;) )
2016-01-03 17:16:06 +01:00
iceman1001
341fd1debc
FIX: removed printBits reference.
2015-12-23 11:59:34 +01:00
iceman1001
e869d59871
ADD: @marshmellow42 's changes to "hf mfu dump"
2015-12-21 19:48:33 +01:00
iceman1001
f4d0ffd1b9
CHG: some textual change to README.txt
...
ADD: a prng.c to collect some different PRNG's i've ran into
ADD: some changes the tea implementation
ADD: a enhanced version - SwapEndian64ex
2015-12-21 19:48:00 +01:00
iceman1001
a7474bb30a
add: added @AdamLaurie 's iclass raw keys changes
2015-12-21 19:44:47 +01:00
iceman1001
9332b857ff
ADD: @marshmellow42 's fixes for Q5, t55xx, fskclock,
...
ADD: got tired of always writing wrong "hf 14a list", so I hooked it back up to call the "hf list" with argument. Things becomes smoother that way.
2015-12-16 11:01:46 +01:00
iceman1001
2b1f4228c2
ADD: @marshmellow42 's changes to "hf mfu *" ,
...
ADD: @marshmellow42 's changes to "hf mf sim",
ADD: @pwpiwi 's parity files was missing.
2015-12-15 09:34:55 +01:00
iceman1001
f8ada309e9
ADD: @pwpiwi 's latest code from his 'hardnested' branch.
2015-12-15 08:51:29 +01:00
iceman1001
8c671cfb97
FIX: minor fixes in hf mfu, from @marshmello42 's branch.
2015-12-14 22:52:04 +01:00
iceman1001
508b37ba9c
REM: removed an unused doublett function "printBits" in util.c
...
ADD: added a new string helper function "sprint_hex_ascii" in util.c
ADD: added "LF AWID BRUTE", a very simple bruteforce command for the awid commands.
it takes a facility-code, and iterates all possible 0xFFFF cardnum by sending sim command. It also uses the usb_poll function to stop the bruteforce on keypress and not leaving the pm3 device running the simulation.
the command implements the help parameter.
2015-12-14 22:50:54 +01:00
iceman1001
0c97a4562d
ADD: @marshmellow42 's fixes to cmdlft55xx.c (save_restoreGB)
...
ADD: started with a skeleton method for printing hex and ascill.
2015-12-10 10:30:13 +01:00
iceman1001
2b9006bd14
Two fixes for warnings when compiling on Ubuntu14.04.
...
FIX: a wrongly set parameter call to memset in CmdT55xxWipe .
FIX: an ignored fread call in cmdhficlass.c,
2015-12-09 15:29:18 +01:00
iceman1001
bf32dd923f
ADD: @marshmello42 's fixes for low frequency demodulation lengths greater the 512bits.
2015-12-09 14:58:16 +01:00
iceman1001
0a886a1d1b
ADD: a TEA crypto algorithm implemention.
2015-12-09 14:57:16 +01:00
iceman1001
f74d0b89a2
added some keys
2015-12-05 22:18:42 +01:00
iceman1001
5247c0c193
ADD: hooked up the new pwdgen functions inside the "hf mfu info", to be tested if the authlimit is not set.
2015-12-02 23:06:03 +01:00
iceman1001
9984b1735a
CHG: updated helptext for lf t55xx bruteforce
...
ADD: a ROL function in util.c
ADD: two pwdgen functions in cmdhfmfu.c, call them with a 7byte UID and get a 4byte number back. Will see if it can be connected with the "hf mfu info" command, make data extraction easier later on.
ADD: added some more easy pwd in the dictionary file default_pwd.dic
2015-12-02 22:46:11 +01:00
iceman1001
8ce3e4b4e9
add: missing two hard_nested files..
2015-12-02 16:48:25 +01:00
iceman1001
d08faa4e02
ADD: Added the possibility to exit the bruteforce mode (either rangesearch or file) with the keyboard.
...
FIX: if not found, the range search printed wrong number.
2015-12-01 22:47:03 +01:00
iceman1001
3f26796673
FIX: the lfsampling.c for t55xx had a tendecy to enter a neverending loop. Moved exit branch into the while statement, which seems to solve it.
...
FIX: Strange int -> uint8_t casting behavior (0x05 gets the 25bit set and becomes 0x10005 instead) in fskdemod, removed int and sscanf.
2015-12-01 22:38:37 +01:00
iceman1001
fff6d2a3ba
FIX: added a break if the device starts acting strange when aquirering data from tag.
2015-12-01 20:44:12 +01:00
iceman1001
060fdaf998
FIXES: the custom keys testloop now increases the read pwd :)
2015-12-01 16:44:53 +01:00
iceman1001
21865cda09
ADD: added the possibility to load a default pwd file to be used with the "lf t55xx bruteforce" command.
...
new option:
lf t55xx brutefore i default_pwd.dic - will load default pwds from file and test against tag.
2015-12-01 13:07:01 +01:00
iceman1001
1063a0a872
textual fix.
2015-11-27 17:00:48 +01:00
iceman1001
91079e36b5
FIX: the t55xx bruteforce method got some fixes, in commandname, uint32_t instead of int, and output texts.
2015-11-27 16:59:35 +01:00
iceman1001
c188b1b9b2
ADD: @go_tus simple bruteforce for t55xx, refactored a bit.
...
ADD: @pwpiwi 's implementation of Hardnested
2015-11-27 16:24:00 +01:00
iceman1001
1a570b0a6a
CHG: Missing some headers
...
FIX: some message/warning in pm3_binlib.c @gm4tr1x
2015-11-23 10:49:16 +01:00
iceman1001
e9a92fe237
FIX: the read counter in "hf 14a sim" (for ntag/ev) should work better now. Instead of always returning zero, it increases aswell.
...
--Started to add the TI demod into the 'LF SEARCH"
2015-11-22 21:48:15 +01:00
iceman1001
5636ee8ce6
ADD: 'hf mfu info' now prints following settings:
...
NFC_COUNTER_EN - If set, every read,fast_read increases a counter.
NFC_COUNTER_PROT_PWD - If set, reading nfc_counter needs a successfull pwd authentication before
These new settings is only valid for NTAG213/215/216,
2015-11-22 18:13:26 +01:00
iceman1001
a126332a7b
ADD: @marshmellow's fixes to awid, viking and T55x7
...
ADD: 'lf t55xx detect' now can be called with a password.
ADD: trying to add the read counter and increase counter commands for ntag sim.
2015-11-22 17:33:41 +01:00
iceman1001
52f2df615b
ADD: lf indalademod output, The binary string is now printed with linebreaks every 16bits
...
ADD: lf awid code is modified, some minor changes in outputs
ADD: lf t55xx write now prints the password on the same row, looks better when using the new "lf t55xx wipe" command.
ADD: the ioprox T55X7_IOPROX_CONFIG_BLOCK block.
2015-11-21 18:48:58 +01:00
iceman1001
6426f6ba86
@marshmellows last LF changes.
...
- wipe a t55x7 tag
- stable demods
-
2015-11-20 16:56:43 +01:00
iceman1001
57c7b44be5
FIX: some fixes to indalademod and viking from @marshmellow42
2015-11-10 18:56:43 +01:00
iceman1001
0956e0dba5
FIX: an error that I introduced to the csetblock command with wrong length of crc calcs.
...
CHG: variable name in csetblock change. just trying to be consistant.
ADD: code clean up in hf 14a, added some help text methods.
2015-11-10 11:45:45 +01:00
iceman1001
70459879e9
added @marshmellows new viking demod.
...
adjusted it to fit with the clone/demod that is under "lf viking" commands.
did some code clean up, 3spaces into tab.
2015-11-10 11:42:59 +01:00
iceman1001
4db2af08cd
fix: forgot to remove this when merging piwi's fixes.
2015-11-09 22:06:48 +01:00
iceman1001
edaf10af99
CHG: minor code clean up, removed commented old code.
...
ADD: usb_poll_validate_length to some deviceside loops.
ADD: @marshmellow42 's fixes to LF
2015-11-09 21:51:34 +01:00
iceman1001
bca7107931
ADD: @marshmellow fix for em41x clock.
...
CHG: swap the int to a uint8_t to skip a compiler error
2015-11-09 21:49:02 +01:00
iceman1001
cc3c0a5148
ADD: @piwi's fixes to .history
2015-11-09 21:46:57 +01:00
iceman1001
c2731f37be
CHG: a major remake of the "hf mf c*" commands. Ie chinese magic tags. Tried to make them consistent in parameter calls and simplified. And fixed the annoying gen1 tags that answers with a ACK/NACK on HALT commands..
2015-11-09 21:46:15 +01:00
iceman1001
94422fa23f
ADD: @marshmellow42 's fixex and resetread t55x7
2015-11-02 20:46:17 +01:00
iceman1001
afa86e5c03
ADD: help text for 'hf snoop' / 'hf search' / 'hf list'
...
CHG: minor code changes.
CHG: makefile , moved hi_sniffer.v from LF into HF row. @piwi suggestion for PR https://github.com/Proxmark/proxmark3/pull/141
2015-11-01 19:49:08 +01:00
iceman1001
84f9cf0626
ADD: a minor xor script
2015-10-30 09:07:04 +01:00
iceman1001
f218d50efb
ADD: @gm4tr1x found some new known mifare keys.
2015-10-30 09:05:22 +01:00
iceman1001
1d0ccbe04b
ADD: added the "hf snoop" patch original from @Enio, rearranged by @Etmatrix.
...
ADD: added the "t55x7" refactoring by @marshmellow42
2015-10-27 21:47:21 +01:00
iceman1001
1c8fbeb93e
ADD: 'LF T55X7 WAKEUP' command. For tags with AOR bit set, send this command with password to wake tag up and be able to do a "LF SEARCH" etc on it.
...
CHG: Minor code changes on T55X7 code. Default password is back to 'FF FF FF FF',
REM: removed @marshmellow42 's wakeup option in "lf t55x7 read",
--- BASICALLY:
if a T55X7 tag has following bits set:
AOR - send wakeup command with pwd, to enable LF interacting with it.
PWD - send read/write/trace/info command with pwd. No need to send wakeup.
2015-10-21 09:12:33 +02:00
iceman1001
f82894ba69
CHG: move some methods, its easier to read now. Cosmetic change.
2015-10-21 09:07:36 +02:00
iceman1001
9276e859a6
ADD: @marshmellows42 's fixes for "lf cmdread" and CHANGELOG.md
...
ADD: Added the "lf t55x7 wakeup" command. It will send a pwd, and leave the antenna on.
Process like:
1. lf t55x7 wakeup p 11223344
2. lf search
---
It is still not finished, will work together with the "lf t55x7 commands" in next step when I figure out the process from the datasheets.
2015-10-20 19:00:02 +02:00
iceman1001
b87f99f4bb
ADD: some more keys found on a pastebin
2015-10-19 22:41:53 +02:00
iceman1001
a826cb0df1
FIX: tnp3sim, now can insert keys if the dumpfile is blank. Like the ,,,lander dumps...
2015-10-19 22:39:08 +02:00
iceman1001
f14c9bf915
FIX: "abort trap 6" error when runing the tnp3sim.lua script was because the CMD_MIFARE_EML_MEMSET needs to sent the bytewitdh now with recent changes in code to deal with different sizes in emulatormemory. the third argument should be 16 instead of 0.
2015-10-17 14:35:04 +02:00
iceman1001
d8a3b6c117
FIX: @tony pointed out that there was a method name lost... its been reinstated :)
2015-10-17 14:16:42 +02:00
iceman1001
a739812e89
FIX: thanks @tony, for pointing out a "end" statement inside tnp3sim.lua
...
ADD: @marshmello42 fixs for t55x7
2015-10-16 23:16:46 +02:00
iceman1001
952a812c00
FIX: a suggested fix for #136 where the "lf t55x7 read" command when called with a password. The call will now try loading the config block, decode it and see if PWD is set.
...
If PWD Bit is set, the call will be allowed to execute.
If PWD Bit is NOT set, the call will print a message and excute the call but without sending the password.
If config block is not being able to read or decode, the call with print a warning message and exit the call.
2015-10-15 19:17:20 +02:00
iceman1001
6a09bea427
CHG: code clean up. Have some questions regarding the CopyVikingTo method. The configblock looks wrong..
2015-10-15 11:30:37 +02:00
iceman1001
ac2df3460a
ADD: @marshmellows fixes for t55x7 reading signal.
...
ADD: @marshmellows "diphase" definition for T55x7.
MOV: extracted the aquisition from the t55x7 methods and put them inside lfsampling.c
FIX: pcf7931 write, there is 16bytes in a block.. not 4 as I thought before.
FIX: t55x7 lowered the WRITE_0 to 16. Even bigger gap.
2015-10-15 10:23:15 +02:00
iceman1001
274e7dd110
FIX: fixed the "lf pcf7931 write" input validation. *untested*
2015-10-14 11:16:43 +02:00
iceman1001
ba52aac40e
FIX: Removed a arrat from the struct configPcf in "LF PCF7931"
2015-10-12 21:49:11 +02:00
iceman1001
2285d9dd94
FIX: I did a clean up of the "LF PCF7931" code. The write command is not quite done.
...
FIX: Added some more "clearCommandBuffer" calls before sending..
2015-10-12 21:30:54 +02:00
iceman1001
5ee53a0e75
ADD: There were lot of calls to enable tracing, but very few to turn it of afterwards in the methods.
...
Don't know if it has some influence but can't hurt calling "set_tracing(FALSE);" when method returns.
2015-10-11 19:14:17 +02:00
iceman1001
3bc7b13d23
ADD: @marshmellow42's decrypt crypto-1 method,
...
ADD: @piwi's latest commit to PM3 Master, aiming at the WDR in "hf mf mifare".
2015-10-11 09:07:29 +02:00
iceman1001
e98572a1e2
I just merged @marshmellow's branch "iclass" and that was a lot of new functionality. *great work*
...
Things like the ICLASS, tryDecryptWord,
--
My other stuff like default keys, some new Mifare EV1 commands 0x40, 0x43 for the logging annotation, start of the T55x7 configblock helper functionality (ripped from Adam Lauries RFIdler code)
Changes to the PCF7931 functions written, which has a lousy input check..
2015-10-07 23:00:46 +02:00
iceman1001
f3cfe428f8
ADD: fixed some spelling misstakes in luascript.
...
ADD: fixed some spelling misstakes in "hf mfu eload" help
2015-10-05 21:25:00 +02:00
iceman1001
0de8e3874d
A lot of changes...
...
.. ntag simulation stuff from @marshmellows branch "ntag/sim"
.. hf mf mifare fixes from @pwpivi.
.. hw status command
.. speedtest function from @pwpivi
.. Viking Functionalities, (not a proper DEMOD, but a start)
.. GetCountUS better precision from @pwpivi
.. bin2hex, hex2bin from @holiman
...
starting with getting the T55x7 CONFIGURATION_BLOCK for different clone situations. Ripped from Adam Lauries RFidler, nothing working or finished..
...
Started working with the T55x7 read command with password actually performs a write block... See Issue #136 https://github.com/Proxmark/proxmark3/issues/136 Not solved yet.
...
Started add SHA256.. not working yet..
2015-10-04 18:01:33 +02:00
iceman1001
05beaa8dd8
MINOR CHG: help text change for the "lf t55xx config" command. change NZ into NRZ
2015-08-12 21:39:29 +02:00
Iceman
a71c68bdf0
Merge pull request #4 from gcohen55/ubuntu_makefile
...
updated makefile, readme
2015-08-04 09:34:24 +02:00
Gil Cohen
8fac5452b8
updated makefile, readme
2015-08-03 23:07:57 -05:00
iceman1001
a82c1ac827
FIX: A old bug regarding: CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K command, where it causes the USB_COMMAND_BUFFER to overfill is corrected. The message: "WARNING: Command buffer about to overwrite command! This needs to be fixed!" was showing when it happens.
...
The solution is not to add the CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K to the storeCommand function.
2015-07-31 18:48:58 +02:00
iceman1001
f62b5e1204
added @piwi 's usb speed test.
...
.. found out that my usb speed is really slow. Started to look for reasons. Have a win7 64 env, running on a vmware image.
2015-07-31 10:37:24 +02:00
iceman1001
5de79e20f1
MOD:: reverse back changes to 14443b.c
...
ADD: the hid-flasher/usb_cmd.h wasn't up to date with how it's other file /common/usb_cmd.h looks like.
ADD: utils.lua 14443v crc inside LUA.
ADD: utils.lua ConvertAsciiToHex method and minor adjustments checks.
2015-07-28 21:33:09 +02:00
iceman1001
3b4fa54235
REM: Remove a double pasted section of local variables.
2015-07-24 20:34:31 +02:00
iceman1001
14e1862537
REM: removed a comment
...
ADD: added the ISO14443b command to commands.lua
2015-07-24 16:45:52 +02:00
iceman1001
7838f4beba
MERGED: @holimans changes
...
MERGED: @piwi changes
MERGED: @marshmellows changes.
I'm not even gonna try write up all that stuff..
ADD: changed some commands inside the "Hf 14a sim" on deviceside.
ADD: @mobeius "two nonce" version for mfkey32. It is also inside the "hf 14a sim" with the "x" parameter.
2015-07-22 23:00:52 +02:00
iceman1001
f445df401e
ADD: started with adding a "LS" command that lists the commands without the help text printed. To give easy clean list.
2015-07-22 11:19:15 +02:00
iceman1001
5b59bf20c7
FIX: "hf list 7816", the s-blocks is now also printed.
...
FIX: iso14443b.c got some minor adjustments in the demod and codeas14443btag. Seems it works better for me.
I still have the problem with powerup of a 14b tag. I need to run the "14b raw -c -p 05 00 08" a couple of times before I get an answer.
2015-07-19 23:24:19 +02:00
iceman1001
db25599d7f
ADD: @holiman's clearCommandBuffer in cmdlft55xx.c
...
ADD: @VERTCraig's AVID commands.
TEST: testing some changes to iso14443 demod.
2015-07-18 20:43:14 +02:00
iceman1001
c5f8c67ab4
ADD: ISO7816-4 annotation in "hf list".
...
Only basic 7816 command apdu supported. USAGE::"hf list 7816"
2015-07-17 21:56:00 +02:00
iceman1001
d8af608f8e
TEST: Moebius two noce mfkey32...
2015-07-13 23:06:49 +02:00
iceman1001
b10a759fef
@PM3 master merges, Piwi fix for mfnested
...
@Marshmellow42 's fix for FDB
2015-07-12 22:58:16 +02:00
iceman1001
6de14cec0e
CHG: some minor changes in the ouput from hf 14b raw.
...
ADD: @marshmello42 's textual change in LF.
2015-06-29 22:37:55 +02:00
iceman1001
c830303d7e
FIX: @pwpiwi 's fixes for darkside / nested attack about the NACK/PRNG bugs.
2015-06-25 12:41:39 +02:00
iceman1001
5ce7e22af6
ADD: forgot the zlib and some new fpga compress file.s
2015-06-25 12:29:41 +02:00
iceman1001
17ad0e0948
ADD: @marshmellow42 's 14b fixes.
...
FIX: 14b sim changes in iso14443b.c , *experimental* I took some timing loops from "14a sim" armsrc/iso14443a.c and merged it into the "14b sim". Now using two pm3's I can have one simulating and the other reading and it works. Ask @pwpiwi if you want to know more of what those timing loops does. Something about waiting for the fpga delay queue...
2015-06-25 12:25:44 +02:00
iceman1001
9783989b40
ADD: pwpiwi 's FPGA compress
2015-06-25 12:22:34 +02:00
iceman1001
f53020e729
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/Makefile
armsrc/iso14443b.c
armsrc/lfops.c
client/cmdhf14b.c
client/cmdhfmfu.c
fpga/fpga_hf.bit
fpga/hi_read_rx_xcorr.v
2015-06-23 23:02:29 +02:00
iceman1001
d0f3338e0c
ADD: PACE functionality ref: https://github.com/Proxmark/proxmark3/pull/121
...
FIX: some missing usb_commands for EPA.
2015-06-23 22:30:18 +02:00
Martin Holst Swende
1e1de234ac
Merge pull request #121 from frederikmoellers/master
...
Add PACE replay functionality
2015-06-23 22:23:08 +02:00
Martin Holst Swende
b8d34d0598
Merge pull request #118 from marshmellow42/master
...
fix t55xx write timing
2015-06-23 22:18:50 +02:00
iceman1001
24344f28ad
FIX: ref 2ec8773314
...
@marshmellow42 's fixes for pskdemod and mfu.
2015-06-23 19:22:40 +02:00
marshmellow42
2ec8773314
fix bug in pskdemod return value if no samples...
...
... caused crash in data psknexwatchdemod if no samples were in the
graphbuffer.
also fixed hf mfu wrbl and rdbl to allow printing of help without a tag
being present.
2015-06-23 12:16:23 -04:00
pwpiwi
01b7a6a898
Merge pull request #114 from pwpiwi/iso14443b_fix
...
fixing iso14443b (issue #103 ): fix bug introduced during Bigbuf rework
2015-06-23 07:14:52 +02:00
Frederik Möllers
3bb07d96c8
Add PACE replay functionality
...
This function allows the user to specify APDUs which are sent to a card
supporting the PACE protocol. The response times are measured and
printed.
The code was pulled from the old Google Code repository (branch "epa")
and modified to fit into the new code base.
2015-06-22 14:20:13 +02:00
iceman1001
22e2470051
ADD: @marshmellow42 fudan detection in hf mfu
...
ADD: @marshmellow42 14b reader changes.
ADD: @pwpiwi 14b fixes
2015-06-21 11:07:05 +02:00
marshmellow42
7c8b5e6811
comment fudan check possibilities
2015-06-20 21:33:42 -04:00
marshmellow42
f4217d58b6
add ultralight compatible test
2015-06-18 17:19:43 -04:00
iceman1001
abb215301c
add: @pwpipi 's fixes to 14B
2015-06-18 09:52:53 +02:00
iceman1001
02984d683c
ADD: @marshmellow42 's help text changes to the reveng
2015-06-18 09:52:25 +02:00
pwpiwi
132a02179c
fixing iso 14443b (issue #103 ):
...
- fix: treat empty commands as error
- deleting dead code
- rename USB-Commands (ISO14443 -> iso14443B)
2015-06-18 09:49:22 +02:00
pwpiwi
d5875804a3
fixing iso14443b (issue #103 ):
...
fix: don't waste time to calculate parity bits. Instead add void parity bits to trace and ignore them on client side
2015-06-18 07:56:08 +02:00
pwpiwi
51d4f6f114
fixing iso14443b (issue #103 ):
...
- fix: IQ demodulator (FPGA)
- fix: approximately align reader signal delay to tag response delay (FPGA)
- fix: remove deprecated RSSI calculation to improve decoder speed (iso14443b.c)
- fix: better approximation of signal amplitude to avoid false carrier detection (iso14443b.c)
- fix: remove initial power off in iso14443b raw command (iso14443b.c)
- add: enable tracing for iso14443b raw command (iso14443b.c)
- fix: client crashed when checking CRC for incomplete responses (iso14433b.c)
- speeding up snoop to avoid circular buffer overflow
- added some comments for better documentation
- rename functions (iso14443 -> iso14443b)
- remove unused code in hi_read_rx_xcorr.v
2015-06-17 20:27:36 +02:00
iceman1001
553e868f25
CHG: just made sure it uses a default file name now.
2015-06-15 21:02:17 +02:00
iceman1001
d71d59dbd1
ADD: @marshmellow42 's 14b changes.
2015-06-15 20:59:01 +02:00
iceman1001
ffaa0ff334
FIX: removed width in cmdcrc.c , to get rid of the compiler warning.
2015-06-15 13:59:33 +02:00
marshmellow42
6ac4cb270a
minor fixes
...
see @icemant1001 -
0ad1a1d492
2015-06-15 00:44:57 -04:00
iceman1001
96e41bfcec
add: a .gitignore to be able to add the folder client/obj/reveng.
2015-06-14 23:32:20 +02:00
iceman1001
d7f3f65361
add: a .gitignore to be able to add the folder client/platforms.
2015-06-14 23:31:52 +02:00
iceman1001
2495281d14
fix; stupid fixes for some compiler warnings messages of unused variables..
2015-06-14 23:31:05 +02:00
iceman1001
0ad1a1d492
FIX: minor variable fixes when compiling on linux.
...
cmddata.c: In function ‘Cmdmandecoderaw’:
cmddata.c:420:2: warning: format ‘%i’ expects argument of type ‘int *’, but argument 4 has type ‘size_t *’ [-Wformat=]
sscanf(Cmd, "%i %i", &invert, &maxErr);
^
cmdlfem4x.c: In function ‘CmdEM410xRead’:
cmdlfem4x.c:58:2: warning: format ‘%llx’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘uint64_t’ [-Wformat=]
sprintf(id, "%010llx",lo);
^
2015-06-14 23:02:52 +02:00
iceman1001
32719adfa1
ADD: added support for some NTAG/EV1 commands to "hf 14a sim" on device side.
...
0x1B (authenticate)
0x3a (fast read)
0x60 (get_version)
This is used in a new mode on client, "hf 14a sim t 7"
2015-06-14 22:40:18 +02:00
Martin Holst Swende
26fbe1fbd9
Merge pull request #117 from marshmellow42/master
...
askbiphase bug fix
2015-06-14 19:32:36 +02:00
iceman1001
c043981c04
chg: added some more outputs to the reveng-crc script e.lua ... now shows -b -B -l -L also in columns. You'll need to read the reveng -h helptext to understand.
2015-06-14 17:19:41 +02:00
iceman1001
b4c1f167da
FIX: old bug back, and now fixed again. @marshmellow42
2015-06-14 17:18:22 +02:00
marshmellow42
fd227f4e7d
add comment
2015-06-14 11:11:00 -04:00
marshmellow42
c7d6721290
bug fix. askdemod edits invert pointer, cannot be 0
2015-06-14 10:54:55 -04:00
iceman1001
1299c798fc
ADD: @marshmellow42 's 14b reader changes.
...
FIX: @marshmellow42 's ASKbiphaseDemod fixes.
CHG: added a check in ASKbiphaseDemod to make a compiler warning message go away.
2015-06-14 14:39:50 +02:00
Martin Holst Swende
0f5b97d92c
Merge pull request #115 from marshmellow42/master
...
add-ons and bug fixes
2015-06-14 09:02:13 +02:00
iceman1001
1417a7f9d0
minor textual changes from @marshmellow42
2015-06-13 12:14:38 +02:00
iceman1001
99789601dc
ADD: @marshmellow42 's new "-g" search for crc in a hexstring *great*
...
ADD: fixes in the reveng calling methods
2015-06-10 08:46:16 +02:00
iceman1001
68ff832584
fix: nice output..
2015-06-09 21:46:22 +02:00
iceman1001
dd1df4901d
@marshmellows memory fixes for reveng1.30 in client..
2015-06-09 21:32:22 +02:00
iceman1001
817d709615
@marshmellows memory fix
2015-06-09 21:29:24 +02:00
iceman1001
d352146782
CHG: minor layout and call fixes to e.lua (the test script for hooking up reveng1.30)
2015-06-09 21:28:06 +02:00
iceman1001
60e8657796
CHG: all @marshmellow42 's changes to make the reveng work.
...
ADD: lua script test for using the reveng inside lua. *prove of concept*
it implements -h help
-d data in a hexstring
-w width of the crc family. (ie 16 gives all CRC-16 calculations.
it iterates thru all found crc presets in a crc family based on the width of crc. It calcs crc and the reverse crc.
2015-06-09 13:31:53 +02:00
iceman1001
a71ece51e4
ADD: iso11784/85 FDX-B
...
ADD: the source from RevEng 1.30, got into the PM3 client.
2015-06-07 11:35:49 +02:00
marshmellow42
8e2e6c8eb0
add clock to ask rawdemod outputs
...
fix biphase invert bug (correctly)
2015-06-07 00:42:57 -04:00
marshmellow42
07b5a3c3ba
Modified kermit crc to use existing crc calc code
2015-06-05 22:39:56 -04:00
marshmellow42
c2c7f6c271
fdx-b clean up
2015-06-04 13:10:33 -04:00
marshmellow42
6eaa8da9dc
Add CCITT Kermit CRC check for FDX-B demod
2015-06-04 12:53:19 -04:00
iceman1001
ad6219fc91
ADD: @marshmellow42 's fixed version of the ISO11784 FDX-B
...
ADD: crc16_ccitt_rev (reverse version of crc16_ccitt 0x0000)
2015-06-04 10:33:55 +02:00
marshmellow42
cf4d3e21b0
add fdx-b to cmddata.h
2015-06-04 00:05:37 -04:00
marshmellow42
ecfcb34cc5
add fdx-b to lf search
2015-06-04 00:04:49 -04:00
marshmellow42
b2c330b367
bug fix - biphase invert + fdx-b adjustments
2015-06-03 23:59:22 -04:00
marshmellow42
fd1d30cb76
addition animal tags demod info
2015-06-03 18:28:56 -04:00
marshmellow42
04bb05670d
Testing animal tags
2015-06-03 16:52:20 -04:00
iceman1001
22a6a62fbb
ADD: removed the paritythingy, I missunderstood its purpose.
2015-06-03 22:38:59 +02:00
iceman1001
7f96433c8a
CHG: trying to get the askdemod / biphasedeocde / finding startmarker / removeparity to work in ISO11784demod
2015-06-03 22:19:32 +02:00
iceman1001
0df669a298
ADD: next step ISO11784/85
2015-06-03 21:35:03 +02:00
iceman1001
615f21dde2
FIX: a minor bug fix from @marshmellow42 in "data raw" and ask/biphase.
...
ADD: started witha ISO11784/85 demod function.
2015-06-03 21:12:24 +02:00
iceman1001
4abb052f38
CHG: removed an extra fclose call
2015-06-02 12:20:48 +02:00
iceman1001
1c6e7f0393
ADD: @marshmellow42 's infineon MY D(tm) MOVE LEAN tag identification
2015-06-02 12:20:16 +02:00
iceman1001
d31d3804fe
CHG: help text output was not aligned because of tabs/spaces
2015-06-02 12:18:54 +02:00
Martin Holst Swende
6a2e5adffd
Merge pull request #108 from p-l-/fix-hf-mf-csave
...
Ported hf mf esave trick for unreadable UIDs to hf mf csave
2015-06-01 19:57:57 +02:00
marshmellow42
4a74e2be72
add my_d move lean identification.
2015-06-01 00:18:03 -04:00
iceman1001
af3b8b2dc6
CHG: remade selftest structure
...
CHG: removed debugstatements
2015-05-31 22:33:12 +02:00
marshmellow42
be290d68bd
new lua script from @iceman1001 + bug fix in hf mfu
2015-05-31 16:08:58 -04:00
iceman1001
e86a89044a
FIX: minor fix to the magictest function. It always makes a select tag first, but never took in consideration that the tag already could have been selected.
2015-05-31 21:49:00 +02:00
iceman1001
2d2f7d1948
ADD: @marshmellow42 's changes / fixes.
2015-05-31 21:47:33 +02:00
iceman1001
7142c87e1f
ADD: a script to dump a specific type of Mifare Mini tags.
2015-05-31 21:46:25 +02:00
marshmellow42
1c4c0b0681
add @Iceman1001 s sha1 scripting changes.
2015-05-30 21:51:15 -04:00
marshmellow42
185e038c7d
fixed further typo in lf t5 wr help
...
also fixed offset option char to uint8_t warning in the new offset
option in data printdemodbuffer
2015-05-28 23:14:06 -04:00
marshmellow42
5b37e87a24
fix help typo
2015-05-28 22:52:41 -04:00
marshmellow42
979bba376d
add offset option to data printdemodbuffer
...
easily see demod buffer's hex values at different bit offsets by using:
data printdemodbuffer x o <offset>
2015-05-28 13:23:31 -04:00
iceman1001
95aeb706d7
CHG: @marshmellow42 changes on deviceside.
...
ADD: increase debuglevel for printing a statment in ul_ev1_auth
2015-05-27 23:23:46 +02:00
marshmellow42
4973f23d3c
clean up mfu device side code
...
+ add xor calc to util (prep for desfire)
commented out MifareUWriteBlockCompat as it isn't used in client
currently (it is a command we could support.. but why?)
relabeled a few device side mfu functions to be clearer.
2015-05-27 12:24:13 -04:00
marshmellow42
dcbaa2b582
@iceman1001 s lua script fix
2015-05-26 20:31:07 -04:00
iceman1001
b18948fd92
ADD: aes128_encrypt ECB in scripting.c
...
ADD: aes128_decrypt ECB in scripting.c
ADD: Sha1Hex method in utils.lua
2015-05-26 21:51:18 +02:00
marshmellow42
22342f6dfe
Add clearCommandBuffer before SendCommand
...
adjust output of mfu rdbl to be consistent
fix output of mfu dump in case startPage was specified. (also was
missing "i" in second print...)
2015-05-26 10:40:23 -04:00
iceman1001
ea75b30c81
ADD: SHA1 hashes calculations in sha1.c and LUA
2015-05-26 16:12:33 +02:00
iceman1001
b69947c245
CHG: print up to 20 possible keys.
2015-05-26 11:05:57 +02:00
iceman1001
c3c241f389
CHG: moved a xor function into util.c
...
CHG: added some calls to clearCommandBuffer() in /hf mfu/hf 14a sim/hf mf sim/ commands.
CHG: minor adjustments to relative pathing.
2015-05-26 11:04:57 +02:00
iceman1001
7c60a801d6
FIX: one too many parenthesis
2015-05-25 13:16:10 +02:00
iceman1001
c068ebb78f
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/mifarecmd.c
client/cmdhfmf.c
2015-05-25 13:13:06 +02:00
iceman1001
46cd801c5a
FIX: dumptoemul.lua removed the extra linebreak in the end, making some load commands complain.
...
MOV: moved the try32/try64 attacks (mfkey32/mfkey64) into the nonce2key.c file
CHG: added @marshmellow42 changes to hf mfu dump layout.
ADD: an extra call to BigBuf_free in readcard.. just to make sure that it doesn't leak memory.
ADD: expermimental call to "try32" for "hf mf sim x".
2015-05-25 13:10:55 +02:00
Pierre LALET
1d537ad65c
Ported hf mf esave trick for unreadable UIDs to hf mf csave
...
Thanks: iceman1001
2015-05-25 11:47:27 +02:00
marshmellow42
e406dd5cc9
Merge remote-tracking branch 'upstream/master'
2015-05-24 22:31:13 -04:00
marshmellow42
79d7bcbb51
updated mfu rdbl and wrbl commands
...
@iceman1001 s rdbl and wrbl cmd updates.
dump screen output adjusted
2015-05-24 22:28:21 -04:00
Pierre LALET
292fe72535
Fix filenames for hf mf cload / csave
2015-05-24 22:43:08 +02:00
iceman1001
7444d916c6
FIX: hf mfu dump, now reads correct memory from device-side.
...
CHG: hf mfu dump - output data styled :)
2015-05-24 21:51:44 +02:00
iceman1001
d23f3f2c9a
FIX: ELOAD/ESAVE/CLOAD/CSAVE filename bufferoverflow, and filename generation if UID not readable.
...
Thanks @p-l-
ref: 0b14440dce
2015-05-24 21:50:15 +02:00
Pierre LALET
0b14440dce
Fix filenames for hf mf esave / eload
2015-05-24 20:14:22 +02:00
marshmellow42
0ce03d9ab0
fix mfu dump getbigbuffer bug
...
Thanks @iceman1001 for catching my oops, and fixing it :)
2015-05-23 22:35:50 -04:00
iceman1001
ce432659f2
Adjustments after the big merge from PM3 master.
2015-05-23 08:38:46 +02:00
iceman1001
bcf61bd34a
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
README.txt
armsrc/appmain.c
armsrc/apps.h
armsrc/des.c
armsrc/iclass.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/cmddata.c
client/cmdhf.c
client/cmdhf14a.c
client/cmdhficlass.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/cmdscript.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/scripting.c
client/util.c
common/protocols.h
include/usb_cmd.h
2015-05-23 08:16:40 +02:00
marshmellow42
012c0761bd
hf mfu minor output adjustments
...
dump key placed properly for EV1 and NTAGs
config pages for ntags corrected in printout
note on config that PWD and PACK cannot
actually be read from memory (probably could just delete them (other
than it shows what memory block they are stored in for changing...)
2015-05-22 13:17:51 -04:00
marshmellow42
8f2e50b4c5
mfu info authkeyptr fix
...
didn't follow @iceman1001 s l parameter changes fully... fixed now..
:)
2015-05-22 07:29:18 -04:00
iceman1001
a7e7cd419a
FIX: camelcase on a variable caused some issues.
2015-05-22 08:48:23 +02:00
marshmellow42
06561c34ef
fix to dump cmd print keys.
...
add l option to info cmd.
add ascii print to dump (screen only)
other minor clean up
2015-05-22 00:15:57 -04:00
iceman1001
2491a25235
FIX; the "L" optional parameter for swapping endianess on used authentication key. It is now implemented for following commands.
...
"HF MFU INFO"
"HF MFU DUMP"
"HF MFU RDBL"
"HF MFU WRBL"
CHG; I commented away the option to add the key to the dump, since it is not written in big-endian, like the data is on ULC. This needs to be addressed before it comes back. I like the idea of having keys inside the dumps on the correct places.
2015-05-21 23:17:01 +02:00
marshmellow42
efd193519c
hf mfu bug fixes, and help text fixes
2015-05-21 11:17:01 -04:00
iceman1001
f605970307
FIX: call the wrong usage_hf_mfu method.
...
CHG: minor help text changes.
2015-05-20 23:52:56 +02:00
iceman1001
fff69a1e34
CHG: Merged the "hf mfu rdbl" and "hf mfu crdbl" commands into "hf mfu rdbl". One read command.
...
CHG: Merged the "hf mfu wrbl" and "hf mfu cwrbl" commands into "hf mfu wrbl". One write command.
Both new commands implement a help, authentication (0x1A/0x1B) for ULC and the rest,
2015-05-20 23:44:11 +02:00
marshmellow42
1c429594a1
further mfu info updates
...
needed to auth select when a command failed for locked tags.
some output cleanups from @iceman1001
2015-05-20 16:47:40 -04:00
iceman1001
329f5cf2a5
CHG: making sure all outputs follow the same pattern in "hf mfu info"
2015-05-20 22:04:40 +02:00
iceman1001
c81a80dc96
FIX: made the authentication part a bit clearer. It now uses two booleans to seperate which type of authentication was requested from user.
2015-05-20 21:44:22 +02:00
marshmellow42
cd87ee9133
finish NTAG i2c +...
...
thanks iceman
2015-05-20 15:42:58 -04:00
marshmellow42
46fcd738e0
finish NTAG i2c +...
...
thanks @iceman1001
2015-05-20 15:41:48 -04:00
iceman1001
1fa96198bb
ADD: @marshmellow42 latest fixes,
...
CHG: change name to fancey "NTAG I²C 1K"
2015-05-20 21:03:58 +02:00
marshmellow42
8241872c47
ULEV1_48 had the wrong max block
2015-05-20 14:22:26 -04:00
marshmellow42
ea11861793
minor adjustments to hf mfu
2015-05-20 14:17:43 -04:00
marshmellow42
c7442b7673
Add NTAG i2c and bug fix
...
also streamlined select tag code
2015-05-20 14:06:46 -04:00
iceman1001
623db3559b
CHG: the new NTAG_i2c_1K enums, broke the uint16_t size.. Had to go up one level.
2015-05-20 19:26:11 +02:00
iceman1001
05f7accdbb
CHG: @marshmellows changes.
...
ADD: NTAG i2c 1K / NTAG i2c 2K identification.
2015-05-20 19:20:26 +02:00
marshmellow42
a383f4b708
Add ntag 210, 212, 203 and bug fix
2015-05-20 11:27:44 -04:00
iceman1001
b61e397962
ADD: NTAG_210, NTAG_212 support / identification. @marshmellow42 's idea.
2015-05-20 14:09:40 +02:00
iceman1001
e9bb4f47ee
CHG: "hf mfu info" now always tries to read the NDEF CC. (was restricted to only NTAG213,215,216 before)
2015-05-20 10:36:55 +02:00
iceman1001
593fc3c9a3
FIX: comment out a #include to reveng (my experiment)
...
ADD: Started to add a NTAG203 identification. Its a hard tag to pinpoint. Doesn't have GET_VERSION,
2015-05-19 21:45:06 +02:00
marshmellow42
29250969b0
@iceman1001 s comments/updates mfu cmds
2015-05-18 22:07:11 -04:00
iceman1001
e7e9508883
@Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses bigbuffer now, and can dump NTAG216 :)
...
Consistency on the client-side code "hf mfu". looks nice.
2015-05-18 20:58:33 +02:00
marshmellow42
9d87eb6650
MF ultralight code cleanup
2015-05-18 13:11:00 -04:00
marshmellow42
8258f40969
Iceman1001 s MFU clean up
...
cleaned up MF UL_C auth code device side.
2015-05-17 20:49:25 -04:00
iceman1001
4f5cb23aa1
CHG: the name change from "HF 14A SNOOP" -> "HF 14A SNIFF"
2015-05-16 15:37:27 +02:00
iceman1001
9962091e29
ADD: experimantal test of adding "reveng 1.30" source code into the PM3 Client.
2015-05-16 15:36:40 +02:00
iceman1001
9cdd47c292
chg: @marshmellows changes to "hf 14a reader"
...
add: the experimental "hf 14a sim x" attack impl.
chg: sorry, but I never liked that sniffing was called snooping in this command. So I changed it to "sniff".
2015-05-16 15:30:17 +02:00
iceman1001
833081e3e7
add: @marshmellow changes,
...
chg: remade the authentication for ULC..
2015-05-16 15:27:53 +02:00
marshmellow42
cceabb79e6
mfu info / dump attempt at missing auths
...
NOT TESTED. will test soon. probably has bugs!
2015-05-16 01:00:31 -04:00
marshmellow42
ae8303c13c
mfu dump - beginning of additions
2015-05-15 01:19:58 -04:00
marshmellow42
5b99376a8f
hf mfu dump testing
2015-05-15 00:57:51 -04:00
marshmellow42
93737008ee
@iceman1001 s default keys
2015-05-14 22:55:18 -04:00
marshmellow42
9ccfb3a8bc
@iceman1001 's updated lualibs
2015-05-13 21:36:20 -04:00
marshmellow42
ab7fdfcbed
@iceman1001 updated scripts
2015-05-13 21:20:23 -04:00
marshmellow42
d730878d8c
scripting updates from @iceman1001
...
it compiles but i'm not sure how to fully test it...
:)
2015-05-13 21:14:35 -04:00
iceman1001
224e8c1a4d
ADD: @marshmellows fixes
2015-05-13 20:16:18 +02:00
marshmellow42
6fdf42c61c
minor hf mfu info adjustment from @iceman1001
2015-05-13 11:22:27 -04:00
marshmellow42
e6432f0579
@iceman1001 s coverity scan fixes
2015-05-13 11:14:17 -04:00
marshmellow42
2b3af97df2
various bug fixes
2015-05-13 11:07:47 -04:00
iceman1001
7a5d49b5b4
@marshmellow42 ideas
...
FIX: removed some unneeded calls to ul_switch_off_field.
FIX: once again the OTP is printed nevertheless if its a NDEF CC
2015-05-13 15:48:32 +02:00
iceman1001
664bb5ae72
BUGS: more Coverity scan fixes.
2015-05-13 14:08:59 +02:00
iceman1001
2696349f16
BUGS: Coverty Scan, fixes some memory bugs
2015-05-13 13:23:53 +02:00
iceman1001
046fd76608
a minor clean up when printing the key
2015-05-13 09:15:53 +02:00
iceman1001
8949bb5dad
Added @marshmellow42 "hf search"
2015-05-13 09:13:42 +02:00
iceman1001
63146229bd
ADD: preparation for @marshmellow42 "hf search"
...
FIX: the "hf list" had not correct spaces between the lines, in my version. Fix now.
2015-05-13 09:10:47 +02:00
iceman1001
c92cf81495
minor textual changes
2015-05-13 09:07:47 +02:00
iceman1001
70ee301e0d
another key..
2015-05-13 09:05:21 +02:00
marshmellow42
a2e2bb8a15
hf mfu info - ICEMANS updates
...
plus slight change to UL_EV1 auth annotation.
2015-05-12 18:16:55 -04:00
marshmellow42
6ce0e5386a
HF Search - refactoring cmds to work with it
2015-05-12 16:45:48 -04:00
iceman1001
e9a85114c5
ADD: Print the key for ULEV1/NTAG authentication if sent in cmdhf.c "HF LIST 14A"
2015-05-12 20:27:45 +02:00
iceman1001
3fd842ed98
ADD: found a BCARD KeyB on the net. ref: http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
2015-05-12 19:50:47 +02:00
iceman1001
b6901e17c8
FIX: increased the limit to 0xE6 for MIFARE_ULEV1_FASTREAD
...
ADD: @marshmellows inital "hf search" command...
2015-05-12 18:57:47 +02:00
iceman1001
98cdd56862
ADD: added option to call "hf mfu info" with a authentication key.
...
ADD: added a help text for "hf mfu info" usage_hf_mfu_info
ADD: added @marshmellows changes & fixes.
2015-05-12 18:55:34 +02:00
marshmellow42
8ceb6b03e5
hf search - prelim - re-use hf mfu GetTagType...
...
in hf 14a reader to identify UL(+)
still a work in progress.
2015-05-12 00:19:44 -04:00
marshmellow42
2be768af57
hf mfu info bugs
2015-05-11 18:22:50 -04:00
marshmellow42
4693c188ab
minor hf mfu output consistancies
2015-05-11 16:25:11 -04:00
marshmellow42
345fb24aaa
hf mfu info - ICEMANS bug fixes.
2015-05-11 15:56:12 -04:00
marshmellow42
f04ef47311
hf mfu info bug fixes
2015-05-11 14:49:37 -04:00
iceman1001
fce738fc90
CHG: minor textual changes, consistency...
2015-05-11 20:38:13 +02:00
iceman1001
f288cb607f
ADD: added a List parameter to tnp3clone.lua script.
2015-05-11 19:38:53 +02:00
iceman1001
0ad970fb02
ADD: another default key: VIGIK1
2015-05-11 19:37:44 +02:00
iceman1001
ebd7412d7d
BUG: Read the wrong page(2) as Capability container, should be 3.
...
BUG: NTAG 215 identification was wrong (!=) should been (==)
2015-05-11 15:54:02 +02:00
marshmellow42
f805ac7a2b
minor adjustments to mfu info
2015-05-08 13:01:27 -04:00
marshmellow42
c585a5cf0b
further MFU info updates (mainly icemans)
2015-05-06 22:15:41 -04:00
iceman1001
802319a37e
ADD: added the new magic detection, where we send a partial ISO14443A_CMD_WRITEBLOCK (0xA0) command to page 0. if the tag answer 0xA ACK (its magic) or if it answers 0x00 NACK its not.
...
The normal behavior for a tag is to send NACK.
2015-05-06 23:50:31 +02:00
iceman1001
334cc089c9
CHG: clearing a char array before using.
2015-05-06 22:41:40 +02:00
iceman1001
aebe77905b
CHG: extracted the UL_C & UL magic tests.
...
ADD: a raw write command also there.
CHG: "hf mfu info" got some more love, looks better too.
UL_EV1 / NTAG, only try known passwords if AUTHLIM is set to 0.
2015-05-06 22:40:46 +02:00
marshmellow42
372a82570b
MFU adj to allow 0 len returns on raw cmds
2015-05-06 10:17:39 -04:00
marshmellow42
45673b9457
MFU adjustment to allow 0 len returns from raw cmds
2015-05-06 10:16:31 -04:00
marshmellow42
abab60ae21
MFU info adjustments
2015-05-06 09:27:03 -04:00
iceman1001
74c7ff4770
CHG: @marshmellows changes to anntations.
2015-05-06 14:20:24 +02:00
iceman1001
2b03dea768
ADD: UL-EV1 signature printing.
...
CHG: @marshmellows changes.
2015-05-06 14:19:23 +02:00
iceman1001
69a2953679
FIX: nasty bug when memcpy structs..
...
ADD: @piwi's topaz commands
2015-05-06 09:30:48 +02:00
marshmellow42
75377d29d6
MFU - Icemans further improvements
...
add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info
2015-05-06 00:55:29 -04:00
iceman1001
a903be4361
CHG: "HF MFU INFO" extracted more printstatements
2015-05-05 23:26:05 +02:00
iceman1001
b9a3c8642e
ADD: "HF MFU INFO" Reading and printing of UL-EV1 configuration pages.
2015-05-05 23:14:55 +02:00
iceman1001
8297860e25
CHG: making sure no buffer overflows will occure in ul_send_cmd_raw by adding responseLength parameter to all calls.
...
CHG: added UL-C configurations details to be printed
2015-05-05 22:15:02 +02:00
iceman1001
996fda30ee
BUG: missing %s in printing version tagtype. Thanks @Marshmellow!
...
BUG: buffer overflow when reading the Capability Container. Thanks @Marshmellow!
2015-05-05 13:25:54 +02:00
iceman1001
09c2a802a1
ADD: @holimans changes.
2015-05-05 00:31:02 +02:00
iceman1001
f07e76c687
CHG: minor spelling
2015-05-05 00:27:34 +02:00
iceman1001
e1c88b0965
ADD: @marshmellows changes
2015-05-05 00:26:17 +02:00
iceman1001
2c74558d71
CHG: enhanced the "hf mfu info" a lot. It can detect UL/UL-C/UL-EV1/NTAG213/NTAG215/NTAG216
...
and at present it can detect if a UL-C tag is magic (uid changeable)
FOR UL it writes the first configuration pages 0-3.
For UL_C it tests some default 3des keys, and lock / confg bytes at pages 42-43,44-47
For UL_EV1 / NTAG it collects the GETVERSION command and tries to read 3 counters., it also tries one default password of 0xFF,0xFF,0xFF,0xFF for the EV1 /NTAG authentication 0x1B.
FOR UL_C_MAGIC, it tries to see if the gatherd nonces for authentication 0x1A is the same, which indicates on my tags that they are magic.
There is the @marshmellow changes to "hf mfu dump" command.
This commit needs testing, and is to be considered experimental.
2015-05-05 00:25:10 +02:00
marshmellow42
63e1d35a07
Merge remote-tracking branch 'upstream/master'
2015-05-03 23:31:58 -04:00
marshmellow42
f9848fd647
MFU dump UL-C with key
...
adding UL-C auth and keys to dump cmd
swapped endian for input of hf mfu crdbl to match output of hf mfu info
cmd and tag info app
2015-05-03 23:17:11 -04:00
Martin Holst Swende
4b36037948
Fixes to issue #100
2015-05-03 22:09:52 +02:00
marshmellow42
b3125340f3
Icemans UL-C Auth dev side fix plus a few other ...
...
... small UL fixes
2015-05-03 15:41:11 -04:00
iceman1001
1c1c5f4cae
CHG: "hf mfu crdbl" help text, got at correct length 3des key.
...
CHG: Added @marshmellows fixes for "hf mfu info"
CHG: moved some debug printandlog statements around.
2015-05-01 15:33:54 +02:00
marshmellow42
7eec1204e7
fix bug in mfu cauth
2015-04-30 10:34:20 -04:00
marshmellow42
92690507ab
Iceman's updates to MFU info and dump
2015-04-30 09:28:43 -04:00
iceman1001
1ec21089b2
CHG: the work in progress of making "HF MFU INFO" / "HF MFU DUMP" goes on.
...
ook @marshmellows changes and remade them a bit. TagTypeUL_t behaves like a flag-enum.
"HF MFU DUMP" now autodetects tagtype, and the deviceside should report back proper length.
2015-04-30 10:15:52 +02:00
marshmellow42
f168b2633b
MF Ultralight - Iceman's updates + mine
...
Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C
2015-04-29 18:27:31 -04:00
iceman1001
a8be77afd1
CHG: re-factored the "HF MFU CAUTH" command to be simpler.
...
ADD: "HF MFU INFO", added detection of MAGIC UL-C tags and a simple loop test 5 default 3des keys.
2015-04-29 20:24:37 +02:00
iceman1001
5e336f53d9
REM: Removed the GetVendorStr, and used the getTagInfo() instead.
2015-04-28 23:32:45 +02:00
iceman1001
5d554ea67f
ADD: HF MFU SETUID, this commands helps changing the UID on a magic UL, UL-C tag.
...
It reads block2, since only one byte is going to change. Then it proceds to write block 0,1,2 with recalc BCC1, BCC2 bytes.
CHG: HF MFU INFO, got some love in the form of detection of UL/UL-C/UL-EV1. Took same idea from HF 14A READER.
2015-04-28 23:31:22 +02:00
marshmellow42
bdfb62b405
Iceman's script aes fix #93
...
Thanks Iceman (note I did not have a tag to double test this one. :)
2015-04-28 15:53:07 -04:00
marshmellow42
4745afb647
Iceman's Issue #96 fix
2015-04-28 15:35:23 -04:00
iceman1001
68bf87e0c5
CHG: added some sanity checks for the Ultralight-EV1 annotations, to make less false positives in the tracelog
2015-04-28 20:59:20 +02:00
iceman1001
466bc4599c
CHG: fixed a better detection for Ultralight, Ultralight-C, Ultralight-EV1 tags.
...
--see https://github.com/Proxmark/proxmark3/issues/96
-- still todo, finding a good way of detecting Magic Ultralight-C tags.
-- thanks @marshmellow for pointing out proper UL-C tags responses is different.
2015-04-28 20:58:18 +02:00
iceman1001
fab0b37968
CHG: removed linebreak in string.
2015-04-26 18:05:45 +02:00
iceman1001
984f957105
ADD: some more default keys.
2015-04-26 18:05:06 +02:00
iceman1001
c309eca94a
CHG: added some linebreaks for the help output in LF.
2015-04-26 18:03:57 +02:00
iceman1001
11b1e2e506
ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation
2015-04-26 18:03:21 +02:00
iceman1001
fb2d24882e
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
client/cmddata.h
client/cmdhfmf.c
client/cmdlf.c
client/cmdlfem4x.h
client/cmdlft55xx.c
client/lualibs/default_toys.lua
client/scripts/tnp3clone.lua
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
2015-04-24 19:04:01 +02:00
iceman1001
395f6a814f
ADD: changes to the Ultralight diviersification algo.
2015-04-24 18:38:24 +02:00
iceman1001
1b3c567df2
ADD: charatect name, level, sequence number,
...
CHG: minor code clean up.
2015-04-24 18:37:40 +02:00
iceman1001
0beb94e67b
CHG: some minor code cleanup.
2015-04-24 18:36:11 +02:00
iceman1001
bb84c38196
ADD: found another sub-type,
2015-04-24 18:35:09 +02:00
iceman1001
e8b07838ab
ADD: more toy-tokens, among others some missing swapforce.
2015-04-24 18:34:24 +02:00
iceman1001
64ad618e9c
ADD: some missing enums:
...
ISO14A_SET_TIMEOUT = 0x40,
ISO14A_NO_SELECT = 0x80,
ISO14A_TOPAZMODE = 0x100
2015-04-24 18:33:31 +02:00
iceman1001
abcb166ffe
ADD: a minor modification to "HF 14A READ" to enable the correct identification between ULTRALIGHT / ULTRALIGHT-C / ULTRALIGHT EV1 tags.
2015-04-24 18:19:51 +02:00
Martin Holst Swende
a3abb02897
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-04-23 09:51:04 +02:00
Martin Holst Swende
0e6c7336b0
Fixed issue with dumping iclass tags > 2KB in size
2015-04-23 09:50:44 +02:00
marshmellow42
8e0cf02308
minor change to lf em4x menu & iceman script...
...
...updates
2015-04-10 00:06:59 -04:00
iceman1001
9c09e006d6
CHG: removed unused code.
...
FIX: moved some checks to make the script run a tad bit faster.
2015-04-09 20:38:38 +02:00
iceman1001
26b8f38b63
CHG: changed some help texts.
2015-04-09 20:36:12 +02:00
iceman1001
68e6434527
FIX: some minor corrections to identify more tokens.
2015-04-09 20:35:04 +02:00
iceman1001
d87779d6d1
FIX: fixed a minor bug introduced when changing from OpenSSL -> PolarSSL.
...
ADD: changed code to handle both encrypt and decrypt AES 128.
2015-04-09 20:34:34 +02:00
marshmellow42
664f658650
nexwatch fix .h file + icemans mf csetblk w arg
...
forgot to include the new nexwatch command in the header...
added icemans hf mf csetblk w parameter fix
2015-04-08 15:08:05 -04:00
marshmellow42
25d3e5cc83
Merge remote-tracking branch 'upstream/master'
2015-04-08 14:19:19 -04:00
marshmellow42
411105e036
added nexwatch demod & iceman lua
...
added nexwatch demod (also added to lf search)
added iceman's lua script adjustments
2015-04-08 14:19:03 -04:00
marshmellow42
322f7eb111
fix to lf t5 detect/read cmds
...
i think this functions fairly well...
still some issues with demod positioning for various reasons.
ASK/Biph/FSK work pretty well
the PSK Demod still needs a little attention to help it better demod
various carriers...
2015-04-08 11:18:29 -04:00
marshmellow42
9632ecbe3d
update t5 detection test()
...
missed this file in last commit... sorry.
2015-04-08 10:12:24 -04:00
Martin Holst Swende
83602affe5
Fixed buffer initialization errors, as reported in http://www.proxmark.org/forum/viewtopic.php?pid=15337#p15337
2015-04-08 13:31:04 +02:00
marshmellow42
fef74fdce4
lf ask consolidation
...
backend:
askman and askraw demods merged into askdemod (args adjusted
accordingly)
re-arranged lfdemod.h in alphabetical order and by category
front end:
data detectclock a (ask) now also reports the selected best start
position for demod
data manrawdecode takes an invert arg now
2015-04-08 01:07:39 -04:00
iceman1001
105ce39607
FIX: two parentheses were missing.
...
FIX: setting the default key to Oxff bug. (http://www.proxmark.org/forum/viewtopic.php?pid15325#p15325 )
FIX: proper initialisation of variables ;)
2015-04-07 18:05:35 +02:00
iceman1001
cff17e78f5
FIX: a wrong comment inside default_toys.lua
...
FIX: a wrong linking to default_toys.lua in tnp3 scripts.
2015-04-07 18:02:29 +02:00
marshmellow42
49bbc60af3
lf cleaning++
...
data askedgedetect - removed unneeded code
lf em em4x50read bug fix / error checking
graph-save/restore auto repaint after restore.
2015-04-07 00:53:06 -04:00
marshmellow42
cc15a1187b
lf cleanup - fixes
...
more lf em em4x50read fixes
adjust heavy clipping ask clock detection
clean up t55xx minor items
2015-04-06 23:17:30 -04:00
iceman1001
ba3fd680fb
FIX: fixed a bug in "hf mf csetblock" where it didn't used the "w" wipe parameter before.
...
CHG: minor textual changes.
2015-04-06 18:52:20 +02:00
iceman1001
7949523515
CHG: default_toys.lua is now able to correct identify over 200 different types.
2015-04-06 18:49:44 +02:00
iceman1001
c3fe354b19
CHG: fix the default_toys.lua file to handle more aspects of information for a given tag.
...
CHG: corrected a bug in tnp3clone.lua that made the script fail to "wipe" a magic tag.
CHG: minor textual change in ndef_dump.lua
2015-04-06 18:47:53 +02:00
marshmellow42
1f918317e2
add maxErr to data manrawdecode
2015-04-05 21:59:36 -04:00
marshmellow42
224ce36eb1
lf t5xx - icemans update
2015-04-05 16:37:41 -04:00
iceman1001
aa77d2b125
FIX: the test scripts hade a problem when sending the new configuration block.
2015-04-05 17:02:13 +02:00
iceman1001
5ac81d0f58
CHG: change the snprint call in GetModelStrFromCID.
...
CHG: tighten up the maxium allowed errors in Biphase (from 1 to zero allowed errors)
2015-04-05 14:28:29 +02:00
iceman1001
6c81ae5574
CHG: the default_toys.lua has the index bytes in mix endiansness. I tried to clean it up and verify them.
...
CHG: The tnp3clone.lua is now faster, and uses the "wipe" parameter to clean the tag before writing all data.
2015-04-05 14:27:12 +02:00
marshmellow42
2767fc0291
lf cleaning
...
remove unneeded code/functions
fix lfdemod askmandemod bug with maxErr=0
silence output for getting samples in lf search
2015-04-05 00:58:57 -04:00
marshmellow42
643fb10b2d
Merge remote-tracking branch 'upstream/master'
2015-04-04 21:29:16 -04:00
marshmellow42
6e98444637
lfdemod reduce duplicate code
...
remove check for best start position in demods and adjust the clock
detect to always return best start position to the demods
also small bug fix in lf em em4x50read
2015-04-02 23:55:12 -04:00
marshmellow42
23f0a7d862
lfem4x cleanup/add/fix
...
changed spacing to tabs for cmdlfem4x.c
finished the partially built lf em em4x50read function
added save/restore GraphBuffer function in graph.c
adjusted some tolerances in lfdemod.c
added a maxLen argument to the askmandemod
2015-04-02 12:48:52 -04:00
iceman1001
b3a8c87d5c
CHG: minor text changes.
...
CHG: cmd+2, to skip first inparameter in string.
2015-04-02 12:08:57 +02:00
iceman1001
7b47fa9b3d
CHG: Script now also test to read block 0 via the chinese magic command if the normal read fails.
2015-04-02 12:07:51 +02:00
iceman1001
49dc1d0a9e
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/Makefile
armsrc/lfops.c
client/cmdlft55xx.c
common/ldscript.common
common/lfdemod.c
2015-04-01 18:02:10 +02:00
iceman1001
218103efd3
ADD: added some changes from Marshmellow
...
CHG: some minor changes to decode output for EM..
2015-04-01 17:57:07 +02:00
iceman1001
815544537c
CHG: code cleanup , added the year control to t55xx trace command.
2015-04-01 17:55:44 +02:00
iceman1001
f2019c773d
CHG: minor comments.
2015-04-01 17:53:33 +02:00
Martin Holst Swende
9795e535c9
Compiler correctly identified a buffer overflow, fixed that and made the code use snprintf instead of unsafe sprintf
2015-04-01 09:24:29 +02:00
Martin Holst Swende
d5d6f22718
Merge pull request #91 from marshmellow42/master
...
lfdemod.c refactoring (+ bug fixes)
2015-03-31 22:11:19 +02:00
marshmellow42
a4669d6ef3
small fix in t5 trace data
2015-03-31 11:30:16 -04:00
iceman1001
02d352fea7
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/iclass.c
armsrc/lfops.c
client/cmdlf.c
common/lfdemod.c
include/usb_cmd.h
2015-03-30 21:11:37 +02:00
iceman1001
ec09716a65
CHG: removed some commented code.
2015-03-30 16:32:04 +02:00
iceman1001
ba765c9edc
CHG: minor correction to the em410xsim help text.
2015-03-30 16:31:13 +02:00
iceman1001
aa60d1560e
NEW: HF MFU SETPWD - set password to a Ultralight C tag.
...
NEW: HF MFU SETUID - set UID to a magic UL / UL-C tag. *not implemented*
CHG: minor alignment for "Hf list" output.
CHG: removed unneeded function parameters to the ultralight commands
CHG: the const MAX_MIFARE_FRAME_SIZE is changed to MAX_FRAME_SIZE in the ultralight commands since the UL-Ev1 can have bigger frames than 18bytes.
CHG: adding DES support for the Ultralight-c read commands on deviceside.
2015-03-30 16:24:03 +02:00
iceman1001
4076250660
CHG: minor fixes to some tnp luascripts
...
ADD: a script to make a barebone clone for tnp3 on a chinese magic s50 generation 1 tag.
2015-03-30 16:15:53 +02:00
Martin Holst Swende
caaf9618ae
Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found
2015-03-29 21:49:58 +02:00
marshmellow42
f8f894a50f
rawdemod param cleanup
...
plus lfdemod.h cleanup
2015-03-27 23:47:31 -04:00
marshmellow42
2eec55c8a4
lfdemods streamline & bug fixes
...
removed duplicate code countPSK_FC - adjusted countFC to work.
bug fixes & streamlined code in:
lf hid fskdemod
lf em em410xdemod
cleaned up lfdemod.c some
2015-03-27 00:02:30 -04:00
marshmellow42
e0165dcf3a
Fixed indents to Tabs from Spaces
...
Spacing changes ONLY - no code changes
2015-03-25 14:24:36 -04:00
marshmellow42
c7d169ec02
clean up em410x output
2015-03-24 22:11:32 -04:00
marshmellow42
90677ad99b
EM410x bug fix
2015-03-24 20:26:14 -04:00
iceman1001
0ec548dc21
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/cmdlf.c
client/cmdlft55xx.c
client/cmdlft55xx.h
client/scripts/test_t55x7_bi.lua
2015-03-24 11:45:31 +01:00
marshmellow42
9680b11d9e
remove debugging print calls
2015-03-23 20:25:54 -04:00
marshmellow42
1fbf895616
lf updates
...
applies icemans full ata55x7 read/write settings
adds checksum to ioprox (thanks to iceman)
adds silent mode for lf read and getSamples
fix lf em em410xwatch and lf em410xspoof
improve data rawdemod ar - for biphase demods
improve detectclock a for strong antennas
2015-03-23 16:29:50 -04:00
iceman1001
754a35e72b
ADD: added the ioprox checksum test to IOdemodFSK
...
MENTIONED HERE: http://www.proxmark.org/forum/viewtopic.php?id=364&p=6
ADD: changed the layout of the HID descramble patterns a bit, and rearranged some hex/dec outputs.
2015-03-23 17:11:45 +01:00
marshmellow42
13d77ef964
lf t5 read plus lf demod adjustments
...
lf t5xx commands updated from ICEMAN
lf em410x commands updated
lf search bug fix for 2 args
test scripts from iceman
lf demod:
better ask clock detection with Strong fully clipped waves
better ask raw demod with strong fully clipped waves
fsk demod add back in skipped bits during demod
nrz demod add back in skipped bits during demod
2015-03-22 15:28:48 -04:00
iceman1001
9552d5919b
ADD: Added em410x de-scramble patterns: Paxton, Sebury, Pattern1.
2015-03-20 11:48:47 +01:00
iceman1001
6255c8b107
FIX: printEM410x - DEZ 10 was missing highest byte.
...
ADD: printEM410x - Now prints DEZ 3.5B
ADD: printEM410x - Now prints DEZ 3.5C
2015-03-19 22:50:23 +01:00
iceman1001
d21e0f1ce0
ADD: Implemented DEZ-20/ZK for EM410x decoding. Thanks to Asper for docs.
2015-03-19 22:20:35 +01:00
iceman1001
f1170fa79e
ADD: "HF MFU CRDBL", Started to add the password for reading blocks. Wasn't used before :(
2015-03-18 20:34:17 +01:00
iceman1001
251d07dbfb
ADD: cmdlf autocorrelations, also gives a hint to how many bytes the possible correlation is.
...
CHG: "LF SEARCH 1 U" didn't work since the strcmp was too short. Increased length of check.
FIX: @marshmellows fix for faulty em410xdecoding of length less than 64.
2015-03-18 20:32:53 +01:00
iceman1001
1c6490cddc
FIX: test_t55x7_psk.lua now correctly handles bitrate/modulation/clockrate combinations for PSK1.
...
Uncomment lines in main to test PSK2, PSK3.
2015-03-18 20:29:18 +01:00
iceman1001
ca65d3af86
ADD: new tests for the T55XX commands.
...
CHG: minor output messages in cmdlft55xx.c
2015-03-18 17:32:43 +01:00
iceman1001
78e875807f
FIX: narrowed down the detect modulation even further.
...
FIX: minor adjustment to t55xx inside of lfops.c when waiting for the antenna to settle.
FIX: added the possiblity to use graphbuffer fpr LF T55XX DETECT/TRACE/INFO .
MISSING:
the detect, trace, info, doesn't use a password for those tags with enabled password-mode.
2015-03-16 22:45:06 +01:00
iceman1001
05446d5bc3
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
common/crc.c
common/crc.h
common/lfdemod.c
include/crc.h
include/crc.h.old
2015-03-16 13:13:18 +01:00
iceman1001
595b623bf4
CHG: removed an extra space.
2015-03-16 11:40:44 +01:00
iceman1001
8713b64fdf
CHG: @Marshmellow came up with some nifty nice ideas for the t55xx modulation detection, and some minor corrections regarding the enum,
...
CHG: @Marshmellow added PSK1, PSK2, PSK3. Almost complete now. Waiting for Biphase.
ADD: @Marshmellows lf- psk demod changes,
CHG: In "lf t55xx info" the manufacturerer name is now identified and printed.
CHG: In "lf t55xx info" the modell name is now identified and printed, however it can only identify two models presently.
2015-03-16 11:39:31 +01:00
marshmellow42
b41534d142
adjust ask/biphase handling - more complete
...
also added XL EM410x formats
2015-03-15 22:03:50 -04:00
iceman1001
545158b398
FIX: lf t55xx config now handles offsets.
...
FIX: lf t55xx trace now handles offsets.
FIX: lf t55xx info now handles offsets.
2015-03-15 21:36:38 +01:00
iceman1001
db69363840
ADD: started to add a offset possibility for the LF T55XX.
...
Ie.
lf t55xx read 0
lf t55xx special
lf t55xx config o 2
lf t55xx read 0
ADD: added @marshmellows latest changes to psk
2015-03-14 08:43:48 +01:00
marshmellow42
7a8a982bde
adjust pskdemod
...
add skipped bits before first phase back in
PSKDemod now returns 1 for success or 0 for fail like other demods
2015-03-13 20:49:34 -04:00
iceman1001
2c5ed70651
CHG: minor output change, when printing found multiple modulations
...
CHG: PSKDemod should be called like this according @Marshmellow
2015-03-13 21:24:37 +01:00
iceman1001
8a13121435
CHG: now with enums :)
2015-03-13 21:02:04 +01:00
iceman1001
710208245b
ADD: printConfiguration method for a nice printout of the selected configuration.
2015-03-13 19:12:11 +01:00
marshmellow42
e74fc2ecba
give credit where credit is due
...
thanks iceman for the crc :)
2015-03-13 14:00:11 -04:00
iceman1001
8e726f6c37
CHG: Removed an unneccesary parameter for "hf mf sim"
2015-03-13 18:50:30 +01:00
iceman1001
d8c927bcec
FIX: removed a debug statement
...
FIX: initialisation of some variables is done correct.
2015-03-13 18:49:43 +01:00
iceman1001
7b40affb6f
FIX: lf t55xx commands seem to work like they should. Detect now detects between FSK/ASK/NZ/PSK
2015-03-13 17:36:40 +01:00
marshmellow42
9f7bbd24c9
data autocorr additions
2015-03-13 12:23:26 -04:00
marshmellow42
5279085ae7
Merge remote-tracking branch 'upstream/master'
2015-03-13 11:20:00 -04:00
marshmellow42
d9d41e0f3f
minor g-prox-ii demod fix
...
lf search was occasionally outputting false results.
2015-03-13 11:18:55 -04:00
marshmellow42
73d04bb417
data psk demod minor fixes, pyramid demod add CS
...
also adjusted autocorrelate and added a printout for lf search u
2015-03-13 11:09:12 -04:00
iceman1001
33add18764
CHG: rename of methods to follow naming convention
...
CHG: LF T55XX CONFIG now defaults to ASK, non-inverse
2015-03-13 10:05:37 +01:00
iceman1001
108262a145
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-03-13 09:22:12 +01:00
iceman1001
4d60f1562f
FIX: Marshmellow hinted that I should use another fskclock method, which obeys the verbose parameter.
2015-03-13 09:00:04 +01:00
iceman1001
c387fd49a7
CHG: removed a loop after suggestions that it was unnecessary.
2015-03-13 08:59:07 +01:00
pwpiwi
9185099ed8
Merge pull request #75 from pwpiwi/qtmakefile
...
(issue #47 ) use Qt5 includes and libraries, if present
2015-03-13 07:24:56 +01:00
iceman1001
3e4811c8b7
FIX: adding a test to see if we managed to get the correct demodulation from an unknown t55x7 tag.
...
By checking if the configuration data (page 0, block 0) has some settings that must be the same. think reserved 7bits, This is a trail and error approach.
But together with setting a manual configuration to read a tag and this automatic verification it will help out alot I think.
2015-03-12 23:04:02 +01:00
iceman1001
118bfa1b1f
ADD: LF T55XX CONFIG, is almost there, Usage: lf t55xx config [d <demodulation>] [i 1]
...
Options:
h This help
d <FSK|ASK|PSK|NZ|BI> Set demodulation FSK / ASK / PSK / NZ / Biphase
i [1] Inverse data signal, defaults to normal
Examples:
lf t55xx config d FSK - FSK demodulation
lf t55xx config d FSK i 1 - FSK demodulation, inverse data
2015-03-12 19:44:07 +01:00
iceman1001
83a42ef965
FIX: move and rename the CRC8Maxim method into crc.c
2015-03-12 14:12:14 +01:00
iceman1001
3d83b58b50
ADD: added a reference to a generic CRC-8 checksum algo in common/crc.c
2015-03-12 10:10:22 +01:00
iceman1001
5ff3c4017b
add: a experimental lualib, unstable.
...
fix: Introduced a wrong variable name due to "cut & paste" before, now fixed.
2015-03-12 09:50:22 +01:00
iceman1001
04a6113fb5
FIX: correct some lookups in tnp3dump.lua, tnp3sim.lua
...
ADD: added optional parameter (-p) to tnp3dump.lua
2015-03-12 09:46:28 +01:00
iceman1001
963fa1c2b8
FIX: minor correction of the command description for HF 14A RAW.
2015-03-11 22:43:49 +01:00
iceman1001
96f39a47a9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-03-11 22:21:01 +01:00
iceman1001
3ee8c808c4
ADD: added a CRC64_ECMA implementation
2015-03-11 22:06:23 +01:00
pwpiwi
04bc1c660b
fix: hf 14a raw was broken
...
(see http://www.proxmark.org/forum/viewtopic.php?id=2351 )
2015-03-11 20:19:30 +01:00
pwpiwi
8c04722db6
(issue #47 ) use Qt5 includes and libraries, if present
2015-03-10 19:00:39 +01:00
iceman1001
12d708fec1
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
client/cmddata.h
2015-03-10 09:18:35 +01:00
Martin Holst Swende
58e93ff593
Merge pull request #74 from marshmellow42/master
...
new and fixed lf sim commands, lf demod refactoring, data gproxIIdemod
2015-03-10 00:25:51 +01:00
iceman1001
652c39c63b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-03-09 22:03:24 +01:00
marshmellow42
1302428367
finish data printdemodbuffer command
2015-03-09 16:56:00 -04:00
pwpiwi
16a95d76ac
fix: (issue #73 ) hf mf cload didn't work. Add more annotations for Magic Cards operation.
2015-03-09 21:36:27 +01:00
marshmellow42
5658e82e1e
sim buffer max settings tests
2015-03-09 15:58:06 -04:00
marshmellow42
ada339a10f
biphase bug fixes
2015-03-09 15:27:20 -04:00
marshmellow42
d66d484347
fixed rawdemod help options
2015-03-08 18:07:01 -04:00
marshmellow42
712ebfa6df
1 bug fix + code trimming
2015-03-07 23:31:23 -05:00
marshmellow42
df51693f95
Merge remote-tracking branch 'upstream/master'
2015-03-06 12:30:16 -05:00
marshmellow42
78f5b1a77c
lf sim fixes/creations correct now
...
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
2015-03-06 12:28:54 -05:00
marshmellow42
e09f21fa7b
Revert "lf sim fixes/creations"
...
This reverts commit 293de1bad7
2015-03-06 12:26:33 -05:00
marshmellow42
293de1bad7
lf sim fixes/creations
...
fixed lf simpsk
fixed lf em em410xsim
fixed lf sim (can go right from lf search to lf sim if you have a
strong antenna - if not use a demod first)
2015-03-06 12:25:36 -05:00
iceman1001
3ac59c7fed
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/crapto1.c
armsrc/iclass.c
client/nonce2key/crapto1.c
2015-03-06 09:02:15 +01:00
ikarus
9cefee6f42
Fixed issue #36 & improved file consistency.
2015-03-04 11:00:39 +01:00
marshmellow42
39676885b4
Merge remote-tracking branch 'upstream/master'
2015-03-03 20:44:37 -05:00
Martin Holst Swende
27eabcdccb
Added brackets around crc field in protocol listings
2015-03-02 21:05:44 +01:00
marshmellow42
40b9bb85e6
oops... should this file should not have been there
2015-03-02 14:44:05 -05:00
marshmellow42
8d960002c8
lf cmds fix, add, show
...
show command to UI:
data printdemodbuffer - allow printing of demod buffer
Add:
data askgproxiidemod - demod a gproxii tag
Fix:
adjust lf simxxx commands further for testing
2015-03-02 14:42:55 -05:00
marshmellow42
ec9882b18c
PSKDemod Bug Fix
2015-02-22 21:11:25 -05:00
marshmellow42
3f41e73c7f
PSK demod adjustment
...
add carrier length test to weed out false positive demods
2015-02-22 20:09:58 -05:00
marshmellow42
3bc66a96fe
added PSK2 to lf simpsk
...
testing still ongoing.
2015-02-21 22:54:52 -05:00
marshmellow42
872e3d4d6f
NEW lf simpsk
2015-02-21 21:36:02 -05:00
marshmellow42
b4a2fcf676
Split output from nrz raw demod function
...
missed this one last time
2015-02-21 18:37:15 -05:00
marshmellow42
4ac906d1c2
split output from rawdemod functions
...
now allows for non-verbose calling:
ASKmanDemod
ASKrawDemod
FSKrawDemod
PSKDemod
2015-02-21 00:27:48 -05:00
marshmellow42
40148ab609
Merge remote-tracking branch 'upstream/master'
2015-02-19 21:38:17 -05:00
marshmellow42
abd6112fc4
Revert "Revert "lf simask, lf simfsk and bug fixes""
...
This reverts commit e396001c47
2015-02-19 21:35:34 -05:00
marshmellow42
e396001c47
Revert "lf simask, lf simfsk and bug fixes"
...
This reverts commit fb0c84c3df
2015-02-19 21:22:05 -05:00
marshmellow42
fb0c84c3df
lf simask, lf simfsk and bug fixes
2015-02-19 21:21:11 -05:00
iceman1001
f4a57e861d
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/iclass.c
client/loclass/cipher.c
client/loclass/fileutils.h
2015-02-19 11:32:11 +01:00
Martin Holst Swende
0387cd3393
Merge pull request #68 from iceman1001/feature
...
ADD: identifications.
2015-02-19 10:51:10 +01:00
Martin Holst Swende
181e6db6a9
Merge pull request #67 from marshmellow42/master
...
Small help and command description updates
2015-02-19 10:50:51 +01:00
Martin Holst Swende
1defcf606f
More work on iclass full simulation, and some work on iclass tag dump parsing
2015-02-19 10:48:33 +01:00
Martin Holst Swende
b67f7ec359
Further implementation of iclass 'fullsim'. Moved protocol definitions to shared file. Had to add some loclass-function to arm-side to support authentication in fullsim mode
2015-02-18 20:02:44 +01:00
Martin Holst Swende
9a9bcea82b
Iclass decrypt error, shouldn't have decrypted block 6 according to Heart of darkness-paper
2015-02-17 23:17:43 +01:00
Martin Holst Swende
41524d8a39
Implemented 'hf iclass decrypt <tagdump>'. This performs the 3des decryption of iclass tag dumps, but requires the decryption file to be present on the filesystem
2015-02-17 22:07:40 +01:00
iceman1001
0853ffa29c
ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's
2015-02-16 19:06:24 +01:00
iceman1001
33315928fb
CHG: added some more token-tags.
2015-02-16 19:05:59 +01:00
iceman1001
3a72fdf5b0
CHG: minor modification to "hf mf csetblk" The usuage of UID array is not needed.
2015-02-16 19:01:52 +01:00
iceman1001
5b3811fc0e
ADD: added the missing EM identifications. Thanks to Asper for providing the needed information about LC ID's
2015-02-16 19:01:09 +01:00
iceman1001
bd8baee9df
CHG: added some more token-tags.
2015-02-16 19:00:17 +01:00
iceman1001
d716ca2fc1
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/iclass.c
2015-02-16 18:59:44 +01:00
marshmellow42
8db0534ed1
Merge remote-tracking branch 'upstream/master'
2015-02-14 21:16:27 -05:00
marshmellow42
cc2ea5ed82
Clean up Helps and command descriptions
2015-02-14 21:15:13 -05:00
Martin Holst Swende
a4749080d9
Removed un-implemented 'hf iclass write', it's confusing to have there since there's no actual support for this on the device side
2015-02-14 21:18:39 +01:00
Martin Holst Swende
534445139c
Reformatted
2015-02-14 21:17:08 +01:00
Martin Holst Swende
7781a65656
Started work on 'hf iclass eload' - only client side so far, not yet supported in the device
2015-02-14 21:15:53 +01:00
Martin Holst Swende
428d622160
Fixed bug with iclass dump which prevented saving to file
2015-02-14 20:42:23 +01:00
iceman1001
6af88242eb
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/util.c
2015-02-14 12:30:08 +01:00
iceman1001
68008fb517
add: timeouts for "lf read"
...
chg: change command consistency "lf t55xx rd" -> "lf t55xx read"
chg: buffer size used for armside is quite big. maybe to big. takes too long to read.
2015-02-14 12:29:02 +01:00
marshmellow42
abd16c456a
fix help on data rawdemod commands
2015-02-13 21:17:15 -05:00
Martin Holst Swende
2e2fc9fa6b
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-02-13 19:59:50 +01:00
Martin Holst Swende
699bb9dc27
Removed some dev- printouts
2015-02-13 19:59:28 +01:00
iceman1001
b359cee677
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-02-13 10:16:39 +01:00
iceman1001
4e7af352b4
chg: step two for t55xx commnads
2015-02-13 10:16:21 +01:00
Martin Holst Swende
17c60b1248
Merge pull request #63 from marshmellow42/master
...
lf data combine rawdemods & depreciate cmds
2015-02-13 10:11:40 +01:00
Martin Holst Swende
37735250ca
Merge pull request #66 from iceman1001/feature
...
ADD: identification of EM4233
2015-02-13 10:11:09 +01:00
iceman1001
31b3689f0b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/epa.c
2015-02-12 09:54:21 +01:00
Martin Holst Swende
8b9393d3bd
fixed issue #65
2015-02-12 08:21:58 +01:00
pwpiwi
19a700a8b5
hf 14a: if the tag supports it, set default timeout according to ATS
...
hf epa: remove explicit but arbitrary timeout settings
Bugfix: don't timeout when frame transmission has already started
2015-02-11 22:20:22 +01:00
iceman1001
070e36d421
ADD: identification of EM4233
2015-02-11 17:14:26 +01:00
iceman1001
0310364d23
chg: the inital modification of t55xx commands to use Marshmellows new demod functions.
...
fix: merged readblock & readblockPWD command.
New syntax: "lf t55xx rd <block> <password>" -- OPTIONAL password
fix. merged writeblock & writeblockPWD command.
New syntax: "lf t55xx wr <block> <data> <password>" -- OPTIONAL password
2015-02-11 17:13:30 +01:00
iceman1001
00a863f9ad
ADD: identification of EM4233
2015-02-11 17:08:16 +01:00
iceman1001
4ecde0e1ff
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/iclass.c
2015-02-10 21:53:16 +01:00
Martin Holst Swende
61972abbdd
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443a.c
2015-02-10 21:25:14 +01:00
iceman1001
1e3a799d47
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-02-10 09:01:31 +01:00
iceman1001
2b61c24212
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/lfops.c
2015-02-10 08:58:14 +01:00
Jesse Hallio
3bba7deac0
Add settable ATQA and SAK to hf mf csetuid command.
2015-02-10 04:31:53 +02:00
marshmellow42
7e72f90a7f
Merge remote-tracking branch 'upstream/master'
2015-02-09 16:47:24 -05:00
pwpiwi
0d0d049967
hw tune, data tune: adjusted "unusable" and "marginal" voltages. Display LF tuning graph only when LF antenna is connected.
2015-02-09 22:36:53 +01:00
marshmellow42
19ff0210fa
lf data combine rawdemods & depreciate cmds
...
new:
data rawdemod
replaces:
data askmandemod
data askrawdemod
data fskrawdemod
data nrzrawdemod
data psk1rawdemod
data psk2rawdemod
also commented out of the CommandTable but did not remove the commands:
data askdemod
data bitstream
data fskdemod
data mandemod
data threshold
2015-02-09 16:25:12 -05:00
marshmellow42
f3bf15e484
lf/data combined detectclock functions to one
...
cleaned up detect clock functions - now uses one main function that
takes a char argument to select which modulation to detect the clock for
REMOVED commands: pskdetectclock, nrzdetectclock, fskfcdetect.
renamed DetectClock function to DetectAskClock to be more descriptive.
2015-02-09 11:11:04 -05:00
marshmellow42
b4fb11ba92
fix inconsistent spacing within functions
...
did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.
2015-02-08 00:48:00 -05:00
marshmellow42
be2cf126bf
Merge remote-tracking branch 'upstream/master'
2015-02-06 14:45:46 -05:00
marshmellow42
6de4350803
data askraw patches, data askedgedetect demod,
...
data askraw patches - added amp option (for stubborn waves)
NEW data askedgedetect demod for manual demod,
adjusted detectclock (ask clock) in case of cleaned (edgedetect) waves
finish maxErr args
finish psk detect
2015-02-06 14:36:25 -05:00
Martin Holst Swende
7d5ebac993
Merge branch 'master' into GenericTracing
...
Conflicts:
armsrc/iso14443.c
armsrc/iso14443a.c
client/cmdhf.c
client/cmdhf14b.c
2015-02-06 08:41:02 +01:00
marshmellow42
e770c64824
lf psk/nrz split, add maxErr argument
...
changed psk to use wave lengths instead of peaks
split out NRZ from psk demod
added maxErr argument to raw demods (except fsk)
2015-02-05 17:01:18 -05:00
Martin Holst Swende
146c201cbe
Merge pull request #55 from jessegit/master
...
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-05 19:43:46 +01:00
Martin Holst Swende
b37235637f
Merge pull request #57 from iceman1001/feature
...
FIX: LF TI WRITE inparameters didn't get copied by sscanf.
2015-02-05 19:43:26 +01:00
iceman1001
5c2b11eb3c
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
2015-02-05 15:46:23 +01:00
iceman1001
e57fe796f5
FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead.
2015-02-05 15:43:50 +01:00
iceman1001
a6cfa75035
add: lots of new toytypes in default_toys.lua
...
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:49:21 +01:00
iceman1001
385f398740
prepare to update the LF T55XX commands
2015-02-04 11:48:36 +01:00
iceman1001
a8d4906ba5
add: lots of new toytypes in default_toys.lua
...
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:40:49 +01:00
Jesse Hallio
e9281ae812
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
2015-02-03 23:22:39 +02:00
Martin Holst Swende
1f78a4d305
Merge pull request #54 from Proxmark/lf_recorder
...
LF: Ability to do longer traces/snoops
2015-02-02 19:54:07 +01:00
Martin Holst Swende
0644d5e3a3
Merged with master
2015-01-31 18:21:38 +01:00
Martin Holst Swende
c856ceae8a
Fixed undecimation command
2015-01-31 12:42:40 +01:00
Martin Holst Swende
698b649e0e
Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side
2015-01-31 00:05:04 +01:00
Martin Holst Swende
31abe49fd3
Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call
2015-01-30 23:03:44 +01:00
iceman1001
c4e3b1b6a2
Change in progress, the adjustments to use Marshmellow's new demod for T55XX commands.
2015-01-30 15:45:56 +01:00
iceman1001
e58c712c9e
ADD: a switch to detect if Qt4 or Qt5 is used.
2015-01-30 15:23:01 +01:00
iceman1001
908536d161
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmddata.c
2015-01-30 15:22:01 +01:00
Iceman
0c5998c051
Update cmddata.c
...
as suggested, a bitwise bounds check in cmddata.
2015-01-30 15:17:07 +01:00
iceman1001
21e06301b9
Call to GetClock had wrong number of inparameters
...
Added missing functions to header file
2015-01-30 09:26:03 +01:00
iceman1001
f4a694f998
ohps, forgot to multiply it up again.
2015-01-30 09:23:49 +01:00
iceman1001
33c7e2f3bc
wrong letter in variable name
...
Conflicts:
client/cmddata.c
2015-01-29 22:35:19 +01:00
iceman1001
7ea7465bbb
wrong letter in variable name
2015-01-29 22:22:29 +01:00
iceman1001
b6bf652821
Minor bounds checks for setDemodBuf and printDemodBuff
2015-01-29 21:44:24 +01:00
iceman1001
64d1b4efc9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/Makefile
armsrc/appmain.c
armsrc/apps.h
armsrc/epa.c
armsrc/iclass.c
armsrc/iso14443a.c
armsrc/iso14443a.h
armsrc/iso15693.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
armsrc/string.h
armsrc/util.h
bootrom/bootrom.c
client/Makefile
client/cmddata.c
client/cmddata.h
client/cmdhf.c
client/cmdhf14a.c
client/cmdhf14b.c
client/cmdhf15.c
client/cmdhficlass.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/cmdlf.c
client/cmdlfem4x.c
client/cmdlfhid.c
client/cmdlfhitag.c
client/cmdlfio.c
client/cmdmain.c
client/data.h
client/flash.c
client/graph.c
client/graph.h
client/loclass/elite_crack.c
client/loclass/fileutils.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/lualibs/mf_default_keys.lua
client/lualibs/utils.lua
client/mifarehost.c
client/nonce2key/crapto1.c
client/proxmark3.c
client/scripting.c
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
client/scripts/tracetest.lua
common/Makefile.common
common/cmd.c
common/cmd.h
common/lfdemod.c
common/lfdemod.h
common/usb_cdc.c
common/usb_cdc.h
include/usb_cmd.h
2015-01-29 21:39:33 +01:00
Martin Holst Swende
92623113b4
Minor documentation on 'hf list'
2015-01-29 20:01:30 +01:00
Martin Holst Swende
f6d9fb173f
Added client-side support for recording longer samples, fixed last (?) issues on device-side
2015-01-29 00:57:22 +01:00
pwpiwi
f71f4deb8f
BigBuf and tracing rework: allow much longer traces in in hf commands
...
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
2015-01-28 07:18:51 +01:00
Martin Holst Swende
936e0729f9
Merge pull request #49 from marshmellow42/master
...
LF Demod Bug Fix & new traces
2015-01-27 22:14:39 +01:00
Martin Holst Swende
383608a63a
Minor fixes to iso14443a annotations
2015-01-27 21:55:08 +01:00
marshmellow42
a1d17964a2
lf demod bug fix & refactor
...
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
2015-01-27 14:51:12 -05:00
Martin Holst Swende
08e8317c21
More annotations to iso14443b protocol listings
2015-01-27 16:34:45 +01:00
marshmellow42
8c65b650e8
clean up some comments
2015-01-26 17:49:30 -05:00
marshmellow42
04d2721b3c
lf psk demods
...
clarify existing as psk1
added psk2 demod
2015-01-26 17:23:19 -05:00
marshmellow42
9c0f13d5dd
Merge remote-tracking branch 'upstream/master'
2015-01-26 17:07:49 -05:00
Martin Holst Swende
dca558bf9e
Removed last trace of crypto from makefile
2015-01-26 20:56:33 +01:00
Martin Holst Swende
e629181f5a
Fixed issue where -1 size_t was returned
2015-01-22 21:04:16 +01:00
Martin Holst Swende
afceaf4018
Removed openssl from the mfu-stuff
2015-01-22 21:02:21 +01:00
marshmellow42
03e6bb4aed
lf FSK demod tools/fixes
...
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
2015-01-22 14:24:03 -05:00
Martin Holst Swende
388c92bde5
Generic tracing pt.4: Deprecated old 'hf 14b list' command
2015-01-22 00:19:20 +01:00
Martin Holst Swende
c54d1394c6
Fixed compiler error
2015-01-22 00:10:09 +01:00
Martin Holst Swende
9e8255d4e9
Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory
2015-01-21 23:53:40 +01:00
iceman1001
df3e429d71
minor fix for a help in "hf 14a snoop"
2015-01-21 21:24:37 +01:00
marshmellow42
ec75f5c10a
lf Bug Fixes and lf demod additions
...
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
2015-01-20 17:28:51 -05:00
iceman1001
a1557c4c2f
Minor fixes: Array inits, some array bounds checks.
...
ADD: some extra help text for lf snoop
ADD: HasGraphData - function in graph.c
ADD: DetectHighLowInGraph - function in graph.c
2015-01-20 22:14:56 +01:00
iceman1001
e469159145
FIX: another file_path found in loadTraceCard and saveTraceCard, is now corrected to follow FILE_PATH_SIZE variable.
...
FIX: some filehandles that didn't get closed.
2015-01-20 21:58:53 +01:00
iceman1001
80b1b53fa3
SUGGESTED FIX:
...
Issue: https://github.com/Proxmark/proxmark3/issues/35
Forum: http://www.proxmark.org/forum/viewtopic.php?pid=7883#p7883
Where "hf mf csetuid" empties the rest of the block0 bytes.
This fix loads the old block0 and replaces the uid+sak+ataq bytes only.
2015-01-20 21:55:19 +01:00
iceman1001
fe5b3a4424
FIX: The 14b write command (CmdHF14BWrite) now turns off antenna after call.
2015-01-20 21:50:49 +01:00
iceman1001
e3c235654f
Minor fixes to some help-texts.
2015-01-20 21:48:39 +01:00
iceman1001
81740aa519
STEP 3 - the actual new files for Ultralight.
...
ADD: script remagic.lua -- a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua - iterates thru a lot of calls to check the new psk demods.
all new scripts implements the "-h" for help text.
2015-01-20 21:29:55 +01:00
iceman1001
5ee701292f
Step 2 - Ultralight / Ultralight-C
...
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
2015-01-20 21:23:04 +01:00
iceman1001
c8b6da2295
Merge branch 'master' of https://github.com/holiman/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
Step 1 for the Ultralight / Ultralight-c
2015-01-20 20:59:24 +01:00
iceman1001
5149e37e66
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
2015-01-20 09:32:53 +01:00
marshmellow42
53d85a8fa1
Merge remote-tracking branch 'upstream/master'
2015-01-18 18:19:26 -05:00
marshmellow42
1e090a61a1
lf demod additions
...
data fskfcdetect (field clock and bit clock detect for FSK)
data fskdemodawid -AWID demod/decode
data fskdemodpyramid - AWID demod/decode
2015-01-18 18:13:32 -05:00
Martin Holst Swende
b689b842b6
Bugfix 'hf list 14b' and 'hf list raw'
2015-01-16 22:48:30 +01:00
Martin Holst Swende
41fdd0f061
First stab at adding 'hf list 14b' and 'hf list raw'
2015-01-16 22:41:19 +01:00
Martin Holst Swende
55c7e3520f
Merge branch 'master' of github.com:Proxmark/proxmark3
2015-01-16 15:49:11 +01:00
Martin Holst Swende
49726b4088
Improved 'hf list iclass' a bit, better understanding of the protocol and when to apply CRC checks
2015-01-15 23:00:39 +01:00
Martin Holst Swende
5c72368e2d
Merge pull request #44 from marshmellow42/master
...
small lf demod bug fixes and threshold adjustments
2015-01-15 21:53:18 +01:00
Martin Holst Swende
d60418a05f
Synchronized loclass library, imported the legal warning
2015-01-15 16:30:05 +01:00
marshmellow42
84871873a4
Small lf bug fixes and threshold adjustments
...
adjusted lf demod thresholds based on additional testing
fixed bug in hid bit length calc in cmddata.c
fixed bugs in lf search
2015-01-13 17:21:36 -05:00
marshmellow42
ae6ead3dc8
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
client/cmdlf.c
2015-01-13 16:02:23 -05:00
Martin Holst Swende
896473399b
Actually add the FILES also, doh
2015-01-12 22:16:46 +01:00
Martin Holst Swende
1f6417a9b2
Removed dependency on openssl, added AES implementation from polarssl instead
2015-01-12 21:47:36 +01:00
Martin Holst Swende
68033ed776
Fixed error when no match is found for uidmapping
2015-01-11 21:49:13 +01:00
iceman1001
f004ba08d4
ADD: test_t55x7_psk.lua, a script which writes to block 0 (configation) of a T55x7 tag and tries do verify the psk demods. 12 different test configuration blocks is used.
2015-01-10 19:48:29 +01:00
iceman1001
86dab5168e
FIX: arguments took too much.
...
FIX: lf search didn't load from graphbuffer..
2015-01-10 15:59:05 +01:00
iceman1001
0a43c39617
ADD: scripts/tracetest.lua is a simple script that tries to load from traces folder files starting with EM* and MOD* and runs the following on them one-by-one. "Data load" ; "LF Search"
2015-01-10 15:50:10 +01:00
marshmellow42
ac3ba7ee69
lf search use new psk, small demod adjustments
...
adjust thresholds for ask, fsk, io, psk based on more sample testing
adjust indala decode to set clock to 32 if no input (autodetect not
always correct)
2015-01-09 16:46:17 -05:00
Martin Holst Swende
473124be92
removed double include
2015-01-09 21:51:34 +01:00
Martin Holst Swende
f44a01235c
Merge branch 'master' of https://github.com/iceman1001/ForPm3
2015-01-09 21:50:36 +01:00
iceman1001
cb8c358f4d
FIX: antenna was not turn off after "hf 14b write" command. The method is using "hf 14b raw" underneath, which meant an parameter "-p" had to be removed.
2015-01-09 21:45:49 +01:00
iceman1001
952a8bb59b
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/lfops.c
client/cmddata.c
client/graph.c
2015-01-08 22:23:45 +01:00
Martin Holst Swende
31d1caa526
Reverted some minor things, altered other things to get it to compile cleanly
2015-01-08 17:51:52 +01:00
iceman1001
03d7b60f2b
ADD: default_toys.lua a script which identify tnp3xx tags
2015-01-08 17:36:01 +01:00
marshmellow42
c12512e99a
minor code cleanup
2015-01-07 23:02:00 -05:00
marshmellow42
d6d20c5435
cmddata.c changes by others - reapply
...
i overwrote some changes in cmdsamples. i fixed that
i also removed some comments in graph.c
2015-01-07 19:06:29 -05:00
marshmellow42
3179383f85
put cmdlf.c back (only changes spaces to tabs)
...
to make my pull request easier to weed through
i did not make any changes to cmdlf just de-spaced it - so i put it back
for now.
2015-01-07 18:45:47 -05:00
iceman1001
8e863ab641
FIX: forgot to add the function in the header file.
2015-01-08 00:20:22 +01:00
iceman1001
c3bfb9c76b
ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.
...
minor code clean up.
2015-01-08 00:17:40 +01:00
iceman1001
3de045905f
ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.
...
minor code clean up.
2015-01-08 00:16:33 +01:00
marshmellow42
3aa4014baa
Fix Tune Samples (broken in commit 12/31 by me)
2015-01-07 18:14:28 -05:00
marshmellow42
ba1a299ce6
code cleanup. re-added psk commands.
...
also fixed a bug in detect clock functions.
sync with master prep for pull request
2015-01-07 18:14:27 -05:00
marshmellow42
4118b74dc8
added data psk* cmds for pskdemod
...
fixed a couple small bugs in other lf functions as well including
detectaskclock, stopped changes from being made to graphbuffer.
2015-01-07 18:13:26 -05:00
iceman1001
787b5bd8a4
CHG: minor code clean up in ArmSrc.
...
ADD: added some more default keys in Hf mf nested, maybe it runs faster :)
2015-01-08 00:08:33 +01:00
iceman1001
1d660bb993
Added Pm3-master changes from Holiman.
...
REM: removed some old test code to cmdhf15 read.
2015-01-07 23:52:33 +01:00
iceman1001
79bf1ad2cc
ADD: Jonor's timeout patch for "Hf 14a raw".
...
minor code clean up
2015-01-07 23:23:17 +01:00
iceman1001
b5be31f996
FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.
...
ADD: crc32.c functionality
2015-01-07 22:56:20 +01:00
iceman1001
024b97c507
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmdhf.c
2015-01-07 22:55:26 +01:00
iceman1001
14edfd09c3
CHG: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.
...
Minor code clean up.
Added from Pm3-master which will make this fork one step closer to Pm3-master.
2015-01-07 22:51:34 +01:00
iceman1001
b915fda392
FIX: a solution for the issue "hf mf esave - always saves 4K"
...
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
2015-01-07 22:00:29 +01:00
iceman1001
d91a31f935
CHG: minor code clean up.
...
ADD: tunesamples in cmddata.c pullrequest #33 , was removed by Marshmellows other commits. I returned it.
2015-01-07 21:29:38 +01:00
Martin Holst Swende
4df54240c1
Added some more protocol support to the list annotation. Based on http://www.proxmark.org/forum/viewtopic.php?pid=13541#p13541
2015-01-07 21:14:32 +01:00
iceman1001
52ab55ab0d
ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
...
ADD: added a manufacturer list in "hf 14a reader", only viable when UID is double or triple size. Thanks to Asper for the list.
ADD: detect chinese magic backdoor commands in "hf 14a reader"
CHG: minor code clean up.
2015-01-07 21:06:15 +01:00
iceman1001
79544b28ad
CHG: minor code clean up
...
ADD: added some helper-functions in util.c
2015-01-07 20:52:03 +01:00
iceman1001
3af373f352
CHG: Added support for tnp3xx in lua scripts.
...
ADD: a save file function in lua.
2015-01-07 20:45:43 +01:00
iceman1001
c0e6c18bf5
FIX: more minor issues with block Numbers.
...
KNOWN BUG: Right now, it kind of defaults to Block 0 when a getparam8 failes. (like writing "hf mfu rdbl k", ie a letter instead of number). This bug is the same all over the pm3 source-code.
2015-01-07 19:01:00 +01:00
iceman1001
5f2cb31bca
CHG: spelling errors, added help texts in cmdhfmfu.c
...
CHG: refactored the "hf mfu rdbl/wrbl/crdbl/wrbl" commands.
CHG: added a cauth test to "hf mfu info" command to see if the tag is a Ultralight-C tag or not.
2015-01-07 18:50:51 +01:00
iceman1001
225ccb910e
ADD: new defines: iso14443_CMD_AUTH_KEYA, iso14443_CMD_AUTH_KEYB, iso14443_CMD_AUTH_RESPONSE, iso14443_CMD_AUTH_STEP1, iso14443_CMD_AUTH_STEP2, CHINESE_BACKDOOR_INIT, CHINESE_BACKDOOR_STEP2,
...
REM: removed old comments in bootrom.c
CHG: mifare ultralight & desfire commands inside arm has been cleaned up. Next step is to refactor it into armsrc/mifaredesfire.c
2015-01-07 17:42:57 +01:00
iceman1001
002c1ce57a
CHG: removed leftover debugging statements proxmark3.c
...
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
2015-01-07 11:10:46 +01:00
iceman1001
4888b28195
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2015-01-07 11:09:05 +01:00
Martin Holst Swende
cb29e00a12
Save iclass dumps to file, like mifare-dump functionality works
2015-01-07 09:57:18 +01:00
iceman1001
9484ff3d6e
ADD: tnp3xxx identification in luascripts.
...
CHG: minor code clean up.
2015-01-06 21:20:41 +01:00
iceman1001
99a714185e
CHG: Refactored the HF MFU udump/ucdump commands into one method.
2015-01-06 21:08:20 +01:00
iceman1001
e3ab50cafb
CHG: rename the HF MFU * commands.
...
ADD: added a HF MFU INFO commmand, where you can see some tag info. Used to be in the readcard command.
FIX: minor code clean up for ultralight & desfire commands in armsrc/mifarecmd.c, armsrc/mifaredesfire.c, armsrc/mifareutil.c
CHG: Lowered the default MF_DBGLEVEL, it set to MF_DBG_ERROR.
CHG: lowered a testing value for timeout in cmdhf14a.c
2015-01-06 17:43:31 +01:00
iceman1001
dd683ece72
FIX: a compilation error for a static method in CmdHF14A.h
2015-01-06 15:36:33 +01:00
iceman1001
10403a6a30
ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list.
...
ADD: added a manufacturer list for hf 14a reader, only viable when UID is double or triple size. Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
2015-01-06 11:17:02 +01:00
iceman1001
3fe4ff4f03
CHG: generic code clean up. Removal of commented code.
...
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD: tnp3xx support
ADD: nxp tag idents.
ADD: identifiction of chinese backdoor commands to hf 14a reader.
2015-01-05 15:51:27 +01:00
iceman1001
0452ec6c90
FIX: downloaded a fresh clone from my fork, and took away the build-errors.
2015-01-05 15:12:48 +01:00
Martin Holst Swende
6f101995b6
Added loclass-functionality into the pm3,the functionality provided by loclass can now be invoked directly from the pm3. Also fixed some issues with how prnlog called PrintAndLog, and added some testdata for the loclass self-tests
2015-01-05 09:16:06 +01:00
iceman1001
d3a22c7dfa
ADD: Holimans new changes in master.
2015-01-05 02:01:24 +01:00
iceman1001
f0cf62cd73
FIX: fixed a little bug I introduced from last commit in fskdemod
...
CHG: tab fixes in cmdlf.c and minor code clean up
CHG: minor variable name change, printstatement in cmddata.c
2015-01-04 23:43:07 +01:00
iceman1001
8d0a3e87d7
FIX: a shot at fixing the "_" underscore problem in fileutils.c. This one uses _ifdefine. I hope it works. Linux people can let me know if it works.
...
FIX: changed the DetectASKClock in lfdemod.c to correct detect all clocks in the array.
CHG: I like code with more spaces inside of it and tried change some stuff according to our codestyle in HACKING.txt
ADD: some zero checks and overflows, god knows where it was.
The T55XX commands will be rewritten to use Marshmellows lfdemod.c instead.
CHG: Made the graph window smaller.
CHG: lf read now does a "data samples" also. (less writing commands)
CHG: data samples now defaults to samples size of 20000
2015-01-04 22:49:54 +01:00
Martin Holst Swende
337818f7ab
Minor dox
2015-01-04 21:26:10 +01:00
Martin Holst Swende
4c3de57ad2
Reworked how 'hf 14a list' and 'hf iclass list' works, to use the same method. Now. use 'hf list 14a' and 'hf list iclass' instead. Plus, the output is now annotated (although the annotation-engine could use a bit more love from someone more familiar with the available commands
2015-01-04 21:22:54 +01:00
Martin Holst Swende
c8dd9b092e
Some work on iclass dump and iclass list, now the dumping is a lot more stable. I think the comms should be measured and tuned a bit more, right now it kind of works thanks to retry-functionality, but the retries are probably not needed if we are a bit more careful about timing, so we don't send commands too fast for the tag to handle
2015-01-04 14:53:26 +01:00
Martin Holst Swende
2e9d4b3ff4
Some work on iclass, started on some better support in 'hf iclass list' and also fixes to 'hf iclass reader' so it exits better when the button is pressed
2015-01-03 15:11:48 +01:00
iceman1001
b1329a0264
chg: updated the README.txt
...
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.
2015-01-02 00:09:59 +01:00
iceman1001
0a966150a0
Updated the README.txt
...
CHG: added marshmellows last changes with rtrim, and minor fixes.
DEL: code cleanup in usb_cdc.c
2015-01-01 14:07:42 +01:00
marshmellow42
ac914e56db
minor adjustment to askmandemod for lf search
...
returns false if it finds data but not an EM410x format.
2014-12-31 14:55:58 -05:00
marshmellow42
9ec1416ad2
added data rtrim command
...
enter location to trim all samples after
2014-12-31 14:43:49 -05:00
iceman1001
c579a5871e
CHG: modified cmdlf.c - CmdLFfind with a parameter to accept traces loaded with "data load". ie: "lf search 1" == take data from previously loaded.
2014-12-31 12:01:00 +01:00
iceman1001
6ff6ade2f5
ADD: midnitesnakes desfire, ultralight changes from Unstable branch.
...
ADD: Marshmellows fixes for the LF (demods) commands, (LF SEACH)
ADD: Holimans changes with hash1_brute
FIXES: minor fixes with some calls to "free" and redundant debug statement and code cleanup. removal of commented code.
2014-12-31 11:35:43 +01:00
marshmellow42
f822a063b3
lf demod code cleanup - added fskraw arguments
...
merged code and added arguments to data fskrawdemod to allow other fsk
mode demodulations (FSK2a = RF/10 & RF/8) another might be (RF/8 & RF/5)
2014-12-31 02:27:30 -05:00
marshmellow42
d5a72d2fee
LF demod/cmd code cleanup + new lf search
...
cleaned up and error proof code. plus added new command lf search
when online it will lf read - data samples 20000 - and test for EM410x,
HID, IO Prox, and indala cards. when offline it will test current
graphbuffer.
2014-12-30 16:08:33 -05:00
marshmellow42
6bfa18eab4
Merge pull request #1 from Proxmark/master
...
Test
2014-12-29 16:14:23 -05:00
marshmellow42
2df8c07907
minor setting adjustments/cleanup
...
clean up code
2014-12-29 15:58:59 -05:00
marshmellow42
66707a3b3c
LF Demod bug fixes and add lf em em410xdemod
...
fixed a few bugs in lf demod that the streamlining added. added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
2014-12-29 15:32:53 -05:00
marshmellow42
7db5f1ca25
slight adjustment to include
...
removed extra unneeded path
2014-12-28 21:29:33 -05:00
marshmellow42
eb191de615
LF Demod streamlining
...
one shared location for demoding lf for arm and client. also added a
few raw demod commands.
2014-12-28 20:33:32 -05:00
iceman1001
9c7c222c03
FIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field and the consequent changes to the define names. (CMD_MIFARE_EML_CGETBLO -> CMD_MIFARE_CGETBLO)
2014-12-26 22:38:23 +01:00
iceman1001
d52e4e8819
ADD: HF 14A READER is now able to see if a presented card responses to the chinese magic backdoor commands.
...
FIX: simple namechange of some defines where it hinted it was related to "eml" when it wasn't.
2014-12-26 21:32:58 +01:00
iceman1001
1b492a97af
ADD: marshmellows new lf command and DetectClock. (works great!)
...
FIX: a suggested patch for "hf mf csetuid" (https://github.com/Proxmark/proxmark3/issues/35 )
FIX: fixed a bug in iso14443a_select_card where the len variable wasnt set, this made desfire/magic cards not work.
2014-12-26 20:02:59 +01:00
marshmellow42
9e6dd4eb69
rename askrawdemod to askmandemod
2014-12-24 13:01:09 -05:00
marshmellow42
0e74c023bd
Created new detectclock function + EM decode addons
...
new detectclock is somewhat more reliable for ASK modulated tags. added
this detect to askrawdemod if no clock in passed as an argument. also
added more EM ID formats to output
2014-12-24 11:48:41 -05:00
marshmellow42
cd48c19c31
minor askrawdemod adjustment if errors in demoding are found
...
if it can't find a demod position with no errors it will find the one
with fewest errors and mark errors with 77.
2014-12-23 15:16:53 -05:00
marshmellow42
2fc2150ea8
Add auto check for EM410x format to askrawdemod cmd
...
added EM410x format check and print to the data askrawdemod command. if
it finds valid em410x format & parities it will print the EM ID and
Unique ID and a few others.
2014-12-23 12:00:13 -05:00
pwpiwi
52bfb95543
bugfixes in iso14443a.c and hf 14a reader
...
- introduced with the big frame and parity support (commit 6a1f2d82
2014-12-23 11:21:42 +01:00
marshmellow42
ea7d657f75
minor fix - got too comment happy removing test code
...
should not have commented this code out
2014-12-22 22:50:13 -05:00
marshmellow42
e888ed8e62
added new data askrawdemod command
...
added new data askrawdemod command returned data fskdemod and separated
out new fskrawdemod commands
2014-12-22 17:46:28 -05:00
iceman1001
3bc3598e88
added the changes from PM3 master.
...
added some code for the AWID26
2014-12-22 15:14:05 +01:00
pwpiwi
545f203826
adapted hf iclass list to new trace format
2014-12-20 21:32:44 +01:00
marshmellow42
ae2f73c12d
put ask demod and mandemod
...
put ask demod and mandemod back until i have time to test it
2014-12-19 12:39:41 -05:00
marshmellow42
b3b706693b
Final touches on IO prox and HID prox demod
...
makes both more robust and handles various error situations.
2014-12-19 12:14:27 -05:00
iceman1001
f5ed4d12de
ADD: started with adding a LF AWID26 write function. not done yet.
...
ADD: latest pwpiwi & holiman changes.
2014-12-19 13:46:02 +01:00
pwpiwi
db4de4d82f
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-18 19:42:49 +01:00
pwpiwi
57642f63fa
bugfixes hf epa cnonces
...
- extended length (more than 1 byte) not handled correctly
- nonces not printed on Windows due to type mismatch
2014-12-18 19:40:35 +01:00
pwpiwi
f10bf20c6c
Format hf 14a list output for bigger frame sizes
2014-12-18 19:39:16 +01:00
Martin Holst Swende
8e9768399c
minor change
2014-12-18 14:46:38 +01:00
Martin Holst Swende
0eea34a2a3
Fixed error in hash1 (from loclass), now it possibly calculates the KSel correctly for actually dumping data
2014-12-18 14:41:17 +01:00
Martin Holst Swende
7496d8d822
Merge pull request #32 from marshmellow42/master
...
Fixes and additions to lf io fskdemod and addon parameter to lf hid fskdemod
2014-12-18 08:56:26 +01:00
iceman1001
d3499d369d
minor fixes regaring the newly released patches from the pm3 community
...
plus removed old comments in cmdmain.c
2014-12-17 22:26:16 +01:00
pwpiwi
2bdd68c370
unify/refactor hw tune and data tune
...
- unified hw tune and Enio's great data tune
- don't use BigBuf (and hardcoded Offset)
- removed special handling of CMD_MEASURED_ANTENNA_TUNING
in UsbCommandReceived()
2014-12-17 20:57:26 +01:00
iceman1001
a501c82b19
Applied Holiman's fixes for iclass.c and CSNs
...
Applied PwPiwi's new parity fix.
Applied Marshmellw's fixes for FSKdemod (HID, IO)
FIX: a potential bigbuffer fault given pwpiwi's change inside lfops.c CmdIOdemodFSK & CmdHIDdemodFSK
FIX: change some "int" parameters to uint's.
FIX: changed the lfops.c - DoAcquisition125k_internal to respect pwpiwi's definitions of FREE_BUFFER_OFFSET
HEADS up: The ultralight functions hasn't been verified since pwpiwi's changes.
2014-12-17 20:33:21 +01:00
marshmellow42
083ca3de73
LF HID & IO prox fixes/options
2014-12-17 09:51:40 -05:00
pwpiwi
471c514167
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-12-16 07:47:02 +01:00
pwpiwi
6a1f2d82bb
bugfixes iso14443a (hf 14a commands)
...
- buffers were too small to handle 256 byte frames
- parity bits were only handled for up to 32 byte frames
- trace format was inefficient
- removed parity calculation from decoders in iclass.c (parity not used on air anyway)
2014-12-16 07:41:07 +01:00
Martin Holst Swende
6116c79618
Reverted to original malicious CSNs from paper, it appears legit readers does not accept if they dont end with F7,FF,12,E0
2014-12-14 21:37:56 +01:00
Martin Holst Swende
b160432340
Merge branch 'master' of github.com:Proxmark/proxmark3
2014-12-14 18:07:38 +01:00
Martin Holst Swende
eabba3df7e
Fix (iclass)
2014-12-14 18:07:12 +01:00
András Veres-Szentkirályi
0ff9a93966
Typofix: occurrences
...
It's spelled with two rs.
2014-12-10 16:42:31 +01:00
Martin Holst Swende
d6a120a25b
Added Enios cool tuning-trick (LF) from forum-post: http://www.proxmark.org/forum/viewtopic.php?pid=13060#p13060
2014-11-30 22:30:36 +01:00
iceman1001
02306bac2d
ADD: Enio's intuative function for the command: "hw tune", where you plot the tuning-data :)
...
ADD: added optional parameter to "hw tune" to show graf direct. Sample usage: "hw tune p"
2014-11-30 19:16:28 +01:00
iceman1001
06b58a94f0
BUG: don't try to fix things that ain't broken.. or not. My try for a fix ended up making the PrintAndLog function stop working. Just by calling a fclose.. fixed.
2014-11-27 22:16:17 +01:00
iceman1001
95e635947b
ADD: the option to simulate tnp3xxx inthe command "hf mf sim"
...
ADD: found some new default keys
ADD: changed alot of memorys buffers to use constant values. like usbbuffer sizes, tracelogs, etc etc
ADD: all changes Peter filmoore has in his pull request.
2014-11-26 13:52:39 +01:00
iceman1001
463ca973e7
FIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to be loaded.
...
FIX: hf mf esave - now supports specifying 0,1,2,4 in card memory for the file to be saved.
ADD: data.h - added FILE_PATH_SIZE constant
ADD: hf legic load - a command help and checks for FILE_PATH_SIZE
ADD: hf legis save - now checks for FILE_PATH_SIZE
ADD: lf hitag - now checks for FILE_PATH_SIZE
ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE
ADD: data load / save - now checks for FILE_PATH_SIZE
FIX: ui.c - added a case of closing a filehandle
FIX: hf mf cload / csave now checks for FILE_PATH_SIZE
FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE
2014-11-16 11:22:06 +01:00
iceman1001
961658bba9
FIX: rewrote the help text, cleaned up the code
2014-11-14 13:32:11 +01:00
iceman1001
bd5d0f07e9
REN: renamed tnp3.lua to tnp3dump.lua since that name is more explainatory
...
ADD: added tnp3sim.lua a script which loads a dump and sends it to the pm3 device memory.
2014-11-14 13:24:45 +01:00
iceman1001
b22f7a6bc6
FIX: Minor correction of variablename. don't even ask.
2014-11-13 22:23:30 +01:00
iceman1001
85578fcd4e
FIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently changed "hf mf ekeyprn"
2014-11-13 22:21:39 +01:00
iceman1001
a0bf7ba787
FIX: The hf mf ekeyprn defaults to print all 40 sectorblocks of keys. (ie 4K card). Now its optional 1K / 4K and defaults to 1K.
2014-11-13 22:13:46 +01:00
iceman1001
5c065fa089
FIX: Corrected the bug mention http://www.proxmark.org/forum/viewtopic.php?id=1612 filepath too short in "hf mf eload / esave / cload / csave" commands. Length was 14, is now 250. Should be enough for awhile.
2014-11-13 22:02:36 +01:00
iceman1001
f91f0ebb35
CHG - some lua functions in utils.lua
2014-11-13 20:14:14 +01:00
iceman1001
47cbb2d418
ADD: tnp3.lua can now validate the checkums in the dump
...
ADD: added CRC16 CCITT functionality to LUA
FIX: tnp3.lua is now correctly decryping data while dumping
2014-11-12 23:18:46 +01:00
iceman1001
f595de25e9
ADD: html_dumplib.lua, added the functionality to save text-files.
...
ADD: tnp3.lua, now will save the dumped data to BIN and EML
FIX: tnp3.lua, added some clearcommando buffer to help the pm3 not to be blocked
2014-11-10 21:46:21 +01:00
iceman1001
cd5767d43d
FIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearrays in lua are tricky
...
ADD: utils.lua some functions to convert between ascii, bytes and strings.
2014-11-09 19:29:47 +01:00
iceman1001
22f1c57786
Updated tnp3.lua
...
added some possibilities to abort the "hf mf nested" command
added a rudimentary items identification for tnp3xxx
2014-11-09 17:22:04 +01:00
iceman1001
9b989c45b9
FIX: minor parseing bug when loading dumpkeys.bin file.
...
ADD: added some useful helperfunctions to utils.lua
2014-11-05 19:16:54 +01:00
iceman1001
1a5ff2c2a7
FIX: fixed the layout of data in tnp3.lua
2014-11-03 22:29:43 +01:00
iceman1001
8aa79dee20
FIX: added some tnp3xxx identification i formatMifare.lua
...
FIX: tnp3.lua is more or less finished. Needs testing.
2014-11-03 21:59:31 +01:00
iceman1001
c70cef9734
fixing scripts/tnp3.lua
2014-11-03 15:25:54 +01:00
iceman1001
c15d2bdc9b
ADD: added identification for Mifare TNP3xxx tags.
...
ADD: MD5-lua functionality
ADD: AES 128 decrypt lua functionality
ADD: test luc script for reading TNP3xxx tags
CHG: testing some changes for "hf 14b sim" / "lf em4x 410xsim"
2014-11-03 13:49:19 +01:00
Martin Holst Swende
ca4714cd23
More coverity fixes
2014-10-30 21:49:18 +01:00
iceman1001
0222acfcf3
ADD: Implemented a "hf 14b write" function using the CmdHF14BCmdRaw method. The function can write to SRI512 and SRIX4K tags only. Be extremly cautious when writing to Block 0xFF
2014-10-30 15:28:45 +01:00
iceman1001
5ea2c88515
FIX: maybe I should actually send the uid bytes with the command request....
2014-10-30 14:29:31 +01:00
iceman1001
3649b640e6
CHG: added possiblity to send <UID> into the "HF 15 SIM"
2014-10-30 14:11:37 +01:00
iceman1001
a61b4976bd
FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks.
2014-10-30 00:09:01 +01:00
Martin Holst Swende
97d582a692
More coverity findings
2014-10-27 22:33:37 +01:00
Martin Holst Swende
90e278d3da
Fixed several issues found using a coverity-scan
2014-10-27 21:46:04 +01:00
iceman1001
7c756d6892
FIX: Another try to see if the "lf em4x 410xsim" becomes better, added the clock in the calls since the auto detection of the clock seems to be wrong. I get 67, instead of 64...
...
FIX: changes the transfersize from sim -> pm3, was 48, now USB_CMD_DATA_SIZE (512) Much faster!
2014-10-27 21:42:41 +01:00
iceman1001
2ae8a312e0
Inital test for the "lf em4x 410xsim / lf em4x 410xwatch" which I try to verify that the sim works.
...
Something about speed, the clock detection is not so good. should be 64, usually 67..
2014-10-27 19:46:21 +01:00
iceman1001
1010aacca0
Minor corrections in fskdemod i lfops.c , see Holimans branch.
...
BUG: fixed a variablename, that didn't get changed.
2014-10-27 09:56:18 +01:00
iceman1001
c6be64da09
Some more nasty bugs fixed in the lf t55xx manchester_decode method.
...
ADD: a little function to see if GraphBuffer is not used.
2014-10-26 23:16:25 +01:00
iceman1001
db297e69e1
BUG: fixed a bug with the initialization of IV in cmdhfmfu.c CmdHF14AMfucAuth
2014-10-26 21:30:29 +01:00
iceman1001
149aeadaa6
Minor bug fixes with help from Holiman.
...
FIX: sprint_hex, sprint_bin has better length detection.
FIX: ui.c has removed all c99 array declarations, with malloc
FIX: hfmfmfu.c wrong length in one array caused crashes in CmdHF14AMfURdCard
FIX: cmdlft55xx.c CmdDump has now a correct pwd string.
2014-10-26 21:25:06 +01:00
Martin Holst Swende
f97d4e2378
First try att merging with head
2014-10-24 20:46:02 +02:00
iceman1001
081151eabb
FIX: data mandemod read the wrong part of BigBuffer (no correct offset)
2014-10-24 15:34:50 +02:00
iceman1001
c2d25819d8
BUG: the lf read now uses "getbigbuffer" which the offset from where the data starts in "data samples nnnnn" needed to be set.
...
ADD: ioprox nxp identifikations
2014-10-24 00:04:56 +02:00
iceman1001
72e930ef32
FIXED: lf t55xx fsk now demods but only to binary.
...
ADD: holimans lf io / hid fskdemod changes.
2014-10-23 18:36:44 +02:00
iceman1001
fbceacc5b8
add: "lf t55xx info" option to use data from Graphbuffer.
...
add: "lf t55xx trace" option to use data from Graphbuffer.
2014-10-16 22:25:38 +02:00
iceman1001
7bd30f12ac
Small fixes,
...
Fix: removed a call to free, which I think made linux people unhappy during "lf t55xx rd 0"...
Add: "lf t55xx fsk" now kind of outputs binary from "FSK2a R/40 R/50"..
2014-10-16 15:05:27 +02:00
iceman1001
7737657747
Fixed: the dampening field detection is enhanced. If half a frame (clock rate) of values is within 40% of the mean value then it is a dampening field.
2014-10-07 21:34:02 +02:00
iceman1001
f6c18637ca
chg: LF t55xx trace
...
new: LF t55xx info
2014-10-06 19:42:50 +02:00
iceman1001
75465377b9
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/iclass.c
client/Makefile
client/cmdhficlass.c
client/loclass/cipher.c
client/loclass/fileutils.c
client/loclass/ikeys.h
include/usb_cmd.h
2014-09-19 10:50:34 +02:00
Martin Holst Swende
e6ee6c4cd1
Merge remote-tracking branch 'origin/master' into PenturaLabs-iclass-research
2014-09-19 09:45:38 +02:00
iceman1001
3d93d4f940
Add: simple Application enum.
...
Fix: Minor overflows found by Holiman.
2014-09-18 14:15:48 +02:00
iceman1001
313ee67ea2
Fixed: "hf mfdes info"
2014-09-18 12:38:31 +02:00
iceman1001
b44e523300
LF t55xx and LF em4x commands now should manchester decode data. However t55xx can have other settings and different encodings.
2014-09-16 13:56:06 +02:00
iceman1001
35147d51e3
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-09-14 17:36:00 +02:00
pwpiwi
c626c56ef5
hf mf dump bugfix: wrongly tried key A instead of key B for a specific Access Condition
2014-09-12 07:45:04 +02:00
iceman1001
76c7e6c363
Merge branch 'master' of https://github.com/Proxmark/proxmark3
...
Conflicts:
client/cmdhfmf.c
2014-09-11 23:29:14 +02:00
iceman1001
f38a152863
First check in.
2014-09-11 23:23:46 +02:00
iceman1001
4a79e52c0b
Added piwis patch,
...
first version of finding out the card size. Experimental.
2014-09-11 22:33:43 +02:00
pwpiwi
79db03ef63
hf mf dump error handling, revive hf mf chk d option, provide known keys dictionary file
...
- hf mf dump: abort on unrecoverable errors. Don't create file dumpdata.bin in this case.
- hf mf chk: re-enabled and fixed option d (dump keys to dumpkeys.bin).
if there are unknown keys, write 0xffffffffffff instead to the file.
- provide a default key dictionary file for hf mf chk (default_keys.dic). Contents taken from
mf_default_keys.lua
2014-09-11 20:58:34 +02:00
pwpiwi
baeaf57950
fix/add support for 4K (and other non 1K) card sizes in hf mf commands
...
- hf mf rdsc (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (add): added (optional) card size parameter and support for non 1K cards
- hf mf dump (fix): Access Condition 011 not handled correctly (tried to access with key A)
- hf mf restore (add): added (optional) card size parameter and support for non 1K cards
- hf mf nested (fix): didn't account for 16 block sectors, allowed max sector 63 instead of 39
- hf mf nested (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf chk (fix): always dumped 16 keys to dumpkeys.bin instead of correct number
- hf mf eget (fix): displayed three instead of one block
- hf mf eload (add): load 4K .eml files (but accepts 1K .eml files for backwards compatibility)
- hf mf esave (add): always save the whole emulator memory (4K) instead of 1K only
- hf mf ecfill (add): added (optional) card size parameter and support for non 1K cards
2014-09-10 19:04:50 +02:00
Martin Holst Swende
fdefed663f
Some more lua-scripts and library fixes from iceman, including more default keys
2014-08-29 09:11:36 +02:00
Martin Holst Swende
5b1311fba2
Various scripts from iceman
2014-08-29 09:09:23 +02:00
pwpiwi
b03c0f2d86
bugfixes hf mf sim
...
- output of debug messages caused communication failures due to timing issues.
hf mf dbg 4 now required to see these debug messages.
- changed help text for hf mf dbg
- fixed minor bugs in help texts for hf mf sim and hf mf ecset
- display "key A" or "key B" instead of "key=0" or "key=1 in hf mf sim
2014-07-30 21:23:02 +02:00
pwpiwi
991f13f27d
minor bugfixes to hf mf sniff and hf 14a snoop
...
- tracing was not always enabled when starting hf mf sniff or hf 14a snoop
- ATQA was displayed in wrong byte order in hf mf sniff
- 4 Byte UIDs were displayed as 7 Byte UIDs (padded with 0x000000) in hf mf sniff
- same for logfile names.
- assignment (=) had been used instead of == in comparisons (shouldn't have been relevant though)
2014-07-15 08:39:56 +02:00
pwpiwi
9a573554e0
minor bugfix and enhancement to hf 14a reader
...
- "SAK incorrectly claims ... " message was displayed incorrectly
- now decodes FSCI, SFGI, FWI and displays FSC, SFGT, FWT resp.
2014-07-15 08:35:27 +02:00
pwpiwi
1604d0a290
Merge branch 'master' of https://github.com/Proxmark/proxmark3
2014-07-01 07:09:21 +02:00
Martin Holst Swende
9e28ee9f14
Only documentation and minor changes
2014-06-30 11:23:14 +02:00
pwpiwi
19d6d91fd5
hf 14a reader enhancement
...
In order to be able to distinguish between Mifare Classic and Mifare Plus
in Security Level 1 (SL1, Mifare Classic Compatibility Mode), hf 14a reader
now always tries RATS - even if SAK claims not to support ISO14443-4.
2014-06-30 08:21:50 +02:00
Martin Holst Swende
9b82de75f4
more work towards iclass elite dumping.. not quite finished yet though :(
2014-06-30 00:20:40 +02:00
Martin Holst Swende
aa41c6058a
Merged two iclass-reader functions into one to remove duplicated code, update loclass library with hash2 algo
2014-06-29 23:34:24 +02:00
Midnitesnake
74a3880283
Changes inorder for iclass dump to work correctly
2014-06-29 09:25:31 +01:00
Martin Holst Swende
26c0d833ac
Some minor changes [iclass-related]
2014-06-28 22:57:48 +02:00
Martin Holst Swende
3ad48540d4
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research
...
Conflicts:
README.txt
armsrc/apps.h
client/Makefile
client/cmdhficlass.c
client/cmdhficlass.h
2014-06-28 20:52:37 +02:00
Martin Holst Swende
42f57e0294
Merged with master
2014-06-27 13:16:31 +02:00
Martin Holst Swende
77abe781af
fix for better csns
2014-06-27 12:52:28 +02:00
pwpiwi
72b1090acf
Bugfixes:
...
- Byteorder was wrong when displaying ATQA in hf 14a read
- 7 Byte UIDs were truncated to 4 Bytes when displaying in hf 14a cuids
2014-06-26 07:57:49 +02:00
iZsh
b014c96d68
new command "lf snoop" to snoop raw ADC values
...
fpga/lo_read.v (lf_field): new argument.
fpga/fpga_lf.v: modify accordingly.
armsrc/apps.h (FPGA_MAJOR_MODE_LF_READER): Rename as FPGA_MAJOR_MODE_LF_ADC.
armsrc/apps.h (FPGA_LF_ADC_READER_FIELD): New LF option.
armsrc/lfops.c: Modify accordingly.
client/cmdlf.c (CmdLFSnoop): New command.
armsrc/appmain.c, armsrc/lfops.c, client/cmdlf.h, include/usb_cmd.h: Modify accordingly.
2014-06-21 21:33:54 +02:00
iZsh
7cc204bff8
THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand.
2014-06-20 01:02:59 +02:00
penturalabs
fecd8202a5
implemented 'hf iclass dump xxxx',
...
all you need is the magic key to dump contents of an iclass card
2014-06-17 10:55:37 +01:00
Martin Holst Swende
9f6e9d1575
More work on iclass simulation attack
2014-06-16 21:27:12 +02:00
Martin Holst Swende
d51b2eda8f
Added enios dirthreshold command, patch from http://www.proxmark.org/forum/viewtopic.php?pid=11577#p11577
2014-06-11 08:42:37 +02:00
penturalabs
fe53c0311c
improved calc_iclass_mac to work independant of size
2014-05-02 23:30:03 +01:00
Andrew Davies
a66fca86b9
Updated proxmark research with Holiman's loclass framework
2014-05-02 11:11:54 +01:00
Martin Holst Swende
f83cc12613
More work on iclass
2014-04-24 15:48:00 +02:00
Martin Holst Swende
17cba2693d
Implemented client side changes for iclass hack, attempted to fix issues with trace. The trace functionality from iso14443 has been rewritten, unfortunately iclass used that also, which made iclass 'list' stop functioning, both for simulation and snooping
2014-04-24 14:13:33 +02:00
penturalabs
c3963755b7
Implement replay command.
2014-04-15 11:47:01 +01:00
Martin Holst Swende
07976a256d
Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch
2014-03-31 17:57:14 +02:00
Philippe Teuwen
19e2a10de5
Markdown help: use fixed column width
2014-03-27 16:49:37 +01:00
Philippe Teuwen
46782176fc
Restore original inline help behavior as we've now separate fcts for -h/-m
2014-03-26 23:51:22 +01:00
Philippe Teuwen
dec8e8bd9f
Provide option -m for markdown help dump, -h for text dump
2014-03-26 23:50:34 +01:00
Philippe Teuwen
6f5dd6010e
Fix description in help dump
2014-03-26 22:44:25 +01:00
Philippe Teuwen
b5727175c0
Fix offline column in help dump
2014-03-26 22:40:41 +01:00
Martin Holst Swende
57c695563f
Fixes to implement generation of markdown auto-generated documentation
2014-03-26 22:39:37 +01:00
Philippe Teuwen
ae7aa73dd5
Add option -h to dump complete set of supported commands
...
Usage: ./proxmark3 -h
Display both offline & online commands, online commands are flagged.
git-svn-id: https://proxmark3.googlecode.com/svn/trunk@850 ef4ab9da-24cd-11de-8aaa-f3a34680c41f
2014-03-26 22:33:11 +01:00
holiman
f5a1a9ce47
Merge pull request #8 from pwpiwi/master
...
add .gitignore and merge svn r852
2014-03-25 21:49:05 +01:00
pwpiwi
d714d3effc
Improvements/Fixes to 14443 sniffing/snooping
...
- fixed a circular buffer rollover bug in iso14443a.c
- fixed 7 Byte UID handling in hf mf sniff
- fixed "cannot append" error in hf mf sniff d
- fixed hint on mfkey32 in hf mf sim x
- fixed hf mf sniff sometimes showing rogue data from previous calloc
- improve snooping/sniffing by syncing modulation detector window with reader signal (hi_iso14443a.v)
- code cleanup of hi_iso14443a.v
2014-03-25 21:38:24 +01:00
W8M2Hg9lLmWqXSGC
88c637e6cd
Merge pull request #7 from PenturaLabs/master
...
Re-submitting Midnitesnake's Mifare Ultralight Patch
2014-03-25 07:07:48 +11:00
W8M2Hg9lLmWqXSGC
347dea669a
Merge pull request #5 from PenturaLabs/master
...
Kantech ioProx Support - Fix
2014-03-21 20:35:14 +11:00
PenturaLabs
94faa59465
Update cmdlfio.h
2014-03-21 07:51:51 +00:00
penturalabs
c86220246e
Sorry, included missing files from last pull request
2014-03-21 07:45:18 +00:00
W8M2Hg9lLmWqXSGC
cf608ac8f3
Merge pull request #2 from PenturaLabs/master
...
Added Kantech ioProx Support
2014-03-19 08:47:28 +11:00
penturalabs
a1f3bb120f
Added Kantech ioProx Support
2014-03-18 20:52:48 +00:00
PenturaLabs
1801456ede
Re-submitting Midnitesnake's Mifare Ultralight Patch
2014-03-18 14:02:32 +00:00
midnitesnake
cb967ea976
Added Unique Code to EM41x
2014-03-18 07:42:54 +00:00
midnitesnake
080ff30a9e
Added Unique Code to EM41x
2014-03-18 07:41:02 +00:00
martin.holst@gmail.com
0c12504a5a
Patch submitted by 'FireFart', for some issues with 'hf mf chk'. See http://www.proxmark.org/forum/viewtopic.php?id=1888 for more info
2014-02-27 18:10:12 +00:00
micki.held@gmx.de
7bc95e2e43
- fixed iso1443a ManchesterDecoder in order to fix broken Snoop/Sniff
...
- enhanced tracing: hf 14a list now shows meaningful timing information. With new option f it also shows the frame delay times (fdt)
- small fix for hf 14b list - it used to run into the trace trailer
- hf 14a sim now obeys iso14443 timing (fdt of 1172 or 1234 resp.)
Note: you need to flash FPGA as well.
More details in http://www.proxmark.org/forum/viewtopic.php?pid=9721#p9721
2014-02-19 20:35:04 +00:00
martin.holst@gmail.com
d2f487af9c
Various improvements on the Mifare1kSimulation. Fixed issue with tracebuffer not being cleared, fixed issue with 'static' errors, added modes for doing reader-only attack, added interactive mode, added possibility to set UID from cmdline, either 7-byte or 4-byte. See http://www.proxmark.org/forum/viewtopic.php?id=1529 and http://www.proxmark.org/forum/viewtopic.php?id=1649&p=3 for some more background and discussion
2014-01-31 21:17:34 +00:00
micki.held@gmx.de
e691fc45bc
- improved reader sensitivity for 14443a cards (FPGA change!)
...
- implemented ISO 14443A anticollision loop
See http://www.proxmark.org/forum/viewtopic.php?id=1797 further details
2013-11-19 18:52:40 +00:00
martin.holst@gmail.com
6cacefa48d
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
2013-11-07 11:33:48 +00:00
martin.holst@gmail.com
4c367827b5
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
2013-11-07 11:32:13 +00:00
martin.holst@gmail.com
77cd612f15
Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation
2013-11-06 18:34:10 +00:00
martin.holst@gmail.com
da9d456e9f
Minor fix, sometimes when data is sent without the pm3 is connected, it causes a spin-loop condition to occur which blocks the processor. fixed
2013-11-06 18:32:11 +00:00
martin.holst@gmail.com
b11542a7f6
Minor fix in html skeleton
2013-10-31 18:24:03 +00:00
martin.holst@gmail.com
e26df8425a
Some more tinkering with a generic 13.56MHz reader, still not finished
2013-10-31 10:35:03 +00:00
martin.holst@gmail.com
5198f2e23c
First steps towards creating a generic HF reader/identifier. A coop with Asper.
2013-10-30 21:10:47 +00:00
martin.holst@gmail.com
62a95012e9
Changed html template, in order to make it more generic and be usable on other types of data than mifare, now supports different highlighters. Implemented are NDEF and Mifare
2013-10-30 18:21:42 +00:00
dn337t@gmail.com
a00411152f
use CLOCKS_PER_SEC instead of platform-specific hardcoded value
2013-10-22 12:14:32 +00:00
martin.holst@gmail.com
412afdb87b
Fixed linebreak error
2013-10-20 19:05:52 +00:00
martin.holst@gmail.com
b3123cf603
Added functionality to dump data into .eml-file
2013-10-20 18:51:21 +00:00
martin.holst@gmail.com
db132ea0e8
Script to convert emulator file (ASCII dump of data) into HTML
2013-10-20 18:48:04 +00:00
martin.holst@gmail.com
c44241fdea
Fixed minor errors
2013-10-20 18:47:15 +00:00
izsh@fail0verflow.com
06b82e6a6d
cmdhf14b.c: fixing a crash in the crc computation when missing data (e.g. with 'hf 14b raw -c -p')
2013-10-20 11:46:51 +00:00
izsh@fail0verflow.com
3f7c993d78
fix compilation issues with gcc 4.6: anonymous unions are not c99
2013-10-20 11:40:00 +00:00
martin.holst@gmail.com
6742c089b1
Changes to how dumping is performed, now utilises a library. This is in preparation for a more generic dumping of different types of cards. Also added functionality to html-dump .eml-files
2013-10-19 20:18:50 +00:00
martin.holst@gmail.com
ba33066cef
Minor change
2013-10-18 11:35:06 +00:00
martin.holst@gmail.com
1686e4d1db
Added script to dump ndef-compliant tags. Written in collaboration with @asper
2013-10-18 11:14:23 +00:00
martin.holst@gmail.com
3c9ed0e180
Put manufacturer country within brackets
2013-10-18 07:36:20 +00:00
martin.holst@gmail.com
65e344df3e
Some refactoring, also placed wait14443a here
2013-10-17 19:21:04 +00:00
martin.holst@gmail.com
5eab31c336
Manufacturer-info, to be used in upcoming script
2013-10-17 19:20:10 +00:00
martin.holst@gmail.com
57d384004d
Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576
2013-10-17 18:28:21 +00:00
roel@libnfc.org
981bd4292e
integrated MIFARE ultralight features, contributed by 'midnitesnake'
2013-10-11 08:43:23 +00:00
roel@libnfc.org
05f23c593c
with the declaration of 'uint8_t destination[8]', 'destination' is already a pointer, don't try to get the address of it by using '&destination', then you will get a pointer to a pointer.
2013-10-11 08:37:08 +00:00
martin.holst@gmail.com
51defdd4a2
Fixed issue where the 'nested'-part of autopwn only used 16 sectors, not bothering with the rest
2013-10-09 19:37:55 +00:00
martin.holst@gmail.com
b969713989
Fixed error with mifare_autopwn where keys were reversed, see http://www.proxmark.org/forum/viewtopic.php?pid=8494#p8494
2013-10-09 19:08:17 +00:00
roel@libnfc.org
b1231445c7
removed unused compiler directives, cleaned up some code
2013-10-09 09:59:14 +00:00
martin.holst@gmail.com
0dae56d81e
Committed mifare_autopwn.lua. For more infromation, see http://martin.swende.se/blog/Proxmark_Scripting_1.html and http://martin.swende.se/blog/Proxmark_Scripting_2.html
2013-10-08 18:50:54 +00:00
martin.holst@gmail.com
ed77aabe00
Patch from 'buzzy' to add automatic flushing of output, see http://www.proxmark.org/forum/viewtopic.php?id=1740 for more details.
2013-10-08 18:30:01 +00:00
martin.holst@gmail.com
2dcdf1a683
Added nonce2key-API to lua
2013-10-07 10:11:15 +00:00
martin.holst@gmail.com
7d2313912c
Fixed what may have been one cause of seg-faults in nonce2key... not sure, it still happens at times
2013-10-07 10:10:34 +00:00
martin.holst@gmail.com
e481bc3299
Removed double print-out
2013-10-07 10:02:25 +00:00
fnargwibble@gmail.com
e654346b79
i'm a retard. no idea why i did it that way! get rid of compile warnings, and print string properly. duh.
2013-10-05 16:55:53 +00:00
fnargwibble@gmail.com
e12b82d362
show device name during flashing and change advice on hanging
2013-10-05 16:44:48 +00:00
martin.holst@gmail.com
0a85b72549
Reworked how to call 'standard' stuff from within lua scripts, so now it's much simpler both in lines of code and usage. A script can now call core.console('hf mf nested 1 0 a ffffffffffff') in order to execute anything via the old command line parser
2013-10-04 19:29:46 +00:00
jonor@live.it
4f269f63da
Added more informations at command hw version. Now we can get some informations of microcontroller.
...
Maybe is useful when someone got a bigger AT91
Example:
#db# Prox/RFID mark3 RFID instrument
#db# bootrom: svn 756-unclean 2013-09-14 15:04:07
#db# os: svn 796-unclean 2013-10-04 18:50:44
#db# FPGA image built on 2013/ 9/26 at 9:17:32
uC: AT91SAM7S256 Rev B
Embedded Processor: ARM7TDMI
Nonvolatile Program Memory Size: 256K bytes
Second Nonvolatile Program Memory Size: None
Internal SRAM Size: 64K bytes
Architecture Identifier: AT91SAM7Sxx Series
Nonvolatile Program Memory Type: Embedded Flash Memory
2013-10-04 18:54:10 +00:00
martin.holst@gmail.com
6a2c1d8e14
Minor issue, usability
2013-10-04 18:47:38 +00:00
roel@libnfc.org
78e7cf984c
fixed some more compiler warnings
2013-10-03 14:52:21 +00:00
roel@libnfc.org
f66021cf48
fixed compiler warnings
2013-10-03 14:36:42 +00:00
martin.holst@gmail.com
2fca3ad92d
Some documentation improvement
2013-10-03 13:58:14 +00:00
martin.holst@gmail.com
c9e2f7807e
Added a utility script to convert a 'dumpdata.bin'-file into the 'eml'-format that the emulator uses. Did not find any built-in way to do this, perhaps such functionality already exists.. ?
2013-10-03 13:56:11 +00:00
martin.holst@gmail.com
acfdf9528b
Fixed error in htmldumper
2013-10-03 13:26:17 +00:00
martin.holst@gmail.com
61caacda2b
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone .. part 2
2013-10-03 12:34:28 +00:00
martin.holst@gmail.com
d78792f515
Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone
2013-10-03 12:33:58 +00:00
martin.holst@gmail.com
05ed5c496a
Made script-based default key check a bit more intelligent, so it works not only on 4k cards. Also added option to save data to a dump-file
2013-10-01 19:58:42 +00:00
douniwan5788@gmail.com
b19bd5d689
Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK.
...
Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.
2013-09-29 11:44:07 +00:00
martin.holst@gmail.com
686f0a1794
Moved script libraries into lualibs/folder, and added a patch to include the folder in the LUA_PATH (a.k.a package.path). See http://proxmark.org/forum/viewtopic.php?id=1750 for more details
2013-09-28 20:07:28 +00:00
martin.holst@gmail.com
5f6d6c9003
Raw 14a in commandline, patch by jonor, see http://proxmark.org/forum/viewtopic.php?id=1751 for more info
2013-09-28 19:28:55 +00:00
henryk@ploetzli.ch
bf7163bdb3
* Add an option to lf read command to use an arbitrary divisor, enabling reading at frequencies other than 125 and 134 kHz.
2013-09-27 13:48:20 +00:00
roel@libnfc.org
7bb9d33e2c
fixed warnings on Mac OS 10.8, xcode 5
2013-09-25 10:40:16 +00:00
martin.holst@gmail.com
450d2e3a96
Minor changes, usage examples and selftests
2013-09-21 20:46:32 +00:00
martin.holst@gmail.com
70c8077c99
Changed the name of writeraw into 14araw
2013-09-21 20:40:32 +00:00
martin.holst@gmail.com
b61f426c2d
Fixed the write raw 14a, now finally functional... at least let's hope so
2013-09-21 20:37:22 +00:00
martin.holst@gmail.com
427cdbe2cd
Fixed error from r769 where I added -ldl switch for linux, but still forgot to remove it for others...
2013-09-20 10:11:17 +00:00
martin.holst@gmail.com
24d48e60fc
Fix two errors in writeraw (14a)-script that were found by jonor
2013-09-20 07:32:37 +00:00
martin.holst@gmail.com
42daa759c1
Only superficial changes, to get rid of compiler warnings
2013-09-19 19:53:09 +00:00
martin.holst@gmail.com
eaea9de900
Removed the -ldl switch from r763, so it only is added for Linux (it apparently caused errors on windows/mingw)
2013-09-19 19:33:56 +00:00
martin.holst@gmail.com
30a5d35529
Implemented parameter passing into script, added a minimal getop-parser, added an example script which takes parameters
2013-09-19 19:21:12 +00:00
martin.holst@gmail.com
b13fa4448f
merged trunk changes into branch
2013-09-16 19:08:19 +00:00
martin.holst@gmail.com
a403a55959
In the middle of some work to get arguments into scripts. Also fixed so you don't have to specify .lua on 'script run foobar'
2013-09-16 19:04:29 +00:00
martin.holst@gmail.com
869cabf7dd
Patch by jonor for hf list 14b, wait of ack was missing. See http://www.proxmark.org/forum/viewtopic.php?pid=8260#p8260
2013-09-16 18:38:47 +00:00
micki.held@gmx.de
9492e0b098
Major rework of hf mf nested:
...
- PM: used GetCountMifare in MifareNested() for improved timing accuracy and to deliver better quality nonces
- PM: MifareNested now delivers exactly two different nonces to avoid time consuming multiple lfsr_recovery32() on client side
- Client: replaced quicksort by bucketsort in crapto1.c which is faster
- Client: use multithreading (two parallel calls to lfsr_recovery32())
- Client: fixed a small bug in mfnested() (always showed trgkey=0)
- Client: introduced a mutex for PrintAndLog() to avoid interlaced printing
Minor rework of hf mf chk:
- Avoid time consuming off/on cycles. Send a "halt" instead.
2013-09-15 09:33:17 +00:00
martin.holst@gmail.com
500c972914
Fixed some kind of of linking error
2013-09-01 20:22:22 +00:00
martin.holst@gmail.com
cda2a4c0a5
Merged latest trunk changes into scripting-branch
2013-09-01 20:00:56 +00:00
martin.holst@gmail.com
babfcaa0f3
Patch by jonor, fixes so uart_receive does not block when data is continuosly received. See http://www.proxmark.org/forum/viewtopic.php?id=1735
2013-09-01 18:46:55 +00:00
martin.holst@gmail.com
7cf3ef203c
Patch by jonor for raw ISO 1444B commands. See http://www.proxmark.org/forum/viewtopic.php?id=1729 for more info
2013-09-01 18:41:05 +00:00
martin.holst@gmail.com
a763eb2126
Added a comment
2013-09-01 18:40:08 +00:00
martin.holst@gmail.com
3e69b21148
Minor changes to writeraw.lua, still not working as it should
2013-08-27 06:50:00 +00:00
martin.holst@gmail.com
4961e292aa
More patches from en4rab to the hexsamples, plus patches to legicsave and legicdecode (also by en4rab).
2013-07-12 20:03:31 +00:00
micki.held@gmx.de
1d59cd8d7a
Revoked unintended commit of cmdmain.c to scripting branch in r754.
2013-07-10 05:10:58 +00:00
micki.held@gmx.de
1c611bbd26
2013-07-08 17:56:05 +00:00
micki.held@gmx.de
a361cddfb9
2013-07-08 17:56:05 +00:00
martin.holst@gmail.com
4df3eb3f73
Attempt to use raw writing capabilities via scripting engine. Not functional yet
2013-07-04 12:56:00 +00:00
martin.holst@gmail.com
e772353f72
Major changes to hf mf mifare
2013-06-26 21:13:02 +00:00
martin.holst@gmail.com
c6e2bfcda1
Removed some crap-scripts for testing
2013-06-26 20:49:04 +00:00
martin.holst@gmail.com
ca363c2348
Fixed so correct sizes are used across different architectures in the binlib
2013-06-26 12:33:31 +00:00
martin.holst@gmail.com
3a4c72fe59
Added lua-mac building, added cleaning of lua files
2013-06-26 11:02:37 +00:00
martin.holst@gmail.com
ea833d39ff
Improved error handling
2013-06-26 09:18:31 +00:00
martin.holst@gmail.com
30a46ed86a
Attempt to make the makefile generic, so lua compilation works well also under windows
2013-06-25 20:25:18 +00:00
martin.holst@gmail.com
529488e87d
typo
2013-06-07 19:51:15 +00:00
martin.holst@gmail.com
9f7a854d7b
Fixed a minor error with the keys
2013-06-07 18:58:06 +00:00
martin.holst@gmail.com
a2d82b467a
Added library to read card info, made use of it from within mfkeys.lua script
2013-06-07 13:23:32 +00:00
martin.holst@gmail.com
fd368d18f1
Changes in cmd handling
2013-06-07 09:30:32 +00:00
martin.holst@gmail.com
21452811e6
implementation of command library in lua
2013-06-07 09:27:58 +00:00
martin.holst@gmail.com
16b04cb291
mf check keys in lua-space
2013-06-07 09:26:56 +00:00
martin.holst@gmail.com
c00f0dbfda
Fixed 'volatile' error in this branch also
2013-06-07 09:25:59 +00:00
martin.holst@gmail.com
44fffc5451
Work on the scripting library
2013-06-07 09:24:25 +00:00
martin.holst@gmail.com
1bad971361
Fixed so storeCommand/getCommand are multithread-safe (at least dual-thread). Hopefully. http://www.proxmark.org/forum/viewtopic.php?pid=7400#p7400
2013-06-06 18:30:00 +00:00
martin.holst@gmail.com
c338502409
Applied patch from http://www.proxmark.org/forum/viewtopic.php?id=1637 , where a compiler optimization resulted in hangs
2013-06-05 08:53:20 +00:00
martin.holst@gmail.com
ab7a8ea164
Fixed error pointed out here: https://code.google.com/p/proxmark3/issues/detail?id=46 , when null is passed to waitforresponse
2013-06-03 11:04:35 +00:00
martin.holst@gmail.com
a808a224f5
Found that USBcommands from the device are silently overwritten if the host does not quickly enough read them, which causes problems in several places. Implemented a circular buffer which stores up to 50 commands (still tiny, memorywise) and prints out a message if the buffer wraps around (overwrites).
2013-05-31 19:25:13 +00:00
martin.holst@gmail.com
f057bddb70
Added binlib, to handle binary data from lua, based on lpack http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lpack
2013-05-26 20:05:13 +00:00
martin.holst@gmail.com
3510cdff4b
Started an experiment with lua mifare hack
2013-05-24 21:43:02 +00:00
martin.holst@gmail.com
96e7a3a50b
Minor fixes, added some functionality to send data, but still some way to go
2013-05-24 21:39:08 +00:00
martin.holst@gmail.com
5b760b6cac
'core' library glue
2013-05-24 21:06:57 +00:00
martin.holst@gmail.com
1ef665776d
Added a PoC script which implements a commandline
2013-05-24 21:06:20 +00:00
martin.holst@gmail.com
a0655c45bd
Added 'core'-api, also added some error handling in scripts
2013-05-24 21:05:45 +00:00
martin.holst@gmail.com
5a92cb525e
Fixed so standard libraries can be used, added an example script, and fixed so all hf.mf-ops can be called
2013-05-22 13:04:01 +00:00
martin.holst@gmail.com
806dc07542
First implementation of user scripts - very experimental - YMMV
2013-05-21 18:37:43 +00:00
martin.holst@gmail.com
489e174541
Fixed problem with em4100, see http://www.proxmark.org/forum/viewtopic.php?pid=7235#p7235
2013-05-16 18:13:54 +00:00
apresence@gmail.com
e67b06b706
Support for cloning to T55x7 at different clock rates & 134KHz
...
* Modified commands (lf em4x):
em410xwatch ['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)
em410xwrite <UID> <'0' T5555> <'1' T55x7> [clock rate] -- Write EM410x UID to T5555(Q5) or T55x7 tag, optionally setting clock rate
* Better option checking for em410xwrite & fix for uninitialized vars
* Increased samples from 2000 to 4000 in em410xwatch (2000 is OK for clock=64, but too few for clock=32)
2013-05-12 08:11:00 +00:00
martin.holst@gmail.com
5b59cfb7b1
Added some information about flashing (linux)
2013-05-11 12:43:44 +00:00
martin.holst@gmail.com
5f91a683b7
Added some documentation regarding ports on linux
2013-05-11 12:33:04 +00:00
roel@libnfc.org
90d74dc206
next update from en4rab on data samples
2013-04-26 20:33:05 +00:00
roel@libnfc.org
a2847518d2
en4rab fixed the 'data samples' command
2013-04-23 19:55:43 +00:00
roel@libnfc.org
6c6d1ac1a6
fixed signed/unsigned problem
2013-03-26 20:42:18 +00:00
roel@libnfc.org
4890730a5f
fixed crash, when proxmark was claimed by other process
2013-03-26 16:01:52 +00:00
roel@libnfc.org
62ee4fedd5
Finally figured out a way to claim a serial port interface under unix
2013-03-22 16:42:26 +00:00
roel@libnfc.org
4a049b7847
avoid rolling dots over the screen when proxmark is not available (yet)
2013-03-21 16:06:09 +00:00
roel@libnfc.org
d8193fa5ac
flasher updated again, should work more solid now
2013-03-21 12:44:21 +00:00
roel@libnfc.org
2d7fc168a2
fixed missing header file
2013-03-21 11:38:48 +00:00
roel@libnfc.org
13dbdd6bb1
(dirty) fix for linux to clean up the /dev/ttyACM* quicker
2013-03-21 10:59:56 +00:00
roel@libnfc.org
0a24369c48
trying to tweak uart code, for better flashing
2013-03-19 16:19:20 +00:00
roel@libnfc.org
759c16b31f
client should compile without warnings on linux, mac, windows
2013-03-14 15:03:04 +00:00
roel@libnfc.org
19d9a7b0ce
fixed compiling under ubuntu with devkitARM_r41
2013-03-13 13:46:40 +00:00
cex123@gmail.com
38b20f7550
Fixed LF HID cloning command
2013-03-13 07:13:19 +00:00
roel@libnfc.org
47e18126ec
added hitag bit count output in log
2013-03-11 15:07:23 +00:00
roel@libnfc.org
d16d20b1fb
fixed CMD_HID_SIM_TAG
2013-03-10 11:37:59 +00:00
roel@libnfc.org
c1e745e465
optimized
2013-03-04 15:15:30 +00:00
thijsbreman@gmail.com
a7b4bf1eb4
polling per second in OpenProxmark
2013-03-04 13:07:15 +00:00
roel@libnfc.org
829fb342b5
uploaded new mingw-proxmark.zip, QT working again, so re-enabled QUI under windows
2013-03-01 14:28:14 +00:00
roel@libnfc.org
9d8f56e35d
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part4
2013-02-28 22:49:34 +00:00
roel@libnfc.org
a0bbdb76ca
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part3
2013-02-28 22:46:49 +00:00
roel@libnfc.org
1a07fd510d
fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part2
2013-02-28 22:33:31 +00:00
roel@libnfc.org
125a98a110
fixed stupid 64-bit formatting for x86/amd64 and unix/windows
2013-02-28 22:22:24 +00:00
roel@libnfc.org
cb64309e4b
compiling on windows again
2013-02-28 21:36:09 +00:00
roel@libnfc.org
54a942b05d
merged all patches into CDC repository
2013-02-28 17:04:23 +00:00
roel@libnfc.org
50d6e4abc1
douniwan5788:
2013-02-28 16:04:21 +00:00
roel@libnfc.org
28fdb04fd8
Finally, rewrote bootrom and flasher program, much faster now
2013-02-28 15:11:52 +00:00
roel@libnfc.org
79a73ab2d1
fixed USB GPIO bug reported by gregy, and fixed 'hf 14a reader' command
2013-02-27 13:23:38 +00:00
roel@libnfc.org
ab4da50d99
added automatically saving the hitag2 memory content to file
2012-12-09 21:25:29 +00:00
roel@libnfc.org
9440213d6b
fixed 64-bit cmd/arg for windows
2012-12-09 13:00:19 +00:00
roel@libnfc.org
7dd1908b24
fixed 'hf mf' command and some others
2012-12-07 22:37:22 +00:00
roel@libnfc.org
fe7bfa7856
Windows7 working now! ugly fix for inaccurate Windows timer, quickfix for receiving multiple frames
2012-12-07 12:51:19 +00:00
roel@libnfc.org
f0ba634221
receiving/sending moved to one thread
2012-12-07 12:22:05 +00:00
roel@libnfc.org
985ef1c315
temporarely disabled QT for winows, no clue why it gives a failure
2012-12-07 11:01:55 +00:00
roel@libnfc.org
1282b0e691
minor output change
2012-12-07 09:51:22 +00:00
roel@libnfc.org
af65f5f71d
fixed read uart for windows
2012-12-07 07:21:00 +00:00
roel@libnfc.org
d0b14ad5e7
fixed missing header
2012-12-06 22:17:27 +00:00
roel@libnfc.org
ecab772ed0
added missing files, part2
2012-12-04 23:43:19 +00:00
roel@libnfc.org
5bcc76c427
added missing files
2012-12-04 23:41:54 +00:00
roel@libnfc.org
902cb3c00b
major USB update
2012-12-04 23:39:18 +00:00
Merlokbr@gmail.com
bfaecce6eb
there was bug in hf mf mifare. and speed up this command.
2012-11-08 09:48:02 +00:00
thijsbreman@gmail.com
219a334de5
added: readed blocks (password mode) into tag.sectors[]. 'lf hitag sim' simulates the readed blocks.
2012-10-18 10:01:13 +00:00
roel@libnfc.org
bde10a5057
added hitag2 reading in crypto mode functionality
2012-10-16 15:18:13 +00:00
thijsbreman@gmail.com
2d495a814d
Added output to file for 'lf hitag list' command
2012-10-03 12:30:20 +00:00
roel@libnfc.org
8de6b69d1e
added 'hitag2.ht2' binary example image for emulation
2012-09-18 13:56:23 +00:00
roel@libnfc.org
db09cb3adb
MAJOR update, added hitag2 reader, emulation and eavesdropping, lots of new code, including FPGA tweaks
2012-09-18 13:52:50 +00:00
frederikmoellers@aol.de
69f8a37be0
Allow user to specify a delay
...
The user may specify a delay between PACE nonce requests. Using no delay between subsequent issues of the USB command may lead to errors in the USB communication.
Until test results show that the delay can be fixed or left out completely the user has to test what value is safe to use.
This fixes errors "Read only 40 instead of requested 64 bytes!" (if the correct delay is used, e.g. 3 seconds for 16 byte nonces).
2012-08-28 22:45:34 +00:00
frederikmoellers@aol.de
5acd09bdfb
Basic support for EAC documents (e.g. German Identification Card)
...
-new files armsrc/epa.[ch] for ePA (electronic "Personalausweis") related functions
-Offers elementary functions (EPA_PACE_MSE_Set_AT etc.)
-Also offers one new USB command: EPA_PACE_Collect_Nonce
-created new command subtree in client: client/hfepa.[ch] ("hf epa")
-offers "hf epa cnonces" (collect encrypted PACE nonces)
-more to come
2012-08-28 21:39:50 +00:00
frederikmoellers@aol.de
db22dfe6ff
-Added .history to the svn:ignore property
...
-Added "hf 14a cuids" command to collect multiple ISO14443-A UIDs from one card in a batch
-The command takes one parameter (the number of UIDs to collect)
-This can be useful to analyze the RNGs of cards that generate random UIDs (e.g. MRTDs)
2012-08-14 14:56:09 +00:00
dn337t@gmail.com
e50d95165c
removed dead check of uint8_t > 255
2012-08-13 19:52:22 +00:00
dn337t@gmail.com
561f7c11ef
added dissector for ISO 14443-A ATS response
2012-07-25 16:19:56 +00:00
dn337t@gmail.com
14006804dd
added util.h include to avoid implicit function declaration
2012-07-20 09:06:55 +00:00
dn337t@gmail.com
eede7162bc
commented set but unread variable wantSaveToEml
2012-07-20 09:04:23 +00:00
Merlokbr@gmail.com
71d90e54cd
hf mf sniff transfered parity from arm to decoding procedure
2012-07-17 15:19:15 +00:00
Merlokbr@gmail.com
8b6a93df91
hf mf sniff added CRC_14443_A check
2012-07-17 11:41:56 +00:00
Merlokbr@gmail.com
c948cbde8c
small fix
2012-07-17 11:29:34 +00:00
Merlokbr@gmail.com
e0c635d19c
hf mf sniff - working with emulator files
2012-07-17 11:28:12 +00:00
Merlokbr@gmail.com
55acbb2a39
improved command hf mf sniff. Now it cant decode nested authentication and cant write emulator files
2012-07-16 14:49:51 +00:00
Merlokbr@gmail.com
39864b0bd4
"hf mf sniff" low level logics works.
2012-07-11 15:52:33 +00:00
t0m4.null@gmail.com
ec56429002
Fixed writing em410x 40bits UID on T5555/T55x7 tags on 32bits systems
2012-07-10 17:52:17 +00:00
Merlokbr@gmail.com
5cd9ec01e0
hf 14a snoop optimized and added parameters. hf 14a sniff - not work.
2012-07-07 15:29:51 +00:00
Merlokbr@gmail.com
b62a5a8444
small improvements, added new command hf mf sniff (there will be cool sniffer). But now... here is optimized hf 14a snoop. As I see it works the same as th old version.
2012-07-06 16:19:05 +00:00
douniwan5788
ac14bee321
Fixed auto nt bug
2012-07-06 13:44:37 +00:00
Merlokbr@gmail.com
8784cd1aee
fixed setting block0 for "magic card". now it works)
2012-07-06 10:00:44 +00:00
Merlokbr@gmail.com
545a1f385c
another "magic card" backdoor - command "read block". Added several commands to manipulate card data.
2012-07-05 14:05:01 +00:00
Merlokbr@gmail.com
208a0166b9
magic Chinese card fully supported. Added commands:csetuid-set card uid and wipe it, csetblk-set 16 byte block, cload-load dump from emulator memory or emulator file
2012-07-05 10:59:15 +00:00
Merlokbr@gmail.com
f774db9598
added magic card write block
2012-07-05 08:09:41 +00:00
Merlokbr@gmail.com
0675f200e6
Added work with "magic Chinese" card (card from: ouyangweidaxian@live.cn) with wipe support). Change UID and wipe only.
2012-07-05 07:31:56 +00:00
cex123@gmail.com
2414f97889
Added Indala cloning. Fixed HID cloning bug
2012-07-02 08:37:50 +00:00
roel@libnfc.org
81cd0474cb
fixed a lot of simulation issues
2012-06-29 10:24:05 +00:00
dekoninggans@gmail.com
1e26214152
Extended iClass support with Card and Reader emulation!
2012-06-28 13:38:40 +00:00
dn337t@gmail.com
70049c47db
refactored client/pm3_*.py to use with statements, contants and iterators
2012-06-22 12:02:19 +00:00
dn337t@gmail.com
0aceafbf2e
added simple test suite for client/pm3_*.py
2012-06-22 11:51:59 +00:00
dn337t@gmail.com
11d2326425
made clients/pm3_*.py importable as Python modules
2012-06-22 11:09:36 +00:00
adrian@atrox.at
0546b4aaf7
added more cards to iso15693 uid database, and some minor cleanups
2012-06-20 17:15:21 +00:00
dn337t@gmail.com
cee48e2b44
initialize graph cursors to avoid crashing (issue 21)
2012-06-07 14:00:41 +00:00
dn337t@gmail.com
836138032c
use char instead of uint8_t to avoid warnings/casting
2012-06-07 09:24:49 +00:00
douniwan5788
99a71a0d01
replaced the getline which does't support by minGW on windows
2012-05-31 09:46:02 +00:00
douniwan5788
aea4d76687
Enhanced hf mf chk , add default key,support dic file and so on.
...
modify hf mf mifare to automatically use an invalid key'nt try again.
make some changes to support mifare classic 4k.
2012-05-30 03:45:55 +00:00
dn337t@gmail.com
7853775ee2
added CmdHF15CmdReadmulti using Adrian's second patch from issue 20
2012-05-29 12:31:29 +00:00
dn337t@gmail.com
65a23af22b
textual changes: error messages and comments by Andrian + attribution
2012-05-29 12:22:08 +00:00
dn337t@gmail.com
05151b6fe8
added head comments on CmdHF15Cmd{Read,Write} using Adrian's second patch from issue 20
2012-05-29 12:17:24 +00:00
dn337t@gmail.com
eba61a5647
clarification in 'hf 15 cmd write' message using Adrian's second patch from issue 20
2012-05-29 12:12:00 +00:00
dn337t@gmail.com
fdb67f1c8d
implemented output of received octets in 'hf 15 cmd raw'
2012-05-18 12:26:50 +00:00
dn337t@gmail.com
6d7234cd43
added 'hf 15 cmd sysinfo' using Adrian's second patch from issue 20
2012-05-18 09:20:27 +00:00
dn337t@gmail.com
c43897de27
typofix in prepareHF15Cmd comment based on Adrian's second patch from issue 20
2012-05-18 09:10:44 +00:00
dn337t@gmail.com
382223b9a9
fixed offset in 'hf 15 cmd read' to avoid losing the first octet/byte
2012-05-18 09:07:39 +00:00
dn337t@gmail.com
e8da774090
boolean fix in 'hf 15 cmd read' using Adrian's second patch from issue 20
2012-05-18 09:05:00 +00:00
dn337t@gmail.com
e4da8ed0bb
typofixes in ISO15693 getUID head comment
2012-05-18 08:59:22 +00:00
dn337t@gmail.com
c71e7235da
extended ISO 15693 UID map using Adrian's second patch from issue 20
2012-05-17 14:35:19 +00:00
dn337t@gmail.com
b4a9d8419f
implemented ISO 15693 error message decoding and fixed error code offset
2012-05-17 13:25:50 +00:00
dn337t@gmail.com
31b6e9af2b
Removed unused variables, added implicitly used headers
2012-05-14 14:48:23 +00:00
marcin.mielczarczyk
2d4eae7617
Support for EM410x card mode in T5555/T55x7 tags.
2012-03-07 13:44:53 +00:00
W8M2Hg9lLmWqXSGC
713e7ffbc7
Added / modified SAK descriptions.
2012-02-05 09:30:08 +00:00
fnargwibble@gmail.com
ff2e9c1c81
Navigate one sample at a time in plot window and display grid size/status
2012-01-26 17:45:21 +00:00
fnargwibble@gmail.com
18856d8894
Navigate a page at a time in plot window
2012-01-23 17:57:42 +00:00
fnargwibble@gmail.com
3bc2349df1
Oops. Fix grid lock when zoomed in or out.
2012-01-21 14:32:39 +00:00
fnargwibble@gmail.com
7ddb990032
Add plot window keystroke help
...
Add grid display/lock commands to plot window
2012-01-21 13:32:54 +00:00
Merlokbr@gmail.com
23487cd23c
1. update SAK
...
2. ratte's fix. http://www.proxmark.org/forum/viewtopic.php?id=979
2011-11-04 12:35:00 +00:00
cex123@gmail.com
ec09b62d88
2011-10-15 15:15:49 +00:00
caioxmag
6c064e161c
small updates to hf mf restore1k
2011-09-19 12:58:58 +00:00
roel@libnfc.org
0f7f9edc14
fixed iso14443b snoop, plus compiling issue of redefined parameter, please take care about this next time before a commit
2011-09-06 10:28:22 +00:00
caioxmag
9d71094388
updates to function hf mf retore1k
2011-09-06 09:16:32 +00:00
roel@libnfc.org
e6b8c965bb
fix command-line issue generating core dump on OSX
2011-09-05 13:04:11 +00:00
roel@libnfc.org
245e844e80
fix temp changes
2011-09-05 11:48:08 +00:00
roel@libnfc.org
38c4979dae
fix compiling under MAC OSX
2011-09-05 11:44:45 +00:00
caioxmag
3d77fdfab5
Dump1k now writes keys to dumpdata.bin even when they are masked with zeroes in a read command
2011-09-02 08:33:45 +00:00
zveriu@gmail.com
1f947c4b09
- Added very basic scripting support to PM3 client-side (proxmark3 application)
...
- Created several scripts to aid in EML/MFD file conversion
- Created script which generates PM3-scripts for emulation based on MFD/EML input files
2011-09-01 09:03:20 +00:00
caioxmag
2115626711
Fixes to Mifare nested function...
2011-09-01 08:13:18 +00:00
caioxmag
5ff9150e3b
Corrected some errors from r487, WHICH I FORGOT TO COMMENT.
...
Log for r487 should have been:
"added hf mf dump1k and hf mf restore1k functions"
"modified hf mf nested function to add option to create dumpkeys.bin file from its output"
2011-08-31 07:09:50 +00:00
caioxmag
26fdb4ab49
2011-08-30 09:52:18 +00:00
Merlokbr@gmail.com
0014cb46da
1. emulator works. tested on ARC1302, NXP pegoda, touchtag, my firm's readers.
...
2. added increment, decrement, restore, transfer commands
3. fixed several small bugs and small code cleaning
4. there is strange behavier in the emulator: for 7BUID is seems that there is must be a feature that cam make work card withouth 2nd anticollision loop. NXP reader authenticates, but cant read card contents. all the rest readers works, BUT.... my 7BUID mifare card dont work AT ALL .... I dont know what i should do )
2011-06-25 13:03:01 +00:00
Merlokbr@gmail.com
51969283ec
1. fixed (it seems) readline behavior. Now there is no proxmark3 prompts on the data.
...
2. emulator goes into beta stage.
works:
- work with 4BUID and 7BUID dumps
- load/save/grab dumps
- emulate select
- emulate authentication (with nested)
- emulate read/write blocks
- emulate NACK-ACK ping-pong
2011-06-23 16:49:39 +00:00
Merlokbr@gmail.com
ab8b654efa
added functionality: dump card memory, save|load card memory.
...
50% fixed problem with readline lib
2011-06-22 01:25:16 +00:00
Merlokbr@gmail.com
8556b852ed
1. updated usb commands
...
2. added abilities to: clear, get, set, load from card, load from nested card emulator dump
3. tried to fix proxmark promt have seen everywhere (not so good)
4. reorganized arm code
2011-06-17 18:39:54 +00:00
Merlokbr@gmail.com
9ca155ba44
0. its alpha version!!!
...
1. commands changed from "hf 14a" to "hf mf"
2. some code cleaning and small bugfixes
3. alpha version hf mf sim
4. added internal function GetTickCount() for time measuring
2011-06-10 13:35:10 +00:00
Merlokbr@gmail.com
873014de8a
linux patch by Wil
...
http://www.proxmark.org/forum/profile.php?id=1639
2011-06-07 14:30:07 +00:00
Merlokbr@gmail.com
f397b5cc87
1. fixed hf 14a mifare. added functionality to ignore one Nt
...
2. completed hf 14a nested
3. added hf 14a chk to check keys
5. added check keys to hf 14a mifare and hf 14a nested
6. added debug level to mifare commands
7. small bugs and improvements
2011-06-07 12:35:52 +00:00
Merlokbr@gmail.com
50193c1e3e
1. small bugfix in hf 14a mifare
...
2. now in cmd hf 14a mifare - blinks LED_C
3. bugfix in readblock
2. bugfix in USB CommandReceived
3. small improvements
2011-06-01 14:12:11 +00:00
Merlokbr@gmail.com
f89c705002
improved version of "hf 14a mifare" command
...
with merge with utility nonce2key
2011-05-31 11:31:20 +00:00
Merlokbr@gmail.com
4abe4f5867
nested authentication works ok (tested)
...
and code cleaning
2011-05-26 15:20:03 +00:00
Merlokbr@gmail.com
20f9a2a1d5
1. Mifare read block command
...
2. Mifare read sector (via 1)
3. Mifare write block
4. fixed several bugs in iso 14443 select
added
Issue 23
Issue 26
2011-05-26 12:55:15 +00:00
dekoninggans@gmail.com
cee5a30d53
Added iClass eavesdrop support for Proxmark3
2011-05-18 12:33:32 +00:00
adam@algroup.co.uk
9455b51c2a
Issue 20 patch (refactored code of the iso15693 implementation as well as several enhancements) [Adrian Dabrowski "atrox"]
2010-10-19 14:25:17 +00:00
adam@algroup.co.uk
534983d735
iso14a reader patches [Hagen Fritsch]
2010-07-13 13:39:30 +00:00
adam@algroup.co.uk
7e758047e4
iso14a cleanup and implement RATS [Hagen Fritsch]
2010-06-26 08:24:21 +00:00
adam@algroup.co.uk
6c45a008f5
bring snooper into line with new command format
2010-06-26 08:22:42 +00:00
adam@algroup.co.uk
602ac4d7c5
multiple proxmark device support [Mohamed Elsabagh]
2010-05-14 11:04:28 +00:00
adam@algroup.co.uk
bd84638614
create target for binary file archive (linux version)
2010-05-09 12:17:42 +00:00
adam@algroup.co.uk
3612a8a8e2
legic write/simulate [Anon]
2010-05-06 11:24:01 +00:00
adam@algroup.co.uk
346ad5fbbb
Fix linux GUI crash [Hagen Fritsch]
2010-04-20 08:22:05 +00:00
ksjoberg
15cdabd474
Fix issue 14: mandemod and lf em4x em410xread crashes the proxmark3 client app
...
This fix is quick-and-dirty since it only reduces the amount of stackspace allocated by changing the data type of the array to uint8_t instead of the 32 bit integers. The reduced number of bits is OK since only (at most) 2 of the available bits are used in each element.
At least array bit utilization is improved from 6.66% to 25% :)
Large structures such as these should probably be malloc()ed.
2010-04-06 13:41:37 +00:00
adam@algroup.co.uk
23e5d20eed
strip trailing space in a more strictly correct place
2010-03-08 14:20:05 +00:00
adam@algroup.co.uk
9cb00f305c
move trailing space stripping to client/proxmark3.c (per discussion on r426)
2010-03-08 09:16:28 +00:00
adam@algroup.co.uk
fcdfc43e1f
strip trailing space(s) (may have been added by readline)
2010-03-07 15:25:48 +00:00
adam@algroup.co.uk
c6f1fb9dbd
revert command offsets now leading spaces have been stripped (thanks iZsh!)
2010-03-06 08:01:08 +00:00
izsh@fail0verflow.com
035303ac5f
client/cmdparser.c: Remove the leading spaces before calling the subparser. client/cmdlfhid.c: Modify accordingly.
2010-03-06 00:30:24 +00:00
adam@algroup.co.uk
f443ff3ebc
fix id offset in hid simulate
2010-03-05 23:39:07 +00:00
marcansoft
66d6ba7057
Get rid of flasher memory leak
...
Too bad the proxmark usb code still has a bajillion :(
2010-02-26 15:13:58 +00:00
marcansoft
0ae6234a5b
Remove remnant junk and TODO -> FIXME
2010-02-26 14:08:54 +00:00
marcansoft
8fe1a992c7
New flasher, much more paranoid and much more correct.
...
Knows how to merge segments to solve the "data overwrites last text
block" issue.
Removed "partition" stuff. Now it just flashes any elf file you pass,
though there's still a -b option required to explicitly enable flashing
the bootloader.
2010-02-26 14:03:43 +00:00
marcansoft
85f2819c8a
Add extra elf.h constants
2010-02-26 14:02:08 +00:00
marcansoft
4e3e51b612
Add beginnings of hopeful endian-independence
2010-02-26 14:01:51 +00:00
izsh@fail0verflow.com
212ef3a04d
Apply copyright patch from Michael Gernoth
2010-02-25 21:57:35 +00:00
izsh@fail0verflow.com
243dc69001
Fix memset warning
2010-02-24 20:47:32 +00:00
izsh@fail0verflow.com
9e13f87517
Fix a couple of warnings
2010-02-24 20:34:13 +00:00
izsh@fail0verflow.com
e3e96e56df
client/Makefile: Typo for Darwin
2010-02-24 20:33:55 +00:00
izsh@fail0verflow.com
8691f5b7bb
Fix QT compilation for Windows/MinGW and update the compilation instructions accordingly.
2010-02-24 19:33:29 +00:00
izsh@fail0verflow.com
9cc7c4b4d1
client/COMPILING: move to /COMPILING and add instructions to be able to compile the firmware as well.
2010-02-23 22:10:35 +00:00
izsh@fail0verflow.com
13bb3b4b11
client/COMPILING: Simplify dev. environment initial setup for Windows (WORK STILL IN PROGRESS)
2010-02-23 20:55:35 +00:00
izsh@fail0verflow.com
913d23c661
client/cmdlfem4x.c: Fix a warning about probable uninitialized variable with gcc 4.4
2010-02-23 20:52:50 +00:00
d18c7db
7b93d91671
Updated missing lib in ProxSpace
2010-02-22 03:54:44 +00:00
d18c7db
72de52ee7b
Updates for new MinGW ProxSpace environment
2010-02-22 01:56:15 +00:00
izsh@fail0verflow.com
fddf220a8b
Add -O3 on the client's side and fix yielding warnings
2010-02-21 20:01:56 +00:00
d18c7db
428ee1df57
Updated COMPILING
2010-02-21 07:45:59 +00:00
d18c7db
b97a3d994b
Windows specific instructions regarding the compile environment.
2010-02-21 06:54:43 +00:00
izsh@fail0verflow.com
62b1302c97
client/Makefile: Cosmestic changes.
2010-02-21 01:07:11 +00:00
izsh@fail0verflow.com
a553f26748
Add License/Copyright headers/notices. Please add your own copyright notice if you have made any nontrivial changes or additions to the code. There are several files without any attribution, currently.
2010-02-21 00:47:22 +00:00
izsh@fail0verflow.com
46cd40465a
/client/Makefile: Output object files to the obj subdir.
2010-02-21 00:16:42 +00:00
izsh@fail0verflow.com
4cd41f34ea
Removing windows specific code. Everything now compile and work the same for the three OS
2010-02-20 23:35:09 +00:00
izsh@fail0verflow.com
cbb03be993
Oops forgot a file
2010-02-20 00:38:24 +00:00
izsh@fail0verflow.com
91c38cf715
Fix windows compilation issues. But still not final. We should move to pthread and factorize the code with *nix). Ideally we should move to libusb-1.0 too.
2010-02-20 00:36:48 +00:00
d18c7db
3ec3a4724e
Removed hackish usb.h file, re-added Info.plist
2010-02-19 23:24:49 +00:00
d18c7db
baf39b0f16
Not a source code file
2010-02-18 08:32:41 +00:00
d18c7db
393c3ef933
Attempt at getting the windows client to at least compile without bombing out with errors, may not be fully usable, e.g. plot window doesn't come up, etc
2010-02-18 08:24:26 +00:00
adam@algroup.co.uk
fffad860fc
fix output inversion in mandemod
2010-02-15 21:15:52 +00:00
adam@algroup.co.uk
dbf444a179
missing parameter in 'threshold' command help
2010-02-08 22:02:18 +00:00
adam@algroup.co.uk
33984c6a82
fix 'data load' filename pointer
2010-02-08 17:37:02 +00:00
izsh@fail0verflow.com
8381984556
Cosmetic changes, replace mismatched indentation
2010-02-08 11:58:40 +00:00
adam@algroup.co.uk
5d5311a223
command parser shortcuts e.g. 'd p' will call 'data plot' (from rumpeltux)
2010-02-08 09:23:39 +00:00
adam@algroup.co.uk
590f8ff949
get rid of implicit declaration warnings
2010-02-07 00:31:32 +00:00
izsh@fail0verflow.com
5a956258d3
alphabet ;)
2010-02-06 18:24:22 +00:00
adam@algroup.co.uk
26aa7d73ad
damn that alphabet!
2010-02-06 18:11:49 +00:00
adam@algroup.co.uk
8d183c53b6
merge 'lfsamples' and 'hfsamples' into 'samples'
2010-02-06 18:06:31 +00:00
adam@algroup.co.uk
ab2fd3d68b
streamline CmdEM410xWatch
2010-02-06 18:05:05 +00:00
adam@algroup.co.uk
a2b1414f43
Andreas fix for LEGIC MIM1024
2010-02-06 09:43:33 +00:00
adam@algroup.co.uk
83a9b236fe
fix warning: implicit declaration of function ‘exit’
2010-02-06 09:33:17 +00:00
adam@algroup.co.uk
313322658c
FIXME: will crash if sample buffer does not contain valid legic data (fixed by Sourcerer)
2010-02-05 20:08:02 +00:00
izsh.f0f
41dab15305
Alphabetical order ;) And cosmetic changes (remove duplicated includes)
2010-02-05 17:16:14 +00:00
adam@algroup.co.uk
669c1b80c5
add LEGIC decoder (submitted by Sourcerer, untested by me)
2010-02-05 13:56:33 +00:00
izsh.f0f
535b5a59bd
Change -std=c99 to -std=gnu99 to be able to compile libusb-0.1.* which uses u_int*_t and PATH_MAX
2010-02-05 11:16:07 +00:00
adam@algroup.co.uk
c59c3405ec
wun day i'll lern my alfabet
2010-02-05 08:29:09 +00:00
adam@algroup.co.uk
8e220a9126
put legic back in the system and add rumpletux's fast legic / prng code from forum
2010-02-05 08:18:02 +00:00
izsh.f0f
040a7baad0
client/cmdparser.c: Cosmetic changes.
...
client/cmdlf.c: Add missing include for "WaitForResponse".
2010-02-05 01:06:53 +00:00
adam@algroup.co.uk
37239a7c4b
differentiate commands and sub-menus in help
2010-02-05 00:17:38 +00:00
adam@algroup.co.uk
bdd1de1b02
make LF sampling ACK to fix USB timing issue in em410xwatch
2010-02-04 23:15:53 +00:00
adam@algroup.co.uk
c37d2e7078
make parser slightly more user friendly (default to 'help')
2010-02-04 22:51:02 +00:00
izsh.f0f
7fe9b0b742
Client cleanup and restructuring. Stage 1...
...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 01:27:07 +00:00
adam@algroup.co.uk
6982ac2612
fix USB send data timing issue in CMD_DOWNLOADED_SIM_SAMPLES_125K
2010-01-29 09:28:47 +00:00
adam@algroup.co.uk
13a79da4e9
add 'losimman' command - simulate arbitrary Manchester encoded LF tags
2010-01-28 11:49:05 +00:00
bushing
cef938d883
fix a stack overflow in the flasher routine (my bad)
2010-01-27 09:25:37 +00:00
daniel.boteanu
044a375b95
Added offset feature to hexsamples command
2010-01-14 23:11:31 +00:00
d18c7db
815f3f2559
Decreased BigBuff mem, some elf flasher fixes (needs more work) but flashing correctly currently.
2010-01-10 03:57:41 +00:00
daniel.boteanu
1eb7596aad
Added hitune command for continuously measuring HF antenna tuning
2010-01-09 14:59:42 +00:00
bushing
8b576d2d31
first attempt at grouping commands into categories based on what I think they do
...
I could really use some help here, since I don't actually understand what every
command does :(
2010-01-07 04:39:12 +00:00
bushing
107ec6e4b5
fix broken formatting in command table
2010-01-07 04:09:27 +00:00
bushing
3210b50ec6
enable indalademod and vchipdemod in offline mode
2010-01-07 04:06:42 +00:00
izsh.f0f
b961ef035a
client/elf.h: Add missing Elf32_Phdr struct to compile under Mac OS X. client/flash.h: Add missing header ifndef.
2010-01-05 12:32:44 +00:00
bushing
2cab856f9f
removed support for s19 files in the flasher and replaced it
...
with elf parsing. can we stop specifying the "partition" yet?
2010-01-05 00:02:12 +00:00
bushing
6e4d4ee609
refactor flashing code into flash.h, so we can share it between platforms
2010-01-04 05:11:08 +00:00
d18c7db
1e1b303093
Fixed some compile warnings in client, minor tidy up with some dbprintf statements
2010-01-04 03:08:45 +00:00
bushing
f39c4119e0
Fix QT CXXFLAGS/LDFLAGS
2009-12-30 00:49:27 +00:00
roel@libnfc.org
fa03a110e9
mifare client update
2009-12-30 00:11:23 +00:00
henryk@ploetzli.ch
1d99b0df4a
Remove LEGIC RF tag emulation code since it's useless without keystream generator
2009-12-28 18:18:25 +00:00
roel@libnfc.org
249deb42a0
cleaning up endless copy-paste of trace functionality
2009-12-28 00:15:38 +00:00
bushing
5ed2c738ed
fix Mac build to use Qt framework
...
(e.g. http://get.qt.nokia.com/qt/source/qt-mac-cocoa-opensource-4.6.0.dmg )
2009-12-27 23:27:29 +00:00
henryk@ploetzli.ch
55a69489cd
Properly exit usb thread (e.g. on Ctrl-D)
2009-12-22 20:32:40 +00:00
bushing
59936251ff
remove some straggling files and fix paths in cockpit batch files
2009-12-22 13:05:32 +00:00
bushing
022c8791c1
fixes to make it work properly on the Mac
2009-12-22 12:54:24 +00:00
bushing
940a20122d
merge makefiles into one
2009-12-22 12:52:02 +00:00
bushing
f11f5c2738
fix target name for Windows compile
2009-12-22 12:47:10 +00:00
bushing
9b25560889
lean up event model so that this will work under OS X (and hopefully Linux)
...
still need to refactor some stuff -- lots of code duplication here that
we can get rid of
2009-12-22 12:46:04 +00:00
bushing
aa81a8d3f1
rename ReceiveCommandP -> ReceiveCommandPoll for consistency
2009-12-22 12:44:38 +00:00
bushing
a99c6a1921
There's no painless way to do this, but it needs to be done --
...
the only reason any of the Windows code was in CPP files was
because the MS compiler doesn't support C99. Switch to using
MinGW, and that problem goes away, so we can rename the files back.
2009-12-22 12:42:54 +00:00
bushing
a146075d74
remove most of the references to translate.h
2009-12-22 12:35:36 +00:00
bushing
3a8464f067
change usb_cmd struct to be more sane
...
wean ourselves off translate.h
2009-12-22 12:34:24 +00:00
bushing
cd00aa3043
merge linux and windows clients into one directory... will consolidate makefiles shortly
2009-12-22 12:11:15 +00:00
