Commit graph

1871 commits

Author SHA1 Message Date
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
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
pwpiwi 3a89d04c7f more fixes to USB communication
- use modified UDP_GET/UDP_SET_EP_FLAGS macros from @iceman1001's branch
2017-04-24 18:16:47 +02:00
pwpiwi 1f42ccddfb fix USB descriptors
- indicate compliance with USB release 2.0
- set correct vendor and product IDs
- indicate power consumption (500mA)
- add String Descriptor 0 indicating supported languages
- add String Descriptors for Manufacturer and Product
2017-04-24 14:19:39 +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
pwpiwi 24aa0a5733 Merge pull request #282 from Proxmark/graphwork2
Implement graph improvements
2017-04-19 18:11:07 +02:00
marshmellow42 3759e8a02d Remove built file 2017-04-18 23:59:40 -04:00
marshmellow42 9c44a9b6ca fix .gitignore changes 2017-04-18 23:43:42 -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 2deb4b6b46 Merge pull request #278 from marshmellow42/graphwork
Update Graphing Part1
2017-04-13 17:25:24 -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
marshmellow42 0f321d631a align clock grid with demods on graph 2017-04-11 10:34:43 -04:00
pwpiwi 8aee1b8418 avoid vast number of warnings with clang compiler 2017-04-11 07:05:22 +02:00
pwpiwi 3472ebe528 Compatibility fixes for Qt5 (#271)
* Compatibility fixes for Qt5
- make Qt detection in client/Makefile independent of OS
- added -std=c++11 and -fPIC as compiler options (required by some Qt versions, breaks compiling with old ProxSpace environment)
2017-04-11 06:58:20 +02:00
pwpiwi 68541dddc2 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2017-04-10 19:37:05 +02:00
pwpiwi 4a6bc37e70 fix missing terminating 0 in my_executable_directory (thanks @iceman1001).
fix warning about const used twice in get_my_executable_path() and get_my_executable_directory().
2017-04-10 18:44:27 +02:00
pwpiwi 88499d8694 Merge pull request #274 from marshmellow42/master
lf read adjustments
2017-04-10 18:01:04 +02:00
marshmellow42 90e9da2566 fix length test
thanks @pwpiwi for catching what i missed.
2017-04-10 11:38:11 -04:00
marshmellow42 e8647c5764 fix silent option for getSamples 2017-04-07 18:10:01 -04:00
marshmellow42 f9a6e84c56 update changelog 2017-04-07 18:05:23 -04:00
marshmellow42 f1004b345e fix buffer length bugs
adjust lf search a little as to when the chiptype check happens
2017-04-07 18:00:55 -04:00
marshmellow42 0aed2199a4 fix pskclockdetect bug 2017-04-07 17:41:22 -04:00
marshmellow42 b9957414a5 lf read adjustments
add parameter for # bits to read
auto get samples after lf read/snoop (don't need to do a `data samples`
anymore)
add safe function to get DemodBuffer
add some lf demod comments and apply new lf_read function instead of
read then get samples.
fixed output bug in lf t55xx config print
fixed small bug in lf t55xx detect during ST check
2017-04-07 17:28:12 -04:00
marshmellow42 bed24f53c2 no longer need doT55x7Acquisition... 2017-04-05 21:37:04 -04:00
marshmellow42 2229ee897e adjust t55x7 testmode write timing 2017-04-05 21:19:48 -04:00
Iceman ebfb4447b8 Merge pull request #268 from marshmellow42/master
various lf bug fixes and improvements
2017-04-05 15:41:16 +02:00
marshmellow42 605524b131 fix command help
add comments in changelog
2017-04-04 17:34:15 -04:00
marshmellow42 bf85d22f96 fix bug in st detect +
adjust nrz t55xx detection to reduce false positives on weak antennas
adjust t55xx read wait to get past initial startup wave.
2017-04-04 17:22:21 -04:00