RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-28 11:16:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
4002 commits 3 branches 14 tags 85 MiB
Commit graph

435 commits

Author SHA1 Message Date
iceman1001 51a65a0ce3 rem: removed unneeded function 2018-01-28 12:47:08 +01:00
iceman1001 0c827e755f chg: parameter adjustments 2018-01-28 12:42:17 +01:00
iceman1001 205e4b2300 chg: adjusted the input parameters for crc16 implementations. 2018-01-28 12:19:04 +01:00
iceman1001 1f5477491f chg: rename 2018-01-28 11:01:29 +01:00
iceman1001 e5804645f1 chg: most of the crc16 works. 
ISO14443 crc A  = crc16_a
ISO14443 crc B  = ...
ISO15693 crc    = crc16_x25
 2018-01-28 10:59:57 +01:00
iceman1001 e396575424 add: fast reverse 16bit 2018-01-27 23:16:35 +01:00
iceman1001 3943f87c30 chg 2018-01-18 16:31:07 +01:00
iceman1001 e18c360010 ADD: Calypso protocol commands 2018-01-18 16:26:56 +01:00
iceman1001 93ecfddb88 CHG: iso15 from b8f35947f2 @lnv42 2018-01-16 21:07:58 +01:00
iceman1001 5ea8f73547 FIX: cmd_send has wrong varible definitions, leading to loss of values. 2018-01-11 21:47:27 +01:00
iceman1001 398ca555b2 moved into common/polarssl 2018-01-02 11:17:59 +01:00
iceman1001 e67daf946d chg: added the config.. 2017-12-24 10:50:00 +01:00
iceman1001 a3ec7fd21f chg: 'hf emv' changes from @merlokk EMV4 commit 2017-12-24 10:26:47 +01:00
iceman1001 07ab8ea674 moved into here. 2017-12-24 10:23:55 +01:00
iceman1001 85f3870233 chg: removed old WITH_EMV , HAS_512_FLASH, defines, since emv now is native in client and we have automatic detection of 512kb size when compiling. 2017-12-24 10:23:04 +01:00
iceman1001 3e5bd575f6 syntax sugar 2017-12-24 10:22:02 +01:00
iceman1001 5d55807f37 add: cryptolibs needed in emv, 
moved aes, des into here.
 2017-12-24 10:21:28 +01:00
iceman1001 74b4755d42 moved function 2017-12-23 11:23:14 +01:00
iceman1001 5eafdbf872 ADD: 'hf iclass check' - increased speed in check keys with new algo. 
ADD: 'hf iclass' - trying to add the timeout-limits for commands in order to get a more stable iclass communication
 2017-12-21 10:13:40 +01:00
iceman1001 44280abf62 chg: reverting back to more or less offical pm3 version. 2017-12-07 15:02:15 +01:00
iceman1001 1f637d726f fix to darkside overdue. I needed to remove my old impl.. 2017-12-06 17:15:24 +01:00
iceman1001 bc8b3534fe chg: renaming 2017-11-09 19:30:29 +01:00
iceman1001 30ceea4aea chg: cleaning up some function calls. 
fix: check to see clock is bigger than zero.
 2017-11-09 19:15:56 +01:00
iceman1001 609008b3ad chg: removed unneeded loop 2017-11-06 15:28:44 +01:00
iceman1001 881c7115a7 CHG: centralized the LF signal properties LOW/HIGH/MEAN/AMPLITUDE/ISNOISE into one struct. 
CHG: 'data raw ar'  - didn't take in consideration the command line parameter CLOCK.
 2017-11-06 15:06:42 +01:00
iceman1001 3b1c01cd13 CHG: 'lf search' - hitag/cotag wrong return values 
CHG: is_justnoise - safety checks
CHG: 'hitag reader' - debug printing
 2017-10-30 22:20:08 +01:00
iceman1001 54e8a0ae2b change demod printing 2017-10-30 20:33:11 +01:00
iceman1001 db56ca11a3 FIX: detect noise signal by measuring amplitude of signal. 2017-10-30 19:18:30 +01:00
iceman1001 6f948be842 CHG: some average / mean functions to enhance justNoise functions. 
FIX: 'lf t55xx' - verifying that collected signal is not just noise..
 2017-10-30 16:44:04 +01:00
