Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-02-25 08:05:04 +08:00
Code Issues Projects Releases Packages Wiki Activity
1765 commits 3 branches 11 tags 34 MiB
Commit graph

1765 commits

This branch
This branch
All branches
Author SHA1 Message Date
Iceman
d8e61a3004 Update aes.c (#336) 
FIX:  coverity scan - improper use of sizeof
 2017-06-26 00:52:09 +02: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
Iceman
b4d321bbf3 Merge pull request #330 from marshmellow42/master 
bug fix for hf iclass reader and iclass detection
 2017-06-23 20:25:51 +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
Iceman
c0a2ae50da Merge pull request #329 from marshmellow42/master 
iclass - updates
 2017-06-22 01:13:07 +02: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
marshmellow42
58c00ce7fc Merge pull request #322 from Proxmark/iceman1001-patch-2 
Update 77-mm-usb-device-blacklist.rules
 2017-06-19 09:01:44 -04:00
marshmellow42
0c29544f64 Merge pull request #321 from Proxmark/iceman1001-patch-1 
BUG: 'hf mf mifare'
 2017-06-16 14:46:50 -04:00
Iceman
513c6c98af Update 77-mm-usb-device-blacklist.rules 
fix: updated the blacklist rules file with the updated usb_cdc vid/pid values
 2017-06-16 19:48:18 +02: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
marshmellow42
0efcb69128 Merge pull request #317 from Proxmark/iceman1001-patch-1 
bug;  Check keys params
 2017-06-13 17:22:44 -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
Iceman
3e7df26213 updated onlineshops 
Updated the onlineshops,   same info here as on www.proxmark.org  order page. 
Two have been removed because of bad reviews and no lifesign.
 2017-06-09 09:59:30 +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
b63bd049fc Update CHANGELOG.md to release 3.0.1 2017-06-08 14:18:25 +02:00
Iceman
9a15745577 Merge pull request #313 from pwpiwi/fix_memalign 
fix MacOS compile errors by replacing memalign() with posix_memalign()
 2017-06-08 09:40:57 +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
pwpiwi
f9a12dfac2 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2017-06-07 22:32:41 +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
pwpiwi
59d86bafb7 Updated CHANGELOG to new release 3.0.0 2017-06-07 22:31:15 +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
Iceman
d4625ea408 Merge pull request #304 from pwpiwi/fix_nethunter 
fix compile errors on non-Intel CPUs (issue #303)
 2017-06-06 22:13:10 +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
Iceman
a4a6780efe Merge pull request #301 from marshmellow42/master 
make hardnested compile on gcc 4.9.2
 2017-06-02 09:20:51 +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
8224307338 Updated CHANGELOG.md 2017-06-01 15:38:00 +02:00
Iceman
c7b2751136 Merge pull request #297 from pwpiwi/hardnested 
Implement hf mf hardnested
 2017-06-01 14:34:43 +02:00
Gator96100
43c3b944e4 fix wrong vid & pid values (#298) 2017-05-31 21:40:27 +02: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
ikarus
c87c452120 Fix increment on bool variable (#294) 2017-05-26 11:26:27 +02:00
pwpiwi
b535053a77 fix hf 15 commands (#293) 2017-05-26 07:10:30 +02:00
marshmellow42
a5eb7820a5 Merge pull request #289 from patrickdk77/master 
Add needed header files to proxguiqt
 2017-04-28 12:25:10 -04:00
patrickdk
b8208bda88 Add needed header files to proxguiqt 2017-04-28 11:14:03 -04:00
Iceman
a8bd358225 Merge pull request #287 from pwpiwi/fix_usb 
fix USB descriptors
 2017-04-27 21:31:59 +02:00