RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-19 14:42:22 +08:00
Code Issues Projects Releases Packages Wiki Activity
4781 commits 3 branches 15 tags 86 MiB
Commit graph

475 commits

Author SHA1 Message Date
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
c583570a3d minor styleish 2017-08-06 16:31:01 +02:00
iceman1001
0acc606be3 lf search is working :) 2017-07-31 12:31:39 +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
bf5b7e2d91 coverity scan, uninitialized vars. 
removed crapto1.
 2017-07-30 10:33:40 +02:00
iceman1001
f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
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
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
iceman1001
1d5464397c ADD: first try to implement crc-16 for Legic Advant *not working yet* Can't verify it. 2016-02-16 10:44:12 +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
6bb7609cad CHG: had to move the SwapBits method. 2016-02-12 16:19:18 +01:00
iceman1001
6b6815bccb CHG: extracted a #define for the crc16 poly 2016-02-12 12:34:54 +01:00
iceman1001
ee4e281675 FIX: legic_prng.c according to user on forum ref: http://www.proxmark.org/forum/viewtopic.php?pid=5437#p5437 needs to be "& 0x7F" 
ADD:  method for calculating the storage crc8.
 2016-02-12 12:34:05 +01:00
iceman1001
a11ca2f305 FIX: @wllm-rbnt 's typo fixes 2016-02-12 07:37:10 +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
iceman1001
089d061f2d CHG: Extracted @piwi's bucketsort into separate files under /common 2016-02-10 13:09:33 +01:00
iceman1001
b351374ca8 CHG: Reversed @piwi 's changes to parity. I'm getting assembler compiler errors. 2016-01-16 23:05:21 +01:00
iceman1001
a531720ae6 added @pwpiwi 's latest changes to "hf mf hardnested" 2016-01-03 17:16:50 +01:00
iceman1001
08e11f0a90 REM: removed an offensive #include on archlinux. Compiles on mingw without. 2015-12-23 23:26:03 +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
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
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
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
8ce3e4b4e9 add: missing two hard_nested files.. 2015-12-02 16:48:25 +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
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
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
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
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
857bc2ff6a CHG: some desfire changes from @bforbort fork. *untested* 2015-10-30 09:09:35 +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
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
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
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
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
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
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
9783989b40 ADD: pwpiwi 's FPGA compress 2015-06-25 12:22:34 +02:00
iceman1001
569009f3f7 ADD: @pwpiwi 's fix 50365fedcb 2015-06-18 13:51:00 +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
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
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
ea75b30c81 ADD: SHA1 hashes calculations in sha1.c and LUA 2015-05-26 16:12:33 +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
a98b05b71d missed file in previous commit... 
duh...
 2015-05-19 15:03:35 -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
2c39c25c67 Minor clean ups 2015-05-13 09:06:47 +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
iceman1001
7d010c4991 chg: minor spelling change from MIFARE_ULEV1_VERS -> MIFARE_ULEV1_VERSION 2015-05-05 00:37:13 +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
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
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
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
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
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
7a2029ec7c ADD: some changes from Marshmellow 2015-04-01 17:54:19 +02:00
pwpiwi
f83c41c75b Merge pull request #89 from pwpiwi/image_shrink 
Reclaim more than 19K of ARM flash memory.
 2015-03-31 22:57:33 +02:00
pwpiwi
7009555e44 temporarily revert lfdemod float removal 2015-03-31 21:38:58 +02:00
marshmellow42
75cbbe9a69 remove floats per piwi 2015-03-31 10:49:06 -04:00
pwpiwi
e335ca2846 Reclaim more than 19K of ARM flash memory. 
- added compiler options -fdata-sections and -ffunction-sections (thanks to iceman for the hint)
- removed float operations from common/lfdemod.c to avoid adding float libraries to the ARM os image
- moved the fpga images to the data section to avoid reserving unused space for a separate section
 2015-03-31 08:07:26 +02: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
7c99b4f782 CHG: Added the parameters -fdata-sections -ffunction-sections to common/Makefile.common for making the .elf filesize smaller. 
REF: https://github.com/Proxmark/proxmark3/issues/83
 2015-03-30 16:27:07 +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
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
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
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
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
b1db38e1b7 ADD: piwi's compiler flags -O2 2015-03-18 20:29:58 +01:00
iceman1001
a087e9cf40 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-16 14:02:08 +01:00
marshmellow42
2147c30778 FIX EM Error 
missed two files for last push..  sorry
 2015-03-16 08:39:18 -04: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
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
marshmellow42
e74fc2ecba give credit where credit is due 
thanks iceman for the crc :)
 2015-03-13 14:00:11 -04:00
marshmellow42
5279085ae7 Merge remote-tracking branch 'upstream/master' 2015-03-13 11:20:00 -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
a8cd503dd5 FIX: @marshmellow found out that the CRC-8/Maxim was not always giving the right checksum. Change POLY from 0x31 -> 0x8C 2015-03-12 20:33:36 +01:00
iceman1001
83a42ef965 FIX: move and rename the CRC8Maxim method into crc.c 2015-03-12 14:12:14 +01:00