iceman1001 b5842e8c1b fix: usb_cdc don't report that pm3 device is selfpowered.. (since its not by default) 2017-10-29 19:28:23 +01:00
iceman1001 5da60668dc chg: Serialnumber is shorter. Will be better for OSX ppl 2017-10-21 13:07:07 +02:00
iceman1001 4b63f940f1 CHG: FeliCa implemenation by @satsuoni 2017-10-20 20:27:44 +02:00
iceman1001 53333f22c8 fix: hw status (and USB comm in general) PR #434 : (@pwpiwi) 2017-10-20 16:32:42 +02:00
iceman1001 094f3dea0b FIX: Found the little bugger which has been haunting me for sometime now. 
Maybe I can test my other new things?...
 2017-10-20 15:17:03 +02:00
iceman1001 f8c0202403 CHG: reverting to official PM3 style cdc_acm 
CHG:  Commented out OSprop and CompatIDFeatureDescriptor to fix compiler errors (@ceres-c)
 2017-10-20 14:45:48 +02:00
iceman1001 b739076d99 FIX: reverted back to offical pm3 - waiting for flags to be cleared & set. 2017-10-19 14:03:45 +02:00
iceman1001 3b665be5fc chg: usb_cdc, it should be similar to official pm3. lets 2017-10-19 13:06:47 +02:00
iceman1001 1f0a1edfbe CHG: restored the wait in flash-mode. Its waiting for the device to "reboot".. 
CHG: usb_Cdc,   :  usb specs say 100ms delay. Previous delay was much longer...
 2017-10-17 23:09:32 +02:00
iceman1001 16028f7d33 CHG: appmain now calls cmd_recieve as it should 
CHG: flasher -  removed unneeded parameter to function
CHG: flasher - increased limit to fpga-files that can be loaded
FIX: main client,  wrong windows define fixed.
CHG: device side - recieve usb command does not always get 544 bytes.  usb packages can be incomplete.
CHG: usb_cdc.c also got piwi's changes.
CHG: uart_posix.c removed a debug value
CHG: uart_win32.c clean up.
 2017-10-17 20:58:17 +02:00
iceman1001 e47114bd65 FIX: MS feature descriptors now work when attaching device on Windows 8, 10 
However:   there are some registry entries needed to be deleted when the device is NOT connected.
I'd created some batch files to run as administrator,  which deletes and queries the registry.
 2017-10-13 10:39:33 +02:00
iceman1001 1d5e3fc217 fix: usb communications should be fine again. Inteface size must be 0x08, not 0x40 2017-10-12 15:13:18 +02:00
iceman1001 1cca109429 chg: validating we got a full usbcommand (512b) 2017-10-11 12:48:04 +02:00
iceman1001 480c0d0ba0 CHG: pm3 device will be identified on win10 automatic without drivers. Sadly no com port... 2017-10-11 12:46:38 +02:00
iceman1001 6cebcb4b0a CHG: replaced with a define 2017-10-11 10:17:01 +02:00
iceman1001 c9f37223ce FIX: at91sam7s256 has some limits on endpoints maxpacket sizes. Took me sometime to find it. 2017-10-11 10:15:41 +02:00
iceman1001 f788ef51d1 CHG: fiddling with USB_CDC and device identification on Windows. Still dodgy. This most likely will force you to JTAG update your device. *experimental warning* 2017-10-10 15:06:17 +02:00
iceman1001 e32cd18fd3 ADD: 'hf list felica' to be able to annotate Felica 2017-10-10 15:05:06 +02:00
iceman1001 3a0b205b7f chg: some extern 2017-10-10 15:03:33 +02:00
iceman1001 d3282e766a FIX: adjustments, the #define has the whiles already. 2017-09-28 23:14:51 +02:00
iceman1001 2934b22b05 CHG: fixing Header file 2017-09-28 22:39:07 +02:00
iceman1001 1e32ceb54c CHG: adding standalone as VPATH.. 2017-09-28 22:36:09 +02:00
iceman1001 72e53b0968 chg: disable emv for armsrc default. 2017-09-20 10:42:46 +02:00
iceman1001 14550557be CHG: 'emv compilation' since the client makefile doesn't import makefile.common anymore, need to move some compilor directive. Now need to change two files for EMV compilation. 
* client/Makefile
 * common/Makefile.common
 2017-09-18 22:33:22 +02:00
iceman1001 28f1f23d48 chg: easy printing of MAKE variables 
Usage::
  make print-FLASHTOOL
  cd bootrom; make print-APP_CFLAGS
  cd client; make print-GCC_VERSION
 2017-09-18 18:59:51 +02:00
iceman1001 6d98779ff8 chg: 'hf 15 read' - nice output and with lock info 
chg: 'hf 15 readmulti' - nicer output and with lock info

You can still break the client if you ask to read too many blocks at one time.
I suggest 'hf 15 dump' instead for that purpose
 2017-09-06 22:04:00 +02:00
