Commit graph

1055 commits

Author SHA1 Message Date
marshmellow42 34e2af02a4 bug fix for hf iclass reader and iclass detection
memory locations in code are now accurate and the CC output is not
corrupted by the config's crc.

also the looping and flags for what to read are now correctly
implemented in the code.
2017-06-23 13:50:25 -04:00
marshmellow42 67e344df90 iclass - updates
clean up output
allow readblock without authenticating (can read blocks 0, 1, 2, 5
without authenticating.)
add Application Issuer Area to reader output and use it to attempt to
identify legacy vs NOT legacy.
2017-06-21 17:07:55 -04:00
marshmellow42 bf8243475b some coverity fixes plus fix fdx help (#328)
* coverity fixes

cmdhflegic- indications are the i in calls to data_buf[i] could = 1052
and overflow the array.
cmdhfmfhard - +1 to add space for string null terminator - should we add
the 0 terminator value too?
reveng.c - memory leak
util.c - fix potential overflow of array buf[]
util_posix.c - possible integer overflow

* fix help errors

* fix sprint_hex_ascii

again
and this function is not even used anywhere... yet...
2017-06-20 17:25:08 -05:00
Iceman 84ca27b33a BUG: 'hf mf mifare'
BUG: 'hf mf mifare' ,  wrongly identify success when faulty key is found
https://github.com/Proxmark/proxmark3/issues/320
2017-06-16 14:43:53 +02:00
marshmellow42 e5a15888b6 Merge pull request #319 from Proxmark/iceman1001-patch-2
bug:  hf mf chk - wrong size
2017-06-13 17:23:24 -04:00
Iceman 1e11e5d762 bug: hf mf chk - wrong size
bug:  'hf mf chk' - size of keycounter variable is too small for dictionary files larger than 256rows.
2017-06-12 15:07:00 +02:00
Iceman 4419118038 bug; Check keys params
CMD_MIFARE_CHKKEYS command has a different arg1, arg2 meaning nowdays.
Arg0  =  keytype << 8 | blockno 
arg1  = clear trace

In lua its name arg1, probably with lua's startindex is 1...
2017-06-12 12:21:01 +02:00
Iceman 8040afa5ba Merge pull request #315 from marshmellow42/master
fix compile issues on OS X 10.11
2017-06-09 15:50:55 +02:00
marshmellow42 087c8bf330 fix compile issues on OS X 10.11
OSX 10.11 does not have clock_gettime()
clang <= 8.0.0 has a bug in __builtin_cpu_supports() and it doesn't
function.
see https://llvm.org/bugs/show_bug.cgi?id=25510
2017-06-08 17:07:14 -04:00
pwpiwi eabbb166f0 Add two missing bitflip state tables. Update .gitignore 2017-06-08 15:32:24 +02:00
pwpiwi c3d117a8a1 fix MacOS compile errors by replacing memalign() with posix_memalign() 2017-06-08 08:26:20 +02:00
pwpiwi ec9c71129f Fix compile errors with MacOS (#312)
* Fix compile errors with MacOS
- _POSIX_C_SOURCE must not be defined for num_CPU()

* separate util_posix.c require changes in tools directory as well

* remove unnecessary self-include
2017-06-07 22:35:20 +02:00
Iceman 6b6aafabcf Merge pull request #311 from marshmellow42/master
a few coverity scan bug fixes
2017-06-07 22:31:52 +02:00
marshmellow42 2c51d4cfa6 remove warning about non-static init...
warning was: non-static data member initializers only available with
-std=c++11 or -std=gnu++11
2017-06-07 15:42:28 -04:00
marshmellow42 5dd5bfb268 attempt to fix compile error gcc lt 4.9 (#306) 2017-06-07 07:36:22 +02:00
marshmellow42 dab1c6f5e9 lf presco help and command loop !=
thanks to @iceman1001 for noticing.
2017-06-06 13:30:06 -04:00
marshmellow42 ebf93643fa allow hex input again to lf presco 2017-06-06 13:12:25 -04:00
marshmellow42 b4810303f5 needs a ; ... ...
...
2017-06-06 12:57:11 -04:00
marshmellow42 e57c8b2e56 more coverity fixes
plus fix some spacing in functions i touched.
2017-06-06 12:45:00 -04:00
pwpiwi af7a1f7004 fix compile errors on non-Intel CPUs:
- client/Makefile: don't compile for different SIMD instruction sets if non-Intel
- hardnested cores: provide non-SIMD versions of core functions
2017-06-06 18:38:07 +02:00
marshmellow42 3d542a3dfa coverity scan bug fixes
mfu keyNo buffer overflow
mf reader attack key count reduced to not overrun c.d.asBytes buffer.
2017-06-06 12:12:18 -04:00
marshmellow42 c2ca50419d Merge pull request #302 from pwpiwi/fix_QtThreads
fixing the crash on exit (issue #284)
2017-06-04 19:53:28 -04:00
pwpiwi 5acd195d0f fixing the crash on exit 2017-06-04 09:30:49 +02:00
marshmellow42 e5baf1ef79 adjust hardnested compiler fix to accurate version
avx512f is only available in gcc 5.3 and above.
2017-06-02 00:17:57 -04:00
marshmellow42 f950ce1cb9 make hardnested compile on gcc 4.9.2
plus add Td to gitignore.
2017-06-01 23:08:01 -04:00
pwpiwi 1985eb7cbd Fix client Makefile 2017-05-31 08:27:08 +02:00
pwpiwi c48c4d7856 New: implementing hf mf hardnested
This implements the attack described in
	Carlo Meijer, Roel Verdult, "Ciphertext-only Cryptanalysis on Hardened
	Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on
	Computer and Communications Security, 2015
It uses precomputed tables for many bitflip properties (not only two as in the paper)
and is therefore quite efficient. To prevent failing it doesn't do
differential analysis with several nonce bytes' Sum(a8) properties (each of them
may be wrongly guessed) - instead it concentrates on one nonce byte and tries all
Sum(a8) property guesses sequentially (ordered by probability). The brute force phase
makes use of aczid's bit sliced brute forcer (https://github.com/aczid/crypto1_bs).
Includes runtime CPU-detection to leverage modern (and old) SIMD instructions
with a single executable.
2017-05-31 07:30:56 +02:00
patrickdk b8208bda88 Add needed header files to proxguiqt 2017-04-28 11:14:03 -04:00
pwpiwi f9e2c24b01 reenable build in old proxspace environment (#286)
* reenable build in old proxspace environment
(use -std=c++11 and -fPIC options for Qt5 only)

* fixing the fix...
2017-04-24 18:33:55 +02:00
marshmellow42 ebcc86a2fa Merge pull request #281 from brianredbeard/lf-script
contrib: LF Programming script
2017-04-20 13:17:29 -04:00
pwpiwi b62b5e2527 Merge pull request #277 from pwpiwi/clang_warnings
fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c)
2017-04-19 18:11:46 +02:00
marshmellow42 3759e8a02d Remove built file 2017-04-18 23:59:40 -04:00
marshmellow42 3fc4596f2c fix makefile to allow make of overlays.ui
to ui_overlays.h
add ui_overlays.h to .gitignore
should now compile to whatever qt version you have. (as long as it is
compatible with the overlays.ui file...)
2017-04-18 23:41:38 -04:00
Brian 'Redbeard' Harrington 79b19c5f90 contrib: LF Programming script
Submitting a well documented Lua script whose purpose is to do
bulk, repeated, sequential programming of RFID tags.  Could be useful
for users of the ACCX Open Access 4.0 or other simple RFID systems.

Tags programmed with this would potentially be vulnerabile to bisection
attacks, etc... But honestly, they likely would have been anyway.

To use run from within the proxmark3 client:

```
proxmark3> script run lf_bulk_program.lua  -b 1000 -c 5 -f 23
--- Executing: lf_bulk_program.lua, args '-b 1000 -c 5 -f 23'
Press enter to program card 1000:23 (hex: 0020042e07d1)

Cloning tag with ID 20042e07d1
Press enter to program card 1001:23 (hex: 0020042e07d2)

Cloning tag with ID 20042e07d2
Press enter to program card 1002:23 (hex: 0020042e07d4)

Cloning tag with ID 20042e07d4
Press enter to program card 1003:23 (hex: 0020042e07d7)

Cloning tag with ID 20042e07d7
Press enter to program card 1004:23 (hex: 0020042e07d8)

Cloning tag with ID 20042e07d8

-----Finished
```
2017-04-18 11:56:21 -07:00
marshmellow42 3fd7fce4ac new grid X offset calcs to fix some issues
also fixed a save_restore issue with grid alignments
now save_restoreGB() saves/restores offset values
added macro enumeration of SAVE vs RESTORE for save_restore commands.
2017-04-17 18:37:23 -04:00
marshmellow42 999d57c201 fix y grid +
and move em4x50 saveGB to allow graph restore after lf search
clean up plotgraph unused code.
should be done for a bit...
2017-04-16 00:26:26 -04:00
marshmellow42 537f80f2c8 adjust lf search to not use save/restore if...
offline or '1' entered
this allows the graph restore button to continue functioning after a `lf
search 1`
2017-04-15 21:40:05 -04:00
marshmellow42 1c70664ae7 finish FSK graph index changes 2017-04-15 16:18:54 -04:00
marshmellow42 b760f0ffd8 cannot seem to get uic to work for ...
... different qt versions in the make file correctly...
so, make the ui_overlays.h file version generic.  maybe...
2017-04-15 13:40:49 -04:00
marshmellow42 2c441f573c attempt ui_overlays.h qt4 version 2017-04-15 13:12:56 -04:00
marshmellow42 27882d378b add uic make ui_overlays.h
to makefile
2017-04-14 10:31:00 -04:00
marshmellow42 1a3c006469 maybe fixed loading/unloading bug. 2017-04-14 09:53:36 -04:00
marshmellow42 c4809fd411 Merge branch 'graphwork2' into graphwork 2017-04-13 17:24:33 -04:00
marshmellow42 f516ff0895 a few notation fixes 2017-04-13 17:16:34 -04:00
marshmellow42 c4f51073fc combine autocorr, dirth functions
fix lfdemod bug
add askedge to overlays (remove askdemod)
2017-04-13 10:33:18 -04:00
marshmellow42 9fe4507c03 update more demods for graphing
still todo fsk based tag demods (like HID, AWID, IO, Pyramid...)
2017-04-12 17:55:31 -04:00
marshmellow42 b8fdac9e6f apply @holiman s graph changes +
add demod data to graph.
some bugs are known:
if you close the graph window data plot will not bring it back.
exiting the application without closing the widget form results in
error.
autocorrect graph y labels are ugly
form has old askdemod tab.
sticky button purpose not defined/labeled well.
doesn't clear s_Buff when new graph loaded or sampled.
probably more...
2017-04-12 14:35:07 -04:00
marshmellow42 bb4e6dbd62 align clock grid with demods on graph (#276)
* align clock grid with demods on graph

* proper initialized values
2017-04-12 05:48:49 +02:00
marshmellow42 3fe7103959 proper initialized values 2017-04-11 21:51:31 -04:00
pwpiwi 31a29271b9 fix clang compiler warnings (including fixing a bug revealed in cmdhftopaz.c) 2017-04-11 18:55:33 +02:00