RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-11 10:14:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
2753 commits 3 branches 14 tags 86 MiB
Commit graph

1740 commits

Author SHA1 Message Date
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