iceman1001 9d0ce1e874 chg: 'hf 15 reader' minor output changes 
chg: 'hf 15 info'  minor output changes
 2017-09-05 08:25:23 +02:00
iceman1001 508fa76915 ADD: 'hf list 15' - added annotation for ISO15693 2017-09-04 18:38:57 +02:00
iceman1001 ec07e2e006 FIX: 'hf 15 *' commands - the demod should work better now and as a bonus I've added some tracelogging. The timer is not quite correct yet but its a start. 
sample:
   hf 15 reader
   hf list raw
 2017-09-04 13:56:57 +02:00
iceman1001 94f70caa7a when you need to add too much changes at the same time... 
fix: 'hf mf hardnested'  test cases doesn't need to verify key.
add: 'hf mf ' - collect nonces from classic tag.
chg: switch_off on armside,  a more unified way,  so we don't forget to turn of the antenna ...
chg:  renamed 'hf iclass snoop'  into 'hf iclass sniff'   in an attempt to make all sniff/snoop commands only SNIFF

chg: 'standalone' ->  starting the work of moving all standalone mods into a plugin kind of style, in its own folder.
 2017-08-26 12:57:18 +02:00
iceman1001 eae8c2f7be chg: unify debug messages for FSK demod in AWID,HID,IO,PARADOX,PYRAMID, all neat and same. 2017-08-11 20:48:54 +02:00
iceman1001 734ca940e9 fix: unified lf clone printouts of blocks. 2017-08-11 11:38:54 +02:00
iceman1001 bd4d1ec74e Fixes: lf simpsk - make sure Carrier input is ok. 
fix: 'lf awid sim' - Clk param is used CorreCt
fix: 'lf HID sim' - unified way logging
fix: 'lf indala sim' - adding a draft simulation Command
fix: 'lf io sim'  - unified way logging
fix: 'lf nedap sim' - getting bits is wrong still..
fix: 'lf paradox sim'  - Helptext
lfdemod.C  got some reworked loops,  still some debug messages to be ...
 2017-08-10 14:19:57 +02:00
iceman1001 c583570a3d minor styleish 2017-08-06 16:31:01 +02:00
iceman1001 0acc606be3 lf search is working :) 2017-07-31 12:31:39 +02:00
iceman1001 91898babc0 FIX: data plot AutoCorrelate slider, window too big, now limited to number of samples. 
enhanced debugstatements,
'lf em 410x_demod' vs 'lf em 410x_read'   now read does the same as all other LF,  and demod too...
 2017-07-30 21:21:02 +02:00
iceman1001 bf5b7e2d91 coverity scan, uninitialized vars. 
removed crapto1.
 2017-07-30 10:33:40 +02:00
iceman1001 f28da2da6e monster merge... 
all those changes marshmellow did..  and more...
 2017-07-30 09:17:48 +02:00
iceman1001 a797314dab more adaptations 2017-07-27 22:05:54 +02:00
iceman1001 a8569849d6 part of monstermerge.. 2017-07-27 20:58:59 +02:00
iceman1001 6519ae6f88 part of monstermerge... 2017-07-27 20:48:49 +02:00
iceman1001 f942e1ed05 ADD: CRC8Mad() should be used to calc the crc-8 byte for Mifare MAD config block. Doesn't work of course... 
CHG: some T/F defines..
 2017-07-27 09:31:23 +02:00
iceman1001 d2f79fa83f ADD 'lf nexawatch' by marshmellow42 
ADD 'lf securakey'  by marshmellow42
ADD 'lf pac'  by marshmellow42
chg: parity.h got some love from pm3 master.
 2017-07-14 15:51:12 +02:00
iceman1001 5f18400cbe FIX: 'hf iclass reader' marshmellows fixes. 
CHG:  removing some #define TRUE
 2017-07-07 12:38:49 +02:00
iceman1001 dd98b934bc CHG: 'hf iclass readblk' - should be able to read block 0,1 on all cards without key. 
CHG: 'hf iclass reader' -  two rules according to datasheet
  if app_limit is less than 0x6,  app_limit should be 0x6
  if app_limit is bigger than 31/0x1F on 2kb picopass,  the app_limit should be 26/0x1A
 2017-07-05 12:05:53 +02:00
iceman1001 213883a931 FIX: 'hf iclass reader' - now correctly identifes crypt-fuses configuration 
ADD: 'hf iclass reader' - now prints OTP value
 2017-07-05 11:21:38 +02:00
