Commit graph

5827 commits

Author SHA1 Message Date
57ca2b96b7444cb986b2d6cf51d25ffd86c57743 c73ad5b4da Some basic BASH scripts to help update the proxmark firmware and to
start the application.  Both scripts perform simple checks to
autodetect the proxmark device.
2017-10-23 18:15:02 -04:00
Iceman 1f8b08cf57 Merge pull request #135 from winguru/winguru-patch-1
Enclosed naked statements with braces to avoid C compliler misleading-indentation 'guard' warning.
2017-10-23 23:52:02 +02:00
57ca2b96b7444cb986b2d6cf51d25ffd86c57743 34b076f7af Enclosed naked statements with braces to avoid C compliler misleading-indentation 'guard' warning. 2017-10-23 17:37:29 -04:00
iceman1001 666284b130 chg: matching versionnumber... 2017-10-23 23:31:20 +02:00
iceman1001 8f201fd173 chg: removed some commented out code 2017-10-23 22:10:16 +02:00
iceman1001 f3ebfcb9a0 chg: reverting old @satsuoni felica changes.
chg: applied @pwpiwi 's fixes for iso 14B / 15
2017-10-23 21:56:47 +02:00
iceman1001 6a4a084843 chg: remove redudant key (@cjbrigato) 2017-10-23 21:29:20 +02:00
iceman1001 9e527537c6 fix: remove compile warnings (@winguru) 2017-10-23 21:19:46 +02:00
iceman1001 4bfc3ca8c9 CHG: part of @piwi changes 2017-10-23 21:17:59 +02:00
iceman1001 e1ff9e66ab chg: another one key 2017-10-23 21:17:31 +02:00
iceman1001 e312115844 rem: duplicate key. 2017-10-23 14:12:04 +02:00
iceman1001 e39907690f CHG: more known keys 2017-10-23 14:08:19 +02:00
Iceman b6d68ec0aa Update readme.md 2017-10-22 17:00:53 +02:00
iceman1001 feeffb0eff chg: some updates on installing.. 2017-10-22 13:42:33 +02:00
iceman1001 14cf93f523 chg:... banner.. not showing.. I should rethink sundaymornings coding sessions 2017-10-22 11:27:22 +02:00
iceman1001 dbb392c212 chg: ...NOT showing banner.. before it was enforcing it :) 2017-10-22 11:07:37 +02:00
iceman1001 2aa17c0ddc chg: not showing banner when executing direct from shell 2017-10-22 11:05:25 +02:00
iceman1001 d2dd6eed6a UPD: pm3_mfdread.py - updates from original repo (@zhovner) 96d0ac184a 2017-10-22 10:25:14 +02:00
iceman1001 d15cf5ff2f CHG: pip:ing, command, lua, from CLI has less output. 2017-10-21 15:01:23 +02:00
iceman1001 dc23a6d5ce chg: commandline mode execution now has less output 2017-10-21 14:50:29 +02:00
iceman1001 80573aa7f6 fix: 'proxmark3.exe -c zzzzz' command from cli didnt work 2017-10-21 14:24:23 +02:00
iceman1001 5da60668dc chg: Serialnumber is shorter. Will be better for OSX ppl 2017-10-21 13:07:07 +02:00
iceman1001 1fd6d95729 chg: remove a warning 'extern' 2017-10-21 13:00:36 +02:00
iceman1001 55e87490cf fix: remove all traces of fpga_nfc... 2017-10-20 22:01:10 +02:00
iceman1001 b27a9920b1 ADD: https://github.com/Proxmark/proxmark3/pull/417 (@merlokk)
CHG:  https://github.com/Proxmark/proxmark3/pull/434 (@pwpiwi)
2017-10-20 20:39:57 +02:00
iceman1001 4b48e63ccc ADD: missing felica.c 2017-10-20 20:30:17 +02:00
iceman1001 74ac547db8 REM: removed unused file 2017-10-20 20:29:38 +02:00
iceman1001 4b63f940f1 CHG: FeliCa implemenation by @satsuoni 2017-10-20 20:27:44 +02:00
iceman1001 530c046060 chg: a better appveyor.yml file (@merlokk) 2017-10-20 20:13:49 +02:00
iceman1001 cdaef14759 fix: forgot param 2017-10-20 18:24:04 +02:00
iceman1001 2cf3a0adb7 chg: helptext 2017-10-20 18:00:58 +02:00
iceman1001 d350bfb561 fix: broken function 2017-10-20 18:00:13 +02:00
iceman1001 d77e8233c0 fix: pr #435 (@tisf) OSX has issues with liblua. 2017-10-20 17:53:49 +02:00
iceman1001 53333f22c8 fix: hw status (and USB comm in general) PR #434 : (@pwpiwi) 2017-10-20 16:32:42 +02:00
iceman1001 3108293c1f ADD: New standalone mode by (@cjbrigato) Excellent work! 2017-10-20 15:29:33 +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 a9bf084916 chg: Shortend a wait. Not sure why we wait here. 2017-10-20 14:51:12 +02:00
iceman1001 b0545ed555 chg: re-arranged 2017-10-20 14:49:36 +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 79dd43dbd2 ADD: string functions (@merlokk) 2017-10-20 14:39:42 +02:00
iceman1001 e574e89553 syntax sugar 2017-10-20 14:38:50 +02:00
iceman1001 31191382fc CHG: adapt to be similar as other cmd*.c files 2017-10-20 14:37:50 +02:00
Iceman d05d63b112 Merge pull request #131 from ceres-c/master
Fixed udev makefile
2017-10-19 16:15:28 +02:00
ceres-c 5b979d3b72 Fixed udev makefile 2017-10-19 16:10:46 +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 b99b2dd30f FIX: stderr -> stdout 2017-10-19 13:41:55 +02:00
iceman1001 6f05fdfc88 CHG: fpga_comress sending no-error messages to stderr (@merlokk)
36b1cdd1b4
2017-10-19 13:28:58 +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 dc7473135c syntax cleaning 2017-10-17 22:05:52 +02:00