egon2
37a71c7a96
fixes #85
2017-03-05 16:19:26 +00:00
iceman1001
91e9295761
FIX: had to make it clientside only
2017-03-03 12:27:35 +01:00
iceman1001
88e7a6bfa7
FIX: travisCI complains. dummy -> dummy_sgc.
2017-03-03 12:24:02 +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
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
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
c24364a8a4
FIX: @marshmellow42 's ST detection fix.
...
FIX: lfops.c and em4x05 command timings.
2017-02-28 19:20:12 +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
5215a87442
CHG: @Marshmellow42 's fixes. ref: e88096ba25
2017-02-24 01:14:47 +01:00
iceman1001
8ad1e731c8
chg: @marshmellow42 's changes.
2017-02-23 00:52:40 +01:00
iceman1001
9c624f67b3
chg: @piwi's code cleanup and some more.
...
ref: 43534cbad2
2017-02-23 00:03:10 +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
4ac9f07840
CHG: lf em - added @marshmellow42 's changes
2017-02-19 00:12:35 +01:00
iceman1001
1a4b907335
CHG: some minor changes from @marshmellow42
2017-02-16 21:44:25 +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
e977fb0da3
syntax sugar
2017-02-13 15:33:26 +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
ed55e9aec4
chg: trying to generalize the EMV build.
2017-02-13 11:05:03 +01:00
iceman1001
5f5b83b743
ADD: 'lf cotag read' - COTAG can be read now.
2017-02-02 15:32:21 +01:00
iceman1001
e99acd00cc
CHG: the mifare Auth command can make use of a random nonce aswell.
...
CHG: since sim commands are timing critical, I'm testing a smaller prand prng function from Intel
2017-01-29 10:41:48 +01:00
iceman1001
fbed30e8c9
chg: lets not have it static, since I get the same nonce in the same session over again.
2017-01-26 15:54:12 +01:00
iceman1001
bf5d7992ce
ADD: @micolous random nonce, adjusted to fit in. Icemanfork only uses Moebius attack, so no need for an extra parameter in client.
...
ref: https://github.com/Proxmark/proxmark3/pull/209
2017-01-26 14:21:51 +01:00
iceman1001
e36b07efc4
CHG: moved into header files.
2017-01-25 00:35:11 +01:00
iceman1001
7d2692658b
CHG: 'lf noralsy read' - new STT doesn't need so many bits.
2017-01-20 22:20:47 +01:00
iceman1001
371a40bf3e
CHG: 'lf visa2000 read' - with new STT, the need to find 192bits is not neeeded.
2017-01-20 22:18:09 +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
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
81e82dfe51
syntax sugar
2017-01-18 22:56:55 +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
d3fd5fd6d8
CHG: unused variables and remove of compiler warnings.
2017-01-16 15:00:40 +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
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
deba67ab57
CHG: cleaning up stuff
2017-01-03 01:20:03 +01:00
iceman1001
c08c796e8d
CHG: enhanced the debug output for some LF demod/decode
2016-12-16 12:04:37 +01:00
iceman1001
207fc33a42
ADD: a Noralsy detection, looking for preamble 0xBB0
2016-12-15 15:50:12 +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
5daad82660
ADD: Visa2000 demod
2016-12-14 23:23:53 +01:00
iceman1001
50282b85e4
CHG: syntaxt suger
2016-12-09 14:39:34 +01:00
iceman1001
6804338201
FIX: 'LF PYRAMID' the crc8_MAXIM and crc16_DNP was calling the wrong crc method. (update2 is the older and correct version). This solves the pyrmid issue with wrong checksums calculated.
...
Thanks to @rookieatall @marshmellow42 for pointing out the bug. ref: http://www.proxmark.org/forum/viewtopic.php?id=4006
2016-11-14 21:41:18 +01:00
iceman1001
2dcf60f3df
CHG: "hf mf hardnested" - less printing
...
CHG: some filehandles = NULL.
2016-10-21 16:06:53 +02:00
iceman1001
da1f16d6ef
CHG: increased debug output for Em410x
2016-10-16 21:50:41 +02:00
iceman1001
2f6df13cf7
CHG; syntax suger
2016-10-10 21:54:26 +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
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
44d9c722f0
CHG: Patch for making PM3 compatible to MCU's CDC-Host libraries Thanks to @cjbrigato to tweak the cdc imp.
...
https://gist.github.com/cjbrigato/ef7fc18119f7c4900efbbef9bda0eb0f
2016-10-03 08:03:47 +02:00
iceman1001
cb7902cdcd
CHG: removed some debug data
...
CHG: reverted back to old crc imp.
2016-09-29 14:46:12 +02:00
iceman1001
b7e8338d2b
FIX: forgot I removed some other stuff
2016-09-29 12:29:42 +02:00
iceman1001
a39944216d
CHG: a select_legic function with structs and stuff and
2016-09-29 12:23:09 +02:00
iceman1001
11dee3d5a6
CHG; the devil is in the details
2016-09-26 21:53:51 +02:00
iceman1001
3c6542087e
CHG: @ikarus23 removed all missleadning warnings for GCC6.1.1.
2016-09-26 21:38:19 +02:00
iceman1001
62577a62ae
FIX: Much of my added extra legic code is commented away now.
...
FIX: the gcc6.1.1 warning broke my gcc 4.8.4 build env..
2016-09-26 20:21:31 +02:00
iceman1001
fada2feaf7
ADD: @ikarus / @pwpiwi solution to stop treating GCC 6.1.1 warnings like errors. Should compile fine now on GCC6.1.1
2016-09-26 20:02:40 +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
06c185d020
FIX: could be a problem, when not using parnethesis around inparams in #define.
2016-09-26 12:30:34 +02:00
iceman1001
337f703662
FIX: "indent" warns about this one.
2016-09-26 12:29:24 +02:00
iceman1001
93b7aa8f88
ADD; added some more descriptions of what the legic prng imp does.
2016-09-23 21:29:34 +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
87342aadbc
CHG: adjusted timing according to @sentinel 's traces
2016-09-14 16:18:04 +02:00
René Werner
1cb9b2a3cf
used tabs instead of spaces
2016-09-13 21:04:13 +02:00
René Werner
78f59945a7
fixed indentation to get rid of warnings
...
warnings are treated as errors, so a warning due to misleading
indentation is kinda annoying
2016-09-13 20:57:25 +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
e619ddc071
FIX: Better legic annotation, show which byte was targeted during read and write commands.
2016-09-03 12:20:12 +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
5735cfa58e
FIX: added a sanity check in preamble search to make sure it doesn't look out-of-bounds in the memcmp call
2016-09-01 20:34:56 +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
a2101157f7
FIX: Better udp_csr handeling. Usb messages gets to the device better, which makes "lf awid bruteforce" work :)
2016-08-26 16:22:56 +02:00
iceman1001
a1ab594e24
CHG: change the number of calls to prng_successor was done. Fewer should mean faster :)
2016-08-24 12:35:24 +02:00
iceman1001
7e08450dcc
add: annotage Mifare Desfire. from 3102c1bae3 (diff-93cfa90a992ea759349344d0de98029e)
...
Thanks @johannesStoye
2016-08-14 16:29:39 +02:00
iceman1001
82e690f48b
CHG: trying to unify the crc algos in one place.
2016-08-04 21:52:32 +02:00
iceman1001
b1013281d3
minor textual fix
2016-07-31 22:01:40 +02:00
iceman1001
a41d3dbb90
ADD: started to rework the wiegand converting. Extracted it from the 'lf hid' file. Looks decent but still needs work.
2016-07-31 21:58:15 +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
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
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
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
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
0cbe0cb8d6
chg: changed comment
2016-07-07 02:13:02 +02:00
iceman1001
9686a8d4d5
@marshmellow42 's fix askAMP 16ea2b8ca3
2016-06-20 13:21:36 +02:00
iceman1001
15d49e8285
CHG: NEDAP, changed back the preamble. With new parity check it has a decent detection.
2016-05-04 10:35:10 +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
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
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
ad493abc2a
CHG: changed to the new flasher command.
2016-04-21 10:32:06 +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
9358e49641
ADD: triplesized UID
...
ADD: ACK, NACK, defines from mifareutil.h
2016-04-14 11:38:16 +02:00
iceman1001
f3782960fa
syntax cleaning.
2016-03-21 22:09:04 +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
7fa7e812fc
ADD: added @marshmellow42 's changes to "lfdemod"
2016-03-20 19:39:06 +01:00
iceman1001
9206d3b034
ADD: copied all EMV files from peter filmoores fork. Have not started with making it work in current fork. (a lot of work)
2016-03-20 19:37:29 +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
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
ff4ff94b25
DEL: Removed old comment, after I've been compiling and testing all -W parameters in it. Didn't find any new warnings. Which is good.
2016-03-01 06:58:32 +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
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
cd0bed3c98
FIX: textual fix
2016-02-22 17:51:07 +01:00
iceman1001
0516439959
ADD: Added @marshmellow42 's new ST (sequence terminator detection)
2016-02-19 22:30:19 +01:00
iceman1001
07f970aad7
chg: ego credits....one of these days I'll remove 'em
2016-02-18 17:48:17 +01:00