iceman1001 cb7ececdce FIX: updates to usb_cdc.c , starting with the MSOS features :) 2017-07-04 20:07:45 +02:00
Iceman d59026518e FIX: fullimage.s19 
According to @doegox  the *.s19 file is generated with wrong offset for the data section.
ref:  http://wiki.yobi.be/wiki/Proxmark#Flashing_full_image.2C_take_1
 2017-05-29 09:39:25 +02:00
Iceman 489e735f86 Update Makefile.common 
chg:  disabling 512kb flashing since it has issues with the flasher code.  Might enable it later on.
 2017-04-26 21:32:42 +02:00
iceman1001 905c55de2b ADD: analyse nuid - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1 has this option as a activation sequences. This NUID is also used for authenticate (cuid), not the block0 data. 
ref: http://www.gorferay.com/mifare-and-handling-of-uids/
 2017-03-10 09:48:36 +01:00
iceman1001 dfcf20d641 FIX: Coverity Scan fixes to emvcmd.c among others. 
FIX: emclearmem bug.
 2017-03-05 18:43:06 +01:00
egon2 37a71c7a96 fixes #85 2017-03-05 16:19:26 +00:00
iceman1001 91e9295761 FIX: had to make it clientside only 2017-03-03 12:27:35 +01:00
iceman1001 88e7a6bfa7 FIX: travisCI complains. dummy -> dummy_sgc. 2017-03-03 12:24:02 +01:00
iceman1001 9833360b25 chg: clock marking for ask/fsk/psk, using @marshmellow42 's addition to get startindex. 2017-03-03 11:36:07 +01:00
iceman1001 1ec412d97d FIX: moved from lfdemod.c -> graph.c SetGraphClock. 2017-03-02 21:15:01 +01:00
iceman1001 c6e5c7ea46 CHG: data plot- the marking of clock, looks better without borders. It only connected to ASK. STT mark also looks better. 
Still problem with finding the startindex...
 2017-03-02 21:00:51 +01:00
iceman1001 a9eeb57698 CHG: Added PR #220 from PM3 Master. ref: https://github.com/Proxmark/proxmark3/pull/220 2017-03-01 20:14:46 +01:00
iceman1001 c24364a8a4 FIX: @marshmellow42 's ST detection fix. 
FIX: lfops.c and em4x05 command timings.
 2017-02-28 19:20:12 +01:00
iceman1001 4eabb8ad38 CHG: minor LF adjustments. 
CHG: `lf visa2000` - removed askedgedetect, it seemed it destroyed more than enhanced.
 2017-02-28 16:55:16 +01:00
iceman1001 a8fd088d8b FIX: lf search - em410x demod was a bit greedy. 2017-02-28 14:47:25 +01:00
iceman1001 5215a87442 CHG: @Marshmellow42 's fixes. ref: e88096ba25 2017-02-24 01:14:47 +01:00
iceman1001 8ad1e731c8 chg: @marshmellow42 's changes. 2017-02-23 00:52:40 +01:00
iceman1001 9c624f67b3 chg: @piwi's code cleanup and some more. 
ref: 43534cbad2
 2017-02-23 00:03:10 +01:00
iceman1001 19d9376c16 CHG: added some comments when changing the HAS_512_FLASH macro directive. 
CHG: 'make cli'  -  needs lualibs to compile.  well,  and more stuff ofcourse.
 2017-02-20 11:47:10 +01:00
iceman1001 4ac9f07840 CHG: lf em - added @marshmellow42 's changes 2017-02-19 00:12:35 +01:00
iceman1001 1a4b907335 CHG: some minor changes from @marshmellow42 2017-02-16 21:44:25 +01:00
iceman1001 bd09006a8c CHG: 'lf em4x' - the em4x50 demod didn't calc ASKDemod_ext with a refenence bool. 
CHG:  'lf em4x' - refactored the code for emd4x50 demod
 2017-02-16 16:38:09 +01:00
iceman1001 e977fb0da3 syntax sugar 2017-02-13 15:33:26 +01:00
iceman1001 573e8d72c7 FIX: 'EMV compiling' - Makefiles are very picky about how things are done. its parser is a bit paranoid. So, to make things easier and more correct. 
- armsrc/Makefile          when commenting out functionality,  move it below the comment otherwise APPS_CFLAG breaks to early.  See WITH_LCD
  - common/Makefile.common   enable / disable EMV,  uncomment two lines.  then make clean && make all.  flash,   MIGHT NOT work on 256kb devices

FIX: missing break in appmain.c made it go to iclass function..
 2017-02-13 15:32:48 +01:00
iceman1001 ed55e9aec4 chg: trying to generalize the EMV build. 2017-02-13 11:05:03 +01:00