RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 03:03:14 +08:00
Code Issues Projects Releases Packages Wiki Activity
2742 commits 3 branches 15 tags 87 MiB
Commit graph

2742 commits

This branch
This branch
All branches
Author SHA1 Message Date
iceman1001
1bfbe92a53 FIX: coverity scan found some bugs in EMV code. These are the fixes to: 
-CID 141293 - missing va_end call
  -CID 141290 - return var not always given a value
  -CID 141289 - array out of bounds write. off by one.
  -CID 141288 - dead code because of CID 141287
  -CID 141287 - wrong mask
  -CID 141286 - wrong mask value
 2017-02-15 02:44:34 +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
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
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
ed55e9aec4 chg: trying to generalize the EMV build. 2017-02-13 11:05:03 +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
b1d615df78 updated some sections. 2017-02-07 22:56:41 +01:00
iceman1001
479ca8aa00 updated 2017-02-07 22:51:47 +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
27c24773ca updated 2017-02-06 14:22:05 +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
1903696e2a chg: uncomment -DWITH EMV to compile for EMV. 2017-02-06 00:57:31 +01:00
iceman1001
60ca588725 syntax sugar 2017-02-06 00:51:06 +01:00
iceman1001
d627a2fd8c FIX: commented code screws up notepad++ groupings. 2017-02-06 00:50:37 +01:00
iceman1001
a32e8034e0 FIX: get rid of de-referecing pointer warnings. 2017-02-06 00:49:32 +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
d760c7b3d9 FIX: 'standalone_14a mode' - cleaned up the standalone14a mode code. It now detects and simulates 4,7byte uids, like it should. code refactored to be easier to understand. 2017-02-01 14:09:26 +01:00
iceman1001
16cfceb689 CHG: rename a local scope variable "data"->"cmd" 
CHG: call params to selectcard too few
CHG: 'standalone HF mode' - when copying second UID onto data array,  it should append after first one, not over the first one.
ref: https://github.com/iceman1001/proxmark3/issues/77    Lets see if this fixes the HF part of this issue
 2017-02-01 12:50:54 +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
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
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