dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,992 Commits 7 Branches 1 Tag
fa0e0b109fd576eb6f720168058e67463b1aa321
Commit Graph

1282 Commits

Author SHA1 Message Date
iceman1001
fa0e0b109f CHG: moved out some usage_methods for help texts. 
CHG: added some time in the darkside, nested, hardnested, chk commands.
 2016-04-23 12:18:34 +02:00
iceman1001
5dc8b8fe27 CHG: unified some text messaged. 2016-04-23 11:43:02 +02:00
iceman1001
d948e0d140 CHG: 'hf mf chk' now correctly tests to read key B, when we specify target keytype B or ?. 
CHG: 'hf mf chk'  now correctly init all sector keys to 0xFFFFFFFFFFFF,  so it looks unified.
 2016-04-23 11:32:37 +02:00
iceman1001
2e350b19f7 FIX: there were no "memfree" call, there were only "free" 2016-04-21 12:15:36 +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
f7c1a934d0 CHG: "hf 14a sim" now uses mfkey32 and mfkey32_moebius as methods to retrive the key in attack_mode. 2016-04-18 13:20:17 +02:00
iceman1001
6c84c90017 FIX: this fixes the "hf mf sniff l d f" command, which has been broken for a while. The cuid is correct used for decrypting. 
FIX: The flushing of logentries.
ADD: "hf mf sniff" - added the sniffing of UID's with a uidlen of 10.

Whats left? The key is not always found even if we use the "mfkey64" approach.

ADD: added the parity_zero attack in "hf mf mifare".  Still not working since piwi's changes to the iso14443a.c,  maybe needs a param to tell it to collect nonces for this special attack.
CHG: extracted some help-texts into usage_* methods. Changed some text as well

FIX:  "hf mf sim" command now uses both  mfkey32 and mfkey32_moebius version to find the key in attack mode.
CHG:  "hf mf sim" also now defaults to emul_memory to read a 4 byte UID.
 2016-04-18 13:18:02 +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
c805748f34 ADD: added a method for le32toh. Converting bytes to uint32_t . 
CHG: correct use of FILE_PATH_SIZE in the tracelogging functions.
 2016-04-18 13:05:35 +02:00
iceman1001
ce211cef39 FIX: corrected the FLAG_NR_AR_ATTACK 2016-04-18 13:02:36 +02:00
iceman1001
40f6f2ff50 ADD: started to add a BUTTERWORTH filter, not working yet. 2016-04-14 11:37:17 +02:00
iceman1001
0e32bf46e7 CHG: added the ascii output for the pwd. 2016-04-14 11:32:43 +02:00
iceman1001
0194ce8fc8 ADD: simulating can now handle triplesized UID (10b) 
CHG: moved some mifare #DEFINES into protocols.h  (ACK,NACK..)
 2016-04-14 11:09:17 +02:00
iceman1001
7ee74a8ebd CHG: Swapped to using the DEFINES. 2016-04-14 11:05:27 +02:00
iceman1001
01c78dabc3 CHG: syntax suger 2016-04-11 15:26:55 +02:00
iceman1001
2daa0d0b1e CHG: doesnt flush the printf() calls 2016-04-10 13:34:27 +02:00
iceman1001
cbdcc89ae7 CHG: free the malloc:d memory in the crc8 function. 
CHG: use the new GetEMLfrombigbuff  method.
ADD: added a usage_legic_read
 2016-04-10 13:18:11 +02:00
iceman1001
407697dfe3 ADD: more keys 2016-04-09 19:46:57 +02:00
iceman1001
bae363d860 ADD: more keys.. 2016-04-09 19:45:28 +02:00
iceman1001
9e43f09ade removed some old code, 
rename a function, that tries to add IIRfilter Butterworth on a signal.  Lets see if I can get it to work on Graphbuffer data one of these days.
 2016-04-05 04:51:06 +02:00
iceman1001
5774b2b44d ADD: added a WIN sample. 2016-04-05 04:48:05 +02:00
iceman1001
d40d64ef0d CHG: old code calls outdated command. Even if it works in my fork, it doesnt work in PM3 master. 2016-04-05 04:47:42 +02:00
iceman1001
12b998cbd8 ADD; Some 7816 error codes 2016-04-05 04:46:25 +02:00
iceman1001
13629a71d3 minor adjustements, found some comments. 2016-04-05 04:45:07 +02:00
iceman1001
ef085a5948 CHG: adjusted two arrays in scripting.c to mirror the added models in reveng 1.4.0 2016-04-05 04:43:54 +02:00
iceman1001
4534ec060a CHG: and the Makefile needs also to be updated 2016-04-05 03:35:47 +02:00
iceman1001
ca98f30c53 CHG: forgot one file for the RevEng update 2016-04-05 03:35:12 +02:00
iceman1001
0a25987730 Add; some keys 2016-04-05 03:34:46 +02:00
iceman1001
a78a3d9dc3 CHG: Updated RevEng1.31 to 1.40 
--snipped changelog

