Commit graph

2167 commits

Author SHA1 Message Date
iceman1001 68410a4892 Syntaxt suger 2016-04-14 11:34:02 +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 91c7a7ccb7 Syntaxt suger,
and some clean up in the "hf mf mifare" code.  I removed the three strategies Pivi added to make the code easier and added a lot of comments to understand.
the WDT bug is still there in this code. Needs further testing yet, before I commit the fix.
So far the fix is quite stable on ubuntu, but on mingw/win is breaking still. Which at this point doesnt make any sense.
2016-04-12 11:36:52 +02:00
iceman1001 88e20c9f6d syntax suger 2016-04-12 11:30:49 +02:00
iceman1001 46f983fe9e REM: removed an unused method MifareCollectNonces
ADD:  added some set_tracing(FALSE) calls for consistency.
and.. syntax suger
2016-04-12 11:29:40 +02:00
iceman1001 01c78dabc3 CHG: syntax suger 2016-04-11 15:26:55 +02:00
iceman1001 41863885d0 REM: removed some unused code, GetDeltaCountUS() and a global counter variable. Its not used anywere.
CHG:  syntax suger
2016-04-11 15:26:15 +02:00
iceman1001 86d597a510 ADD: added @pivi 's faster authentication method from 'hardnested' into "hf mf chk" (check keys) and removed the "halt" command.
the speedup is great. Together with the previous speedups from making changes how the client sends the keys to the device,  make it lightning fast. It would be fun to see how much fast it is now.
2016-04-11 15:25:00 +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 ca5bad3d73 CHG: syntax suger,
CHG: the nested call to readerreceive is not negated..
2016-04-10 13:05:01 +02:00
iceman1001 1b4a446aba CHG: syntax suger.. 2016-04-10 12:58:04 +02:00
iceman1001 2abdfa491c CHG: mostly syntax suger, trying to uniform the look 'n feel.. To make calls act to what is expected. 2016-04-10 12:56:59 +02:00
iceman1001 5eceba292f CHG: some textual change and some syntax suger changes. 2016-04-10 12:55:18 +02:00
iceman1001 cb832982c9 FIX: how to break a working thing by being blind... 2016-04-10 12:29:38 +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 a81b99b9b1 ADD: @zhovner 's decryption of trace data to mfkey64 2016-04-05 04:49:34 +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 f3782960fa syntax cleaning. 2016-03-21 22:09:04 +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 9206d3b034 ADD: copied all EMV files from peter filmoores fork. Have not started with making it work in current fork. (a lot of work) 2016-03-20 19:37:29 +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 cef590d9ef CHG: Added the BigBuf_Clear_ext calls, returned to Marshmellow42 's / pwpiwi 's sampledemod. The 14B commands works again...
CHG: re-arranged the Uart, Demod structes init, reset,   in a first attempt to prepair to move them to a seperate file.
2016-03-13 07:20:21 +01:00