Commit graph

318 commits

Author SHA1 Message Date
iceman1001 a797314dab more adaptations 2017-07-27 22:05: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 f942e1ed05 ADD: CRC8Mad() should be used to calc the crc-8 byte for Mifare MAD config block. Doesn't work of course...
CHG: some T/F defines..
2017-07-27 09:31:23 +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 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 213883a931 FIX: 'hf iclass reader' - now correctly identifes crypt-fuses configuration
ADD: 'hf iclass reader' - now prints OTP value
2017-07-05 11:21:38 +02:00
iceman1001 cb7ececdce FIX: updates to usb_cdc.c , starting with the MSOS features :) 2017-07-04 20:07:45 +02:00
Iceman d59026518e FIX: fullimage.s19
According to @doegox  the *.s19 file is generated with wrong offset for the data section.
ref:  http://wiki.yobi.be/wiki/Proxmark#Flashing_full_image.2C_take_1
2017-05-29 09:39:25 +02:00
Iceman 489e735f86 Update Makefile.common
chg:  disabling 512kb flashing since it has issues with the flasher code.  Might enable it later on.
2017-04-26 21:32:42 +02: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
iceman1001 dfcf20d641 FIX: Coverity Scan fixes to emvcmd.c among others.
FIX: emclearmem bug.
2017-03-05 18:43:06 +01:00
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