1.4.0	24 February 2016
	* Added 11 new algorithms, CRC-4/INTERLAKEN, CRC-7/UMTS,
	  CRC-8/LTE, CRC-8/SAE-J1850, CRC-11/UMTS, CRC-16/LJ1200,
	  CRC-24/BLE, CRC-24/INTERLAKEN, CRC-24/LTE-A, CRC-24/LTE-B,
	  CRC-30/CDMA, and 4 new aliases, CRC-12/UMTS, CRC-16/LTE,
	  CRC-16/UMTS, CRC-32/INTERLAKEN, from the CRC Catalogue.
	* Eliminated string comparison when testing if a model name is
	  an alias.
	* Split off presets into preset.c.
	* Eliminated bogus calls to bsearch() in preset.c.
 2016-04-05 03:34:03 +02:00
iceman1001
c3559d162a textual changes 2016-03-23 14:04:10 +01:00
iceman1001
b9e66427b7 Forgot some breaks, and a faulty comparision of a set bit. 2016-03-23 14:03:41 +01:00
iceman1001
186ad6037c ADD: added the ETU and Frame wait time based on the Frame wait integer value. 2016-03-23 14:02:50 +01:00
iceman1001
06eb3b1a8c coverity fixes for my latest changes. 
Forgot some breaks in 7816 annotation, and  presco used an uninitalized char array.
 2016-03-22 08:40:20 +01:00
iceman1001
774560e39e CHG: no parity tests for ISO_7816_4 annotation 2016-03-21 22:07:55 +01:00
iceman1001
5de71ee6bf CHG: enter a define for TIMEOUT 2016-03-21 22:07:23 +01:00
iceman1001
ab6d8a4c47 CHG: fixed the commands, its now valid calypso 7816 commands. 2016-03-21 22:06:51 +01:00
iceman1001
0fcfad0ee6 CHG: testing for windows clients to get a higher baudrate. Was 9600, testing 115200 as for non_win. 
CHG: testing to set USB 2.0 standard,  instead of USB1.1  ...
 2016-03-21 22:05:59 +01:00
iceman1001
4bf0f73d76 increased a number of calypso commands for selecting files and trying to read them 2016-03-20 21:30:40 +01:00
iceman1001
452aab1e59 ADD; first try at reading calypso tags 2016-03-20 20:22:35 +01:00
iceman1001
7fa7e812fc ADD: added @marshmellow42 's changes to "lfdemod" 2016-03-20 19:39:06 +01:00
iceman1001
f400ff6519 CHG: not sure if this clearCommandBuffer helps when sending usbpackages from lua scripts. Having trouble with these usbpackages in 14B code. 2016-03-20 19:35:43 +01:00
iceman1001
a930542b0a FIX: the lua script hf_reader.lua now works with 14B tags. 2016-03-20 19:34:34 +01:00
iceman1001
eb7eab8570 code cleanup. 2016-03-20 19:33:59 +01:00
iceman1001
6fc68747f6 ADD: well, starting with a luascript for reading calypso tags, made me remake the 14b raw command on client and device side. Sorry @marshmellow42 , but this one broke your "hf 14b info" implementation. I fixed the "hf 14b read" and the hf search. So not to bad, but still a bit broken. The 14b raw device side is now very similar to 14a raw. Which is good. There is a Standard 14b 0x050008 detection and STmicroelectronic 0x0600 detection on deviceside. This removes a lot of code client side. 
I also made the SRi read functions better by combining them.   The demodulation / uart code should be the same as last summers changes.  The device side code can now be even smaller.
 2016-03-20 19:33:07 +01:00
iceman1001
790e8eae09 ADD: @icsom changes and additions to lua scripts for LEGIC 2016-03-20 19:25:48 +01:00
iceman1001
e3f9c50d81 ADD: changed the annotation for 14b, it now shows WUPB/REQB and number of slots we used. 2016-03-20 19:24:14 +01:00
iceman1001
77d1a423d5 CHG: minor changes to this lua script. One case it returns NIL, which makes it behave better. 2016-03-13 07:17:26 +01:00
iceman1001
aaa1a9a2dc CHG: Added calling clear bigbuff to zero out it also, instead of just "free" it. 
ADD:  downloading the EML part from BigBuffer specially.
 2016-03-12 09:03:28 +01:00
iceman1001
6c68b84a6e @Marshmellow42 additions: 
ADD: Q5 to 'LF PYRAMID'
ADD: ST sim addition to SIM ask.

REF: 29ada8fc08
 2016-03-07 18:53:02 +01:00
iceman1001
4e8fa8b448 ADD: get a updated script from @icsom 2016-03-06 13:26:13 +01:00