]>
git.zerfleddert.de Git - proxmark3-svn/log
Iceman [Sat, 5 May 2018 04:59:39 +0000 (06:59 +0200)]
Merge pull request #600 from marshmellow42/master
more graceful exit to lf search if no signal found
marshmellow42 [Sat, 5 May 2018 03:54:01 +0000 (23:54 -0400)]
more graceful exit to lf search if no signal found
pwpiwi [Fri, 4 May 2018 06:25:08 +0000 (08:25 +0200)]
Update CHANGELOG.md
pwpiwi [Fri, 4 May 2018 06:19:37 +0000 (08:19 +0200)]
Change driver file proxmark3.inf to support both old and new Vendor/Product IDs
(see http://www.proxmark.org/forum/viewtopic.php?pid=32072#p32072)
marshmellow42 [Thu, 3 May 2018 17:36:51 +0000 (13:36 -0400)]
fix bug if -DWITH_ISO14443a_StandAlone is removed from makefile (#598)
pwpiwi [Sat, 28 Apr 2018 08:09:16 +0000 (10:09 +0200)]
USB comms: part 3 towards @micolous PR#463
* change variable 'sp' from global to static
* move code to open and close USB port to comms.c (OpenProxmark() and CloseProxmark())
* change scope of USBCommandReceived() to static
* (flasher still unchanged)
pwpiwi [Tue, 24 Apr 2018 06:27:29 +0000 (08:27 +0200)]
USB comms: part 2 towards @micolous PR#463 (#595)
* change variable 'offline' from global to static
* change variable 'FlushAfterWrite' from global to static
* remove unused global variable 'current_command'
* WaitForResponseTimeoutW(CMD_UNKNOWN, ...) waits for any command
* #include "printf.h" or <stdio.h> in iso15693tools.c to define sprintf()
* and some minor changes/comments
Tom Harkness [Tue, 3 Apr 2018 06:14:51 +0000 (16:14 +1000)]
Fix for swapped parity when using lf_bulk_program.lua (#591)
pwpiwi [Sat, 31 Mar 2018 07:52:43 +0000 (09:52 +0200)]
USB comm: prepare for @micolous change (PR#463) (#587)
* move communication related code from proxmark3.c and cmdmain.c to new file comms.c
* replace byte_t by uint8_t in uart_posix.c and uart_win32.c
* move OpenProxmark() and CloseProxmark() from flasher.c to flash.c
* move print_lock mutex including initializer to ui.c
* minor changes in printing help texts
* no changes in comms functionality yet
pwpiwi [Fri, 30 Mar 2018 15:55:41 +0000 (17:55 +0200)]
add: save and load options in hf list (#577)
AnthraX1 [Fri, 30 Mar 2018 15:54:45 +0000 (02:54 +1100)]
Fix empty key list bug in mfkeys.lua (#579)
When input key list size is greater than 85, table.concat() returns empty because the last parameter is the end offset not the increment value.
pwpiwi [Wed, 28 Mar 2018 12:58:46 +0000 (14:58 +0200)]
Merge pull request #589 from Proxmark/revert-588-indala-preamble-fix
Revert "Fix offset Indala UID display"
marshmellow42 [Wed, 28 Mar 2018 12:50:08 +0000 (08:50 -0400)]
Revert "Fix offset Indala UID display"
Iceman [Wed, 28 Mar 2018 11:10:33 +0000 (13:10 +0200)]
Merge pull request #588 from megabug/indala-preamble-fix
Fix offset Indala UID display
Matthew Daley [Wed, 28 Mar 2018 10:37:07 +0000 (23:37 +1300)]
Fix offset Indala UID display
Commit
1dae9811f22b7f2cea340cee6945cb349046129d extended the amount of
fixed bits searched for when decoding 64-bit Indala. These additional
bits come from the end of one UID, and therefore need to be skipped past
when actually retrieving the UID.
James Chambers [Fri, 23 Mar 2018 19:26:30 +0000 (15:26 -0400)]
mfu read block: retry block with bad CRC (#584)
* mfu read block: retry block with bad CRC, command timeout, or unknown response.
Michael Farrell [Wed, 21 Mar 2018 15:05:03 +0000 (02:05 +1100)]
OSX: Multiple libedit/readline fixes (#585)
* OSX: Multiple libedit/readline fixes.
W8M2Hg9lLmWqXSGC [Mon, 26 Feb 2018 06:25:21 +0000 (17:25 +1100)]
Merge pull request #580 from Proxmark/iceman1001-patch-1
Update README.md
Iceman [Mon, 26 Feb 2018 06:16:08 +0000 (07:16 +0100)]
Update README.md
Added hackerwarehouse
Iceman [Thu, 22 Feb 2018 13:08:33 +0000 (14:08 +0100)]
Merge pull request #578 from Tom5ive/master
fix for swapped parity bits
Tom Harkness [Thu, 22 Feb 2018 12:38:53 +0000 (23:38 +1100)]
fix for swapped parity bits
Iceman [Sat, 17 Feb 2018 11:39:19 +0000 (12:39 +0100)]
Merge pull request #565 from Proxcloud/usb_android
Allow non-root access on Android devices
Iceman [Wed, 14 Feb 2018 22:36:41 +0000 (23:36 +0100)]
Merge pull request #572 from merlokk/hflistms_fix
`hf list mf` fix key length in printf
merlokk [Wed, 14 Feb 2018 22:20:00 +0000 (00:20 +0200)]
small fix
merlokk [Wed, 14 Feb 2018 22:18:02 +0000 (00:18 +0200)]
small fix `hf list mf`
Iceman [Wed, 14 Feb 2018 21:06:29 +0000 (22:06 +0100)]
Merge pull request #571 from merlokk/hf_list_mf
added command `hf list mf`
Iceman [Wed, 14 Feb 2018 21:06:00 +0000 (22:06 +0100)]
Merge pull request #570 from marshmellow42/master
improve lf cmdread
marshmellow42 [Wed, 14 Feb 2018 20:41:39 +0000 (15:41 -0500)]
update changelog
+fix a comment typo
+ move clear bigbuf after fpgadownloadandgo...
merlokk [Wed, 14 Feb 2018 10:36:22 +0000 (12:36 +0200)]
small fix and added line to changelog.
merlokk [Tue, 13 Feb 2018 15:14:51 +0000 (17:14 +0200)]
move annotate* functions
merlokk [Tue, 13 Feb 2018 15:07:49 +0000 (17:07 +0200)]
added hardnested sketch. final cleaning.
merlokk [Tue, 13 Feb 2018 13:12:41 +0000 (15:12 +0200)]
nested works
merlokk [Tue, 13 Feb 2018 10:35:33 +0000 (12:35 +0200)]
code cleaning
merlokk [Tue, 13 Feb 2018 10:33:15 +0000 (12:33 +0200)]
check parity works
merlokk [Mon, 12 Feb 2018 16:53:12 +0000 (18:53 +0200)]
added parity check of deciphered command
Oleg Moiseenko [Sat, 10 Feb 2018 22:45:12 +0000 (00:45 +0200)]
small fix
Oleg Moiseenko [Sat, 10 Feb 2018 22:44:24 +0000 (00:44 +0200)]
added cipherstream recovery
Oleg Moiseenko [Sat, 10 Feb 2018 22:40:24 +0000 (00:40 +0200)]
move ks to authdata
marshmellow42 [Sat, 10 Feb 2018 22:30:32 +0000 (17:30 -0500)]
reconfigure lf cmdread ...
to use lf config settings instead of it's own settings. (now allows
full options of lf config...)
also it will now run `data samples` when the command completes making it
not necessary to run manually...
note: adjusted client wait message as it was confusing.
Oleg Moiseenko [Sat, 10 Feb 2018 22:28:23 +0000 (00:28 +0200)]
added some cone in nested. not tested.
Oleg Moiseenko [Sat, 10 Feb 2018 21:28:15 +0000 (23:28 +0200)]
added destroy
Oleg Moiseenko [Sat, 10 Feb 2018 21:25:28 +0000 (23:25 +0200)]
mock of key checking
Oleg Moiseenko [Sat, 10 Feb 2018 21:06:01 +0000 (23:06 +0200)]
added mock of key check
Oleg Moiseenko [Sat, 10 Feb 2018 20:33:32 +0000 (22:33 +0200)]
hf list mf 1st auth works
Oleg Moiseenko [Sat, 10 Feb 2018 20:10:38 +0000 (22:10 +0200)]
small fix util.c
Oleg Moiseenko [Sat, 10 Feb 2018 18:41:56 +0000 (20:41 +0200)]
fix appearance
Oleg Moiseenko [Sat, 10 Feb 2018 18:28:30 +0000 (20:28 +0200)]
correct 1st key calculation
Oleg Moiseenko [Sat, 10 Feb 2018 17:19:56 +0000 (19:19 +0200)]
added get parity
Oleg Moiseenko [Sat, 10 Feb 2018 17:06:34 +0000 (19:06 +0200)]
small fix
Oleg Moiseenko [Sat, 10 Feb 2018 17:03:29 +0000 (19:03 +0200)]
combine all auth data to single struct and fill it
marshmellow42 [Fri, 9 Feb 2018 20:49:55 +0000 (15:49 -0500)]
add bitbang option to lf cmdread
by setting delay to 0 we can use cmd binary to bitbang the antenna.
note that the timing isn't perfect (especially on the off periods) but
is fairly close. worst i've seen it off is 8us on a large off period.
but i don't have the best test equipment...
merlokk [Fri, 9 Feb 2018 17:40:39 +0000 (19:40 +0200)]
added check reader/tag
merlokk [Fri, 9 Feb 2018 17:32:17 +0000 (19:32 +0200)]
added some get auth data
merlokk [Fri, 9 Feb 2018 16:23:04 +0000 (18:23 +0200)]
moved some functions and added auth sequence annotation
merlokk [Fri, 9 Feb 2018 15:37:31 +0000 (17:37 +0200)]
added cmdhflist file
Oleg Moiseenko [Fri, 9 Feb 2018 14:50:55 +0000 (16:50 +0200)]
add nested auth decoding to `hf mf sniff`
Iceman [Thu, 8 Feb 2018 18:02:16 +0000 (19:02 +0100)]
Merge pull request #569 from pwpiwi/fix_WDT_crash
fix hf mf mifare (WDT crash)
Proxcloud [Thu, 8 Feb 2018 14:32:08 +0000 (22:32 +0800)]
make product string even length
pwpiwi [Thu, 8 Feb 2018 13:50:03 +0000 (14:50 +0100)]
hf mf mifare:
* prevent WDT crash on repeated tries
* comes with faster execution as side effect
* use uint8_t instead of byte_t
* populate ar instead of (correctly) assuming that it is zero
* remove the "will take a few seconds longer" message because it is no longer true
Proxcloud [Thu, 8 Feb 2018 12:40:57 +0000 (20:40 +0800)]
change product desc to 9 and add extra null byte
Proxcloud [Thu, 8 Feb 2018 11:43:03 +0000 (19:43 +0800)]
remove debug change
Proxcloud [Thu, 8 Feb 2018 11:37:55 +0000 (19:37 +0800)]
remove old Manufacturer description code. fix Product description length
Proxcloud [Thu, 8 Feb 2018 09:47:40 +0000 (17:47 +0800)]
Remove BOS descriptor, leave just manufacturer descriptor for Android
Iceman [Thu, 8 Feb 2018 03:15:42 +0000 (04:15 +0100)]
fix: hf mf mifare - populate keylist (#568)
This will solve the long running of the attack, since all candidate keys will be tested.
Proxcloud [Tue, 6 Feb 2018 17:07:48 +0000 (01:07 +0800)]
Add BOS USB descriptor. This allows non-root access on Android devices
Iceman [Tue, 6 Feb 2018 07:15:03 +0000 (08:15 +0100)]
Merge pull request #560 from pwpiwi/fix_hfmfmif
fix: prevent hf mf mifare from always running twice
pwpiwi [Sat, 3 Feb 2018 17:24:32 +0000 (18:24 +0100)]
fix: prevent hf mf mifare from always running twice
(issue #510)
Iceman [Thu, 1 Feb 2018 08:49:43 +0000 (09:49 +0100)]
Merge pull request #558 from pwpiwi/fix_alignment
add force_align_arg_pointer attribute to all callback functions
Arnie97 [Thu, 1 Feb 2018 07:09:14 +0000 (15:09 +0800)]
hf mf nested: use bitwise or instead. (#556)
pwpiwi [Wed, 31 Jan 2018 17:31:51 +0000 (18:31 +0100)]
add force_align_arg_pointer attribute to all callback functions
* inspired by issue #404 and respective fix PR #538
* possible fix for mysterious crashes, e.g. issue #497 and http://www.proxmark.org/forum/viewtopic.php?id=5388
pwpiwi [Wed, 31 Jan 2018 07:14:56 +0000 (08:14 +0100)]
update license conditions in armsrc/optimized_cipher.[ch] (#554)
Iceman [Fri, 26 Jan 2018 18:31:23 +0000 (19:31 +0100)]
Merge pull request #555 from Arnie97/master
hf mf nested: transfer keys to the correct block in one sector mode.
Arnie97 [Fri, 26 Jan 2018 17:55:38 +0000 (01:55 +0800)]
hf mf nested: transfer keys to the correct block in one sector mode.
Arnie97 [Fri, 26 Jan 2018 17:09:56 +0000 (01:09 +0800)]
hf mf eset: reuse mfEmlSetMem().
Iceman [Thu, 25 Jan 2018 08:50:47 +0000 (09:50 +0100)]
Merge pull request #553 from Arnie97/master
Minor fixes
Arnie97 [Thu, 25 Jan 2018 06:48:26 +0000 (14:48 +0800)]
mfkeys.lua: Remove trailing whitespaces.
Arnie97 [Thu, 25 Jan 2018 06:48:12 +0000 (14:48 +0800)]
mfkeys.lua: Align empty cells in the table.
Arnie97 [Thu, 25 Jan 2018 06:10:41 +0000 (14:10 +0800)]
mfkeys.lua: Remove the user input helpers (now in lualibs/utils.lua)
Arnie97 [Thu, 25 Jan 2018 05:49:40 +0000 (13:49 +0800)]
hf mf ecfill: Add the missing line break.
Arnie97 [Thu, 25 Jan 2018 05:43:01 +0000 (13:43 +0800)]
Fix typo in lua scripts: 1443a -> 14443a.
Iceman [Wed, 24 Jan 2018 09:47:59 +0000 (10:47 +0100)]
Merge pull request #551 from pwpiwi/remove_reveng
Remove reveng
pwpiwi [Mon, 8 Jan 2018 06:48:13 +0000 (07:48 +0100)]
Remove reveng
(its license was not compatible with PM3 license, see issue #527)
Iceman [Tue, 23 Jan 2018 16:43:07 +0000 (17:43 +0100)]
Merge pull request #550 from pwpiwi/fix_warnings
fix clang compiler warnings
pwpiwi [Tue, 23 Jan 2018 07:27:58 +0000 (08:27 +0100)]
fix clang compiler warnings
identified in http://www.proxmark.org/forum/viewtopic.php?id=5388
Iceman [Mon, 22 Jan 2018 18:33:41 +0000 (19:33 +0100)]
Merge pull request #549 from rkblackfire/master
Debug&Improvement of HW TUNE
rkblackfire [Mon, 22 Jan 2018 18:25:22 +0000 (19:25 +0100)]
Revert "dbg: Watchdog resets while 'hw tune lf'"
This reverts commit
fc175230f431e7e33c7628c6b31064d4f7d1e1ad .
rkblackfire [Mon, 22 Jan 2018 17:59:48 +0000 (18:59 +0100)]
chg: print only valid tuning data
only print the ranges which were tuned, thus not showing an error for
'lf antenna' when called 'hw tune hf' and vice versa
rkblackfire [Mon, 22 Jan 2018 17:54:29 +0000 (18:54 +0100)]
dbg: Watchdog resets while 'hw tune lf'
loop does not finish, u_int is always '>=0'
Iceman [Wed, 17 Jan 2018 22:16:08 +0000 (23:16 +0100)]
Merge pull request #548 from merlokk/mfsniff_fix
`hf mf sniff` not a small fix
merlokk [Wed, 17 Jan 2018 16:16:37 +0000 (18:16 +0200)]
added nested authentication "not implemented" warning
Iceman [Wed, 17 Jan 2018 15:11:56 +0000 (16:11 +0100)]
Merge pull request #546 from pwpiwi/fix_tune
hw tune improvements (based on issue #544)
merlokk [Wed, 17 Jan 2018 14:12:50 +0000 (16:12 +0200)]
fix eml file format
merlokk [Wed, 17 Jan 2018 14:01:56 +0000 (16:01 +0200)]
added magic cards
merlokk [Wed, 17 Jan 2018 13:57:24 +0000 (15:57 +0200)]
ignore SELECT ALL
merlokk [Wed, 17 Jan 2018 13:48:01 +0000 (15:48 +0200)]
SNF_WUPREQ and SNF_SAK harmonized)
merlokk [Wed, 17 Jan 2018 12:14:36 +0000 (14:14 +0200)]
deleted save UID from card
merlokk [Wed, 17 Jan 2018 12:10:26 +0000 (14:10 +0200)]
delete opposite states fix
merlokk [Tue, 16 Jan 2018 15:54:54 +0000 (17:54 +0200)]
fixed #541
merlokk [Tue, 16 Jan 2018 12:34:04 +0000 (14:34 +0200)]
`hf mf sniff` small fix
Iceman [Mon, 15 Jan 2018 15:06:37 +0000 (16:06 +0100)]
Merge pull request #503 from merlokk/travis
Travis