]>
git.zerfleddert.de Git - proxmark3-svn/log
Gabriele Gristina [Sat, 29 Oct 2016 13:19:55 +0000 (15:19 +0200)]
Merge remote-tracking branch 'upstream/master'
iceman1001 [Fri, 28 Oct 2016 18:43:07 +0000 (20:43 +0200)]
CHG: 'HF MF C*' (chinese backdoor commands) According to douniwan5788 some magic/clone tags answers to the halt cmd and some not. I think I captured his ideas.
ref: https://github.com/douniwan5788/proxmark3/commit/
13b71e58fddf20c5d42b8f0af1d72c795139b86f
iceman1001 [Fri, 28 Oct 2016 14:37:26 +0000 (16:37 +0200)]
CHG: clean up
iceman1001 [Fri, 28 Oct 2016 14:37:01 +0000 (16:37 +0200)]
CHG: just some parameter / variable name changes. Nuttin' special.
iceman1001 [Fri, 28 Oct 2016 11:07:09 +0000 (13:07 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Fri, 28 Oct 2016 11:06:34 +0000 (13:06 +0200)]
FIX: looping logic error, doesn't need to increase with 1, if we do 8 checks every turn...
Iceman [Thu, 27 Oct 2016 12:50:19 +0000 (14:50 +0200)]
Merge pull request #49 from micolous/less-verbose-mfsim
hf {14a,mf} sim: Be less verbose by default, add option "m" to turn maths back on (Issue #45)
Michael Farrell [Thu, 27 Oct 2016 12:36:43 +0000 (23:36 +1100)]
hf {14a,mf} sim: v is for verbose
Michael Farrell [Thu, 27 Oct 2016 10:38:53 +0000 (21:38 +1100)]
hf mf sim: Be less verbose by default, add option "m" to turn maths back on (Issue #45)
Iceman [Thu, 27 Oct 2016 11:48:19 +0000 (13:48 +0200)]
Merge pull request #50 from micolous/mfkey-gitignore
Add .gitignore file to mfkey for binaries
Michael Farrell [Thu, 27 Oct 2016 10:43:33 +0000 (21:43 +1100)]
Add .gitignore file to mfkey for binaries
Gabriele Gristina [Tue, 25 Oct 2016 23:14:56 +0000 (01:14 +0200)]
fixup code
Iceman [Sat, 22 Oct 2016 23:04:35 +0000 (01:04 +0200)]
Merge pull request #47 from osysltd/patch-4
Update README.md
iceman1001 [Sat, 22 Oct 2016 22:58:40 +0000 (00:58 +0200)]
FIX: too small string?
iceman1001 [Sat, 22 Oct 2016 22:50:23 +0000 (00:50 +0200)]
FIX: valgrind complains about something here...
iceman1001 [Sat, 22 Oct 2016 22:38:09 +0000 (00:38 +0200)]
CHG: init the char array.
Osys [Sat, 22 Oct 2016 22:37:35 +0000 (01:37 +0300)]
Update README.md
Iceman [Sat, 22 Oct 2016 16:21:56 +0000 (18:21 +0200)]
Merge pull request #46 from micolous/fix-nonce
hf mf sim: Multiple fixes
Iceman [Sat, 22 Oct 2016 15:47:44 +0000 (17:47 +0200)]
Merge pull request #44 from micolous/master
hf 14a: Fix typos in manufacturer list
Michael Farrell [Sat, 22 Oct 2016 10:47:26 +0000 (21:47 +1100)]
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`
Michael Farrell [Sat, 22 Oct 2016 03:24:17 +0000 (14:24 +1100)]
hf 14a: Fix typos in manufacturer list
iceman1001 [Fri, 21 Oct 2016 14:06:53 +0000 (16:06 +0200)]
CHG: "hf mf hardnested" - less printing
CHG: some filehandles = NULL.
Iceman [Thu, 20 Oct 2016 23:49:39 +0000 (01:49 +0200)]
Merge pull request #43 from matrix/master
Improved Mifare Plus Atack (hf mf hardnested)
Gabriele Gristina [Thu, 20 Oct 2016 23:06:57 +0000 (01:06 +0200)]
Speedup Mifare Plus Attack v2.2 (cleanup code)
Gabriele Gristina [Thu, 20 Oct 2016 22:43:43 +0000 (00:43 +0200)]
Speedup Mifare Plus Attack v2.1 (stable)
Gabriele Gristina [Thu, 20 Oct 2016 18:00:06 +0000 (20:00 +0200)]
Merge remote-tracking branch 'upstream/master'
iceman1001 [Thu, 20 Oct 2016 15:31:58 +0000 (17:31 +0200)]
CHG: experimenting with 'lf sim' It does send a signal now but...
iceman1001 [Thu, 20 Oct 2016 15:31:23 +0000 (17:31 +0200)]
FIX: client crash for global id, and removing my previous fix.
iceman1001 [Wed, 19 Oct 2016 23:52:26 +0000 (01:52 +0200)]
TEST: see if the readerfield is needed.
iceman1001 [Wed, 19 Oct 2016 23:51:27 +0000 (01:51 +0200)]
CHG: some debug statements instead, 'H' for helptext.
iceman1001 [Wed, 19 Oct 2016 23:50:30 +0000 (01:50 +0200)]
FIX: strange bug in "lf em em410xwatch" , which the client crasches when it reads a valid em tag.
iceman1001 [Wed, 19 Oct 2016 23:16:32 +0000 (01:16 +0200)]
CHG: making printed statement a debug statement.
iceman1001 [Wed, 19 Oct 2016 23:13:18 +0000 (01:13 +0200)]
CHG: added a quitting message
iceman1001 [Wed, 19 Oct 2016 23:06:17 +0000 (01:06 +0200)]
CHG: move the call to fpga_bitstream_lf, in order to save the uploaded data from the client. Changing bitstream wipes bigbuffer.
iceman1001 [Wed, 19 Oct 2016 22:42:17 +0000 (00:42 +0200)]
CHG: updated some comments. I still think I don't understand this code
iceman1001 [Wed, 19 Oct 2016 22:41:34 +0000 (00:41 +0200)]
syntax suger. never mind this
iceman1001 [Wed, 19 Oct 2016 22:40:56 +0000 (00:40 +0200)]
CHG: removed CLOCK2, since its not used in the code.
iceman1001 [Wed, 19 Oct 2016 22:40:24 +0000 (00:40 +0200)]
CHG: the AT91C_BASE_PMC->PMC_PCER has a tendecy to be clear when set with "=", but my tickstimer also needs it, so I made it optional now.
iceman1001 [Wed, 19 Oct 2016 22:39:15 +0000 (00:39 +0200)]
FIX: lf sim, seems like "lf sim" call SimulateTagLowFrequency direct from appmain.c and I removed the LF bitstream call thinking SimulateTagLowFrequency was only called from the sub FSK;ASK;PSK commands.
iceman1001 [Wed, 19 Oct 2016 19:27:34 +0000 (21:27 +0200)]
CHG: found even more keys
iceman1001 [Wed, 19 Oct 2016 19:26:56 +0000 (21:26 +0200)]
textual suger
iceman1001 [Wed, 19 Oct 2016 19:26:29 +0000 (21:26 +0200)]
CHG: removed unused clocks,
CHG: now uses the DEFINEs instead. a bit clear
CHG: xor in the clocks, should allow for co-exist with SSP clock.
iceman1001 [Wed, 19 Oct 2016 19:25:04 +0000 (21:25 +0200)]
CHG: just changed the comment.
iceman1001 [Wed, 19 Oct 2016 19:24:20 +0000 (21:24 +0200)]
CHG: TI code did have the tickstimer started.
iceman1001 [Wed, 19 Oct 2016 19:23:03 +0000 (21:23 +0200)]
CHG: Xoring in the value allows for the ticks timers to co-exist. Or that is the idea.
iceman1001 [Wed, 19 Oct 2016 17:59:58 +0000 (19:59 +0200)]
FIX: "lf sim" after changes to ticks timers on device side, there was a "starticks" call missing, which lead to not having any timers which is a problem for the WaitUS call.
Gabriele Gristina [Tue, 18 Oct 2016 22:13:53 +0000 (00:13 +0200)]
Speedup Mifare Plus Attack v2
iceman1001 [Tue, 18 Oct 2016 16:45:29 +0000 (18:45 +0200)]
FIX: @aczid's fix https://github.com/aczid/crypto1_bs/commit/
957702be9c89f31a184971c5b5ada70fe05042c3
from original @matrix https://github.com/matrix/proxmark3/commit/
057d2e9147bc7d8fb3f7c4d7928e66e23fd58e50
iceman1001 [Tue, 18 Oct 2016 14:50:32 +0000 (16:50 +0200)]
CHG: updated the compilation for windows, to include instruction on installing perl.
Gabriele Gristina [Mon, 17 Oct 2016 23:21:56 +0000 (01:21 +0200)]
Speedup Mifare Plus Attack v1
iceman1001 [Mon, 17 Oct 2016 15:20:33 +0000 (17:20 +0200)]
FIX: Since some changes in "hf mf chk" usbcommand package, this script has not been working. It now calls and gets the results back from the device.
CHG: changed the output listing to look like the other key-tables.
iceman1001 [Mon, 17 Oct 2016 11:16:27 +0000 (13:16 +0200)]
ADD: found some more keys on the web
iceman1001 [Sun, 16 Oct 2016 19:51:10 +0000 (21:51 +0200)]
Merge branch 'master' of https://github.com/iceman1001/proxmark3
iceman1001 [Sun, 16 Oct 2016 19:50:41 +0000 (21:50 +0200)]
CHG: increased debug output for Em410x
Iceman [Sun, 16 Oct 2016 11:07:50 +0000 (13:07 +0200)]
Merge pull request #34 from osysltd/patch-3
Thank you for this correction!
Update README.md
Osys [Sun, 16 Oct 2016 00:03:04 +0000 (03:03 +0300)]
Update README.md
Typo paths corrected
iceman1001 [Fri, 14 Oct 2016 21:02:29 +0000 (23:02 +0200)]
chg: travis ci yet again
iceman1001 [Fri, 14 Oct 2016 19:15:25 +0000 (21:15 +0200)]
FIX: travis ci didnt work like I thought.. testing this instead.
iceman1001 [Fri, 14 Oct 2016 18:39:25 +0000 (20:39 +0200)]
CHG: fixing some scripts for Travis CI...
iceman1001 [Fri, 14 Oct 2016 14:53:49 +0000 (16:53 +0200)]
chg: travis ci, this should removed that extra linaro build env.
iceman1001 [Fri, 14 Oct 2016 14:46:10 +0000 (16:46 +0200)]
CHG; travis CI and multi platform part..
iceman1001 [Fri, 14 Oct 2016 14:39:38 +0000 (16:39 +0200)]
FIX: "hf legic write" - removed a warning message and made the overwrite question working.
iceman1001 [Fri, 14 Oct 2016 14:20:10 +0000 (16:20 +0200)]
REM: removed a tab character that Travis CI dislikes
iceman1001 [Fri, 14 Oct 2016 14:19:06 +0000 (16:19 +0200)]
CHG:.. travis..
iceman1001 [Fri, 14 Oct 2016 14:13:06 +0000 (16:13 +0200)]
chg: trying to configure MAC OS as a builing environment for Travis CI
iceman1001 [Fri, 14 Oct 2016 13:47:40 +0000 (15:47 +0200)]
syntax suger
and forgot to add method declaration to headerfile
iceman1001 [Fri, 14 Oct 2016 13:23:20 +0000 (15:23 +0200)]
ADD: "hf legic wipe" - it autodetects tagtype and fills all bytes from offset 7 to end with zeros.
Fills a legic tag memory with zeros. From byte7 and to the end.
Usage: hf legic wipe [h]
Options:
h : this help
Samples:
hf legic wipe
iceman1001 [Mon, 10 Oct 2016 19:55:18 +0000 (21:55 +0200)]
FIX: this should remove a warning.
iceman1001 [Mon, 10 Oct 2016 19:54:26 +0000 (21:54 +0200)]
CHG; syntax suger
iceman1001 [Mon, 10 Oct 2016 19:53:44 +0000 (21:53 +0200)]
CHG: syntax suger
iceman1001 [Mon, 10 Oct 2016 19:52:58 +0000 (21:52 +0200)]
CHG: "hf legic sim" old imp, uses two timers, we have one. I'm seriously starting on thinking about a UART instead, to read the dmabuffer. If only I knew howto.
iceman1001 [Mon, 10 Oct 2016 08:59:16 +0000 (10:59 +0200)]
CHG: "script run emlu2dump" now can read old legic hex-ascii dumps. (with spaces) and convert to a binary file
CHG: "script run emlu2html" now can read old legic hex-ascii dumps. (with spaces) and convert to a generic html file
These changes makes it easier to for old legic dumps to be used with the new "legic dump/restore/eload/esave" commands
iceman1001 [Sun, 9 Oct 2016 16:24:51 +0000 (18:24 +0200)]
CHG; added an option wither or not to clear emulator mem on init
iceman1001 [Sun, 9 Oct 2016 14:04:31 +0000 (16:04 +0200)]
chg: textual changes.
iceman1001 [Sun, 9 Oct 2016 13:49:59 +0000 (15:49 +0200)]
FIX: increased time-out to match 2.7sec it takes to write 256bytes.
iceman1001 [Sun, 9 Oct 2016 13:41:31 +0000 (15:41 +0200)]
CHG: "hf legic write" - now writes on the limits better.
CHG: "hf legic restore" - now restors :)
CHG: "hf legic rdmem" - now has a nice offset row above the read data. try: 'hf legic rdmem 0 100'
iceman1001 [Sat, 8 Oct 2016 17:25:23 +0000 (19:25 +0200)]
CHG: "hf legic restore" - added a filesize and cardsize check
iceman1001 [Sat, 8 Oct 2016 17:14:35 +0000 (19:14 +0200)]
CHG: syntax suger
iceman1001 [Sat, 8 Oct 2016 17:14:09 +0000 (19:14 +0200)]
CHG: reordered the "hf search" internal checks. The iclass check takes 4.5sec to time-out...Incredible slow to identify.
iceman1001 [Sat, 8 Oct 2016 17:12:51 +0000 (19:12 +0200)]
CHG: the call to TurnReadLFOn has a delay / number as parameter. Seems to be gone.
FIX: fixes to EM4050 code since when I changed the timer. It should work nice now.
iceman1001 [Sat, 8 Oct 2016 17:10:46 +0000 (19:10 +0200)]
REM: "hf legic load" has been removed. It doesnt have a purpose anymore.
REM: "hf legic save" has been removed. It doesnt have a purpose anymore.
CHG: "hf legic restore" started with the logic for the restore. Some compares and write to tag left.
iceman1001 [Fri, 7 Oct 2016 21:07:59 +0000 (23:07 +0200)]
FIX: looks like "hf legic write" works again!
iceman1001 [Fri, 7 Oct 2016 20:16:38 +0000 (22:16 +0200)]
CHG: "hf legic write" with these I managed to get one byte written. Its a start.
iceman1001 [Fri, 7 Oct 2016 19:28:09 +0000 (21:28 +0200)]
CHG: adjustments to 3.6ms
iceman1001 [Fri, 7 Oct 2016 18:49:26 +0000 (20:49 +0200)]
CHG: help text
iceman1001 [Fri, 7 Oct 2016 18:23:57 +0000 (20:23 +0200)]
FIX: "hf list legic" annotation now correct prints byte and value for "legic write" command
iceman1001 [Fri, 7 Oct 2016 17:15:08 +0000 (19:15 +0200)]
FIX: wrong log bytes...
iceman1001 [Fri, 7 Oct 2016 17:11:38 +0000 (19:11 +0200)]
FIX: one send command bug fixed. Turns out that uint16_t is too small for 21/23bits size. Who figured?
iceman1001 [Fri, 7 Oct 2016 10:23:07 +0000 (12:23 +0200)]
FIX: unused variable removed.
CHG: start remaking the used timers in "Hf legic write"
iceman1001 [Fri, 7 Oct 2016 09:58:14 +0000 (11:58 +0200)]
CHG: "hf legic write" got a make over in how its called. Now called with 'offset' and 'data'
'hf legic write o 10 d
11223344 ' - this will write 4 bytes (0x11,0x22,0x33,0x44) to tag from offset 10 (0x0A)
iceman1001 [Thu, 6 Oct 2016 22:18:02 +0000 (00:18 +0200)]
chg: syntax suger
iceman1001 [Thu, 6 Oct 2016 22:17:18 +0000 (00:17 +0200)]
CHG: syntax suger
iceman1001 [Thu, 6 Oct 2016 22:15:47 +0000 (00:15 +0200)]
CHG: started the process of fixing "hf legic write" and "hf legic sim" commands.
iceman1001 [Thu, 6 Oct 2016 22:14:02 +0000 (00:14 +0200)]
Renamed the calccrc8 functions and command.
iceman1001 [Thu, 6 Oct 2016 22:13:09 +0000 (00:13 +0200)]
ADD: added a StopTicks functions, to disable the timer used for ticks (TC0, TC1)
iceman1001 [Thu, 6 Oct 2016 22:12:09 +0000 (00:12 +0200)]
ADD: added a compiling flag -DHAS_512_FLASH i common/Makefile.common, to be used for PM3 devices with 512KB. Original commit from @hewitt
iceman1001 [Thu, 6 Oct 2016 17:34:53 +0000 (19:34 +0200)]
REM: "hf legic writeraw" has been removed.
FIX: "hf legic eload" uploads now correct to device mem.
iceman1001 [Thu, 6 Oct 2016 17:13:23 +0000 (19:13 +0200)]
ADD: "hf legic eload" - Load binary file to emulator memory. Use "h" for help text
ADD: "hf legic esave" - Save emulator memory to binary file. Use "h" for help text
iceman1001 [Wed, 5 Oct 2016 20:58:06 +0000 (22:58 +0200)]
CHG: "hf legic dump" now automatically detects tagtype and dumps accordingly.
CHG: still #define codestyle should it be with or without semicolons?
iceman1001 [Wed, 5 Oct 2016 20:18:26 +0000 (22:18 +0200)]
FIX: one too many semicolons for #defines