Commit graph

1076 commits

Author SHA1 Message Date
Fl0-0
cea3dc4e9e Fix typo in helps 2017-07-03 09:16:28 +02:00
Fl0-0
e8e2cfd0f1 missing a c in the helptext sample 2017-07-03 08:56:36 +02:00
Fl0-0
2ed09d15e4 Merge remote-tracking branch 'upstream/master' 2017-07-02 17:54:35 +02:00
Fl0-0
c109ac9f65 Identation fix 2017-07-01 22:36:49 +02:00
Fl0-0
634a55aa17 Identation fix 2017-07-01 22:35:49 +02:00
Fl0-0
f800241260 Identation 2017-07-01 22:32:49 +02:00
Fl0-0
553bbf59b6 Use param_get32ex() and add c for clock parameter 2017-07-01 22:31:06 +02:00
Iceman
138927dd7b Merge pull request #345 from pwpiwi/hardnested_compress
hardnested: dramatically reduce required disk space for tables
2017-07-01 21:22:55 +02:00
Fl0-0
2e39af0739 Fix typo error 2017-07-01 19:49:02 +02:00
root
539337a7d2 EM410x bruteforcing changes: Load the whole file at once, pause delay as parameter, stop the execution on key press and EM410x conversion to signal function. 2017-07-01 17:53:06 +02:00
root
30e37e973d Merge remote-tracking branch 'upstream/master' 2017-07-01 13:57:30 +02:00
Iceman
1cbb352b71 Merge pull request #344 from pwpiwi/RasPi_fix
Fix issue #342
2017-07-01 08:08:45 +02:00
pwpiwi
4fed4488b1 Fix issue #342 2017-06-30 20:27:38 +02:00
Fl0-0
1ccba0b91b Indentation fix 2017-06-30 14:50:32 +02:00
Fl0-0
47af8c5fa9 Add EM410x bruteforcing error checks 2017-06-30 10:00:03 +02:00
Fl0-0
50acfd37e2 Add EM410x bruteforcing function by simulating EM410x tags (1 UID/s) 2017-06-30 09:17:31 +02:00
pwpiwi
7f9e4c257f hardnested: reduce disk space for tables (by > 700MBytes) and other minor changes
- compress tables
- minor changes to progress reporting
- free memory on aborts (@iceman1001)
2017-06-30 08:48:37 +02:00
marshmellow42
82e8eee62d Merge pull request #333 from micolous/osx-libedit
OSX: Disable GNU readline-specific hack when libedit is used (fixes #110)
2017-06-30 00:22:55 -04:00
Iceman
2a7861ef0a Update cmdhf14a.c
need include to detection function
2017-06-26 21:58:03 +02:00
Michael Farrell
ed50f7f327 OSX: Disable GNU readline-specific hack when libedit is used (fixes #110) 2017-06-25 12:26:33 +10:00
Iceman
7f2114d845 Update cmdhfmfu.c (#332)
* Update cmdhfmfu.c

CHG:
   removed sniffed keys,  amiibo pwd gen algo is known.
   'hf mfu rdbl' - header output aligned
  'hf mfu dump' - header output aligned

* Update cmdhfmfu.c

chg: adjusted KEYS_PWD_COUNT accordingly
2017-06-24 11:54:42 +02:00
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