RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-17 13:38:54 +08:00
Code Issues Projects Releases Packages Wiki Activity
2579 commits 3 branches 15 tags 87 MiB
Commit graph

66 commits

Author SHA1 Message Date
Michael Farrell
59152dcb05 nonce2key: printf->PrintAndLog 2016-12-24 10:09:01 +10:00
Michael Farrell
faad338efe Fix some missing include statements which impact using proxmark3 client as a library. 2016-12-23 17:35:50 +10:00
iceman1001
97f86b7a61 chg: removed a useless clearing of key_count. From @matrix 090682764b 2016-11-15 12:13:15 +01:00
iceman1001
713f5d019c CHG: still issues left. 2016-10-29 23:58:59 +02:00
iceman1001
5e14319d2c FIX: several calls to nonce2key/nonce2key_ex has problems with not clearing up memory pointers laying around. 
Still exists problem which needs to be dealt with.
 2016-10-29 22:12:38 +02:00
iceman1001
19693bdc06 FIX: 'hf mf mifare' - special zero parity attack vector now works. Thanks to the dude who figured this vector out: @douniwan5788 (sorry for comments, I was clearly wrong.) @piwi - for proving me wrong. 
this version uses int64_t  (signed)  to signify end-of-lists (-1). It also needs its own compare function for the qsort.  I didn't merge this into existing code which uses uint64_t. (too lazy)
 2016-10-29 21:41:02 +02:00
