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
2914 commits 3 branches 14 tags 86 MiB
Commit graph

2914 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
4b555c8dc0 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2017-02-19 00:13:44 +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
Iceman
d06c81b7c8 Update README.md 2017-02-18 21:58:32 +01:00
Iceman
fd056682e0 Update README.md 2017-02-18 21:55:24 +01:00
Iceman
abf3b8af8e Update README.md 
removed some gcc-armi.. it can now be installed with apt-get :)  
added the  "add user to dialout group" instruction.
 2017-02-18 21:54:26 +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
Iceman
5381b6fed5 Merge pull request #81 from mdp/fixguard 
Fix args number and example for guard
 2017-02-17 07:47:09 +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
c930078036 FIX: wrong variable name. 2017-02-15 02:46:09 +01:00
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