iceman1001
ba39db376c CHG: just some parameter / variable name changes. Nuttin' special. 2016-10-28 16:37:01 +02:00
Michael Farrell
dfdbfa0702 hf mf sim: Be less verbose by default, add option "m" to turn maths back on (Issue #45) 2016-10-27 23:37:00 +11:00
Michael Farrell
b6e05350b2 hf mf sim: Multiple fixes (iceman1001/proxmark3 #45) 
- Fix `hf mf sim` to use nonce_t structures, so key recovery works
- Increases verbosity on the key recovery functionality
- Fix use-after-free for k_sector
- Add help info on `e` option to `hf mf sim`
 2016-10-22 21:53:53 +11:00
iceman1001
22635d611e FIX: Only need to print a uint32_t, 2016-09-01 16:10:25 +02:00
iceman1001
02d5a58388 CHG: Changed the number of times the call to prng_successor is called. 2016-08-24 12:32:05 +02:00
iceman1001
2b6ffe75a8 chg: remove a char.. 2016-08-10 16:29:23 +02:00
iceman1001
4ab54914e3 CHG: more struct errors.. my bad, 2016-08-10 16:28:23 +02:00
iceman1001
31cf804877 CHG: removed some debug statements, added another. Change the crapto1.c, lets see if the special attack works better now against chinese clones. 2016-08-10 16:25:56 +02:00
iceman1001
6067df30c5 FIX: at least now the special zero parity attack, repeats and doesn't crash. However it doesn't find the key either :( 2016-08-10 10:55:29 +02:00
iceman1001
59e933fc3f started fixing the paritiy == 0 special attack against chinese clones with bad prng, which hasnt been working for ages. 2016-08-09 23:11:07 +02:00
iceman1001
f0e183ece4 CHG: marshmellow42 's improved "hf mf sim x" 2016-08-04 21:57:18 +02:00
iceman1001
c827ffb098 spacing.. 2016-07-28 21:46:27 +02:00
iceman1001
2de9622f0e CHG: some clearing of memory 2016-07-23 18:31:20 +02:00
iceman1001
21d359f68f CHG: we don't want to assert inside the pm3 client. 
CHG: better message when failed to find the key.
CHG: revert nonces check, 12 -> 100
 2016-04-23 19:09:07 +02:00
iceman1001
cd777a0545 FIX: Some Coverity Scan warnings. fread, not initialised etc etc 2016-04-23 18:23:46 +02:00
iceman1001
3130ba4b21 ADD: added @azcid 's bitsliced BF solver for @piwi 's hardnested command. Awsume work! The original patch demanded some tweaking to work in mingw. 
This is not tested for other systems so far.
 2016-04-21 10:26:00 +02:00
iceman1001
cd91e41cb5 FIX: this fixes the mftry32, mftry32moebius and trymf64 implementations. Which is used in the "hf mf sim x" and "hf 14a sim x" built in attacks. 
ADD: added the nonce2key version which should be able to find the key when the collected PARITIES is ZERO.
 2016-04-18 13:08:18 +02:00
iceman1001
838c15a643 ADD: added some time debug statements to be able to measure execution time. 
CHG: change the auth_ex method to send usb package faster,
REM: removed some bucketsort changes.
 2016-02-17 17:30:37 +01:00
iceman1001
aacb96d7ed FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and copying in C. 2016-02-17 10:46:08 +01:00
iceman1001
b882b54314 FIX: introduced a bug in a loop by uint8_t inside crapto1.c 
CHG: textual helptext change in "hf mf nested"
CHG: loop inside "nested". Still not fast enough. I wonder if qsort can be exchanged for radixsort or bucket sort?
 2016-02-16 23:46:34 +01:00
iceman
5fdf867253 CHG: some timing 2016-02-15 02:49:04 +01:00
iceman1001
df4ee66ea9 CHG: my idea of malloc and free for bucketsort didn't work so well. Back to the original. 2016-02-10 21:44:32 +01:00
iceman1001
089d061f2d CHG: Extracted @piwi's bucketsort into separate files under /common 2016-02-10 13:09:33 +01:00
iceman1001
ea54ec7395 CHG: Syntax suger 2016-02-09 15:17:07 +01:00
iceman1001
66afab80bd CHG: test of re-adding @piwi's bucketsort to @blapost's crapt1 v3.3 imp. 2016-02-09 14:57:58 +01:00
iceman1001
05e07571a4 FIX: earlier NULL check. 2016-01-25 20:23:44 +01:00
iceman1001
df0dd9e9b6 REM: removed unused code. 2016-01-25 20:22:59 +01:00
iceman1001
bf22fab73b FIX: Coverity Scans complain about uninitialized usage of struct. Setting s->ODD and s->EVEN to zero should do the trick. 2016-01-20 11:31:24 +01:00
iceman1001
89a40c3d1d REM: removed a print. The printing is done in the calling function. 2016-01-19 18:06:14 +01:00
iceman1001
8130eba4d1 CHG: Syncronized so all different parts uses the same implementation of Crapto1 v3.3 2016-01-19 18:01:16 +01:00
iceman1001
a0f33b6682 CHG: started to clean up the crapto1 imp in client/nonce2key/ folder. 2016-01-19 17:22:18 +01:00
iceman1001
c2d2a5a6b5 CHG: Tried to unfold some loops inside ARM/crypto1 imp. It can't hurt, feels stabil. 2016-01-13 22:24:12 +01:00
iceman1001
738eeccd9d CHG: Tested to unfold some loops inside the crypto1 implementation to see if it generates some speed ups. Feels ok. 2016-01-13 21:51:06 +01:00
iceman1001
a531720ae6 added @pwpiwi 's latest changes to "hf mf hardnested" 2016-01-03 17:16:50 +01:00
iceman1001
e98572a1e2 I just merged @marshmellow's branch "iclass" and that was a lot of new functionality. *great work* 
Things like the ICLASS, tryDecryptWord,

--
My other stuff like default keys, some new Mifare EV1 commands 0x40, 0x43 for the logging annotation,  start of the T55x7 configblock helper functionality (ripped from Adam Lauries RFIdler code)
Changes to the PCF7931 functions written,  which has a lousy input check..
 2015-10-07 23:00:46 +02:00
iceman1001
0de8e3874d A lot of changes... 
.. ntag simulation stuff from @marshmellows branch "ntag/sim"
.. hf mf mifare fixes from @pwpivi.
.. hw status command
.. speedtest function from @pwpivi
.. Viking Functionalities,   (not a proper DEMOD, but a start)
.. GetCountUS  better precision from @pwpivi
.. bin2hex,  hex2bin  from @holiman

...
starting with getting the T55x7 CONFIGURATION_BLOCK for different clone situations. Ripped from Adam Lauries RFidler,   nothing working or finished..
...
Started working with the T55x7 read command with password actually performs a write block...  See Issue #136  https://github.com/Proxmark/proxmark3/issues/136    Not solved yet.

...
Started add SHA256..   not working yet..
 2015-10-04 18:01:33 +02:00
iceman1001
d8af608f8e TEST: Moebius two noce mfkey32... 2015-07-13 23:06:49 +02:00
iceman1001
b10a759fef @PM3 master merges, Piwi fix for mfnested 
@Marshmellow42 's fix for FDB
 2015-07-12 22:58:16 +02:00
iceman1001
b69947c245 CHG: print up to 20 possible keys. 2015-05-26 11:05:57 +02:00
iceman1001
46cd801c5a FIX: dumptoemul.lua removed the extra linebreak in the end, making some load commands complain. 
MOV: moved the try32/try64 attacks (mfkey32/mfkey64) into the nonce2key.c file
CHG: added @marshmellow42 changes to hf mfu dump layout.
ADD: an extra call to BigBuf_free in readcard..  just to make sure that it doesn't leak memory.
ADD: expermimental call to "try32" for "hf mf sim x".
 2015-05-25 13:10:55 +02:00
iceman1001
bcf61bd34a Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h
 2015-05-23 08:16:40 +02:00
iceman1001
3ac59c7fed Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/crapto1.c
	armsrc/iclass.c
	client/nonce2key/crapto1.c
 2015-03-06 09:02:15 +01:00
ikarus
9cefee6f42 Fixed issue #36 & improved file consistency. 2015-03-04 11:00:39 +01:00
iceman1001
64d1b4efc9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/epa.c
	armsrc/iclass.c
	armsrc/iso14443a.c
	armsrc/iso14443a.h
	armsrc/iso15693.c
	armsrc/lfops.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	armsrc/string.h
	armsrc/util.h
	bootrom/bootrom.c
	client/Makefile
	client/cmddata.c
	client/cmddata.h
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhf14b.c
	client/cmdhf15.c
	client/cmdhficlass.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/cmdlf.c
	client/cmdlfem4x.c
	client/cmdlfhid.c
	client/cmdlfhitag.c
	client/cmdlfio.c
	client/cmdmain.c
	client/data.h
	client/flash.c
	client/graph.c
	client/graph.h
	client/loclass/elite_crack.c
	client/loclass/fileutils.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/lualibs/mf_default_keys.lua
	client/lualibs/utils.lua
	client/mifarehost.c
	client/nonce2key/crapto1.c
	client/proxmark3.c
	client/scripting.c
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
	client/scripts/tracetest.lua
	common/Makefile.common
	common/cmd.c
	common/cmd.h
	common/lfdemod.c
	common/lfdemod.h
	common/usb_cdc.c
	common/usb_cdc.h
	include/usb_cmd.h
 2015-01-29 21:39:33 +01:00