]>
git.zerfleddert.de Git - proxmark3-svn/log
Iceman [Wed, 6 Dec 2017 16:26:49 +0000 (17:26 +0100)]
Merge pull request #508 from pwpiwi/fix_AVX512
fixing the fix: older shells don't know about &>
pwpiwi [Wed, 6 Dec 2017 08:25:10 +0000 (09:25 +0100)]
fixing the fix: older shells don't know about &>
Iceman [Tue, 5 Dec 2017 16:26:20 +0000 (17:26 +0100)]
Merge pull request #507 from pwpiwi/fix_AVX512
fix: AVX512 detection
Iceman [Tue, 5 Dec 2017 14:39:37 +0000 (15:39 +0100)]
Merge pull request #504 from merlokk/emv3
EMV3. hf emv exec 2nd part
pwpiwi [Tue, 5 Dec 2017 07:25:10 +0000 (08:25 +0100)]
fix: AVX512 detection
merlokk [Mon, 4 Dec 2017 20:20:29 +0000 (22:20 +0200)]
small refactoring
merlokk [Sun, 3 Dec 2017 18:36:04 +0000 (20:36 +0200)]
added 9f0a tag
merlokk [Sun, 3 Dec 2017 18:28:36 +0000 (20:28 +0200)]
added a tag
merlokk [Sat, 2 Dec 2017 19:47:30 +0000 (21:47 +0200)]
transactions MSD and M/Chip, qVSDC works
Iceman [Sat, 2 Dec 2017 17:39:14 +0000 (18:39 +0100)]
Merge pull request #493 from merlokk/emv2
Emv2. next part of EMV work
Iceman [Thu, 30 Nov 2017 19:04:16 +0000 (20:04 +0100)]
Merge pull request #502 from merlokk/apduhelp
added hint on `hf 14a apdu`. close #495
merlokk [Thu, 30 Nov 2017 17:34:20 +0000 (19:34 +0200)]
added hint on `hf 14a apdu`. close #495
Iceman [Thu, 30 Nov 2017 11:46:40 +0000 (12:46 +0100)]
Update fpgaloader.c (#500)
This address part1 in issue https://github.com/Proxmark/proxmark3/issues/499
Device power out 13.56Mhz when started (initialised). This output is not stopped until arbitary command is sent.
Iceman [Tue, 28 Nov 2017 20:26:57 +0000 (21:26 +0100)]
Merge pull request #488 from pwpiwi/fix_usbpower
fix: USB Power requirements
pwpiwi [Tue, 28 Nov 2017 20:22:29 +0000 (21:22 +0100)]
Change USB Configuration to "Bus Powered"
Iceman [Sun, 26 Nov 2017 05:15:48 +0000 (06:15 +0100)]
Merge pull request #494 from qaisjp/patch-1
Make README file markdown
Qais Patankar [Sun, 26 Nov 2017 04:41:24 +0000 (04:41 +0000)]
Make README file markdown
merlokk [Sat, 25 Nov 2017 19:17:56 +0000 (21:17 +0200)]
optimization UDOL creation. does not affect on functionality.
merlokk [Sat, 25 Nov 2017 12:40:23 +0000 (14:40 +0200)]
Added `hf emv exec` - command for execute EMV transaction
Added to `hf emv exec` MSD path for VISA and Mastercard and some other compatible EMV cards
merlokk [Sat, 25 Nov 2017 12:30:53 +0000 (14:30 +0200)]
merged emvcore
merlokk [Sat, 25 Nov 2017 10:58:50 +0000 (12:58 +0200)]
part of changes
Iceman [Sat, 25 Nov 2017 08:51:39 +0000 (09:51 +0100)]
Merge pull request #491 from pwpiwi/mod_select
minor iso14443a timing fixes to avoid select errors
Iceman [Fri, 24 Nov 2017 11:39:45 +0000 (12:39 +0100)]
Merge pull request #486 from KenzyCarey/master
Add brutesim script
pwpiwi [Wed, 22 Nov 2017 16:46:00 +0000 (17:46 +0100)]
minor iso14443a timing fixes to avoid select errors:
* take setup frame guard time (SFGT) into account
* adjust iso14a_timeout by FPGA delays
* don't give up on first WUPA. Retry several times
Oleg Moiseenko [Wed, 22 Nov 2017 05:16:33 +0000 (07:16 +0200)]
Add: Emv first part of commands
* hf emv search
* hf emv pse
* hf emv select
* hf emv exec command - only part of functionality
pwpiwi [Tue, 21 Nov 2017 06:31:42 +0000 (07:31 +0100)]
fix: avoid SspClk overflow due to incomplete reset
* should fix watchdog reset during hf mf mifare. Thanks @iceman1001 for the hint.
Kenzy Carey [Fri, 17 Nov 2017 22:42:52 +0000 (14:42 -0800)]
Add files via upload
pwpiwi [Fri, 17 Nov 2017 08:13:37 +0000 (09:13 +0100)]
fix: USB Power requirements
* correctly indicate the maximum current drawn from the USB bus
Oleg Moiseenko [Wed, 15 Nov 2017 06:49:18 +0000 (08:49 +0200)]
minor fixes
* fix timeout set in PR #481
* fix warning in util.c printf
pwpiwi [Wed, 15 Nov 2017 06:47:18 +0000 (07:47 +0100)]
Complete WTX handling
marshmellow42 [Mon, 13 Nov 2017 14:42:56 +0000 (09:42 -0500)]
Merge pull request #480 from pwpiwi/fix_nested
fix memory overflow in hf mf nested (issue #479)
pwpiwi [Sun, 12 Nov 2017 17:08:57 +0000 (18:08 +0100)]
fix memory overflow in hf mf nested (issue #479)
Iceman [Sat, 11 Nov 2017 21:45:37 +0000 (22:45 +0100)]
Merge pull request #478 from wsmoses/master
Fix memory bounds error
Iceman [Sat, 11 Nov 2017 21:16:19 +0000 (22:16 +0100)]
Merge pull request #477 from merlokk/wtx
Added work with S-Block WTX in 14a apdu on arm side
William S. Moses [Sat, 11 Nov 2017 21:08:57 +0000 (16:08 -0500)]
Fix memory bounds error
merlokk [Sat, 11 Nov 2017 21:05:08 +0000 (23:05 +0200)]
added some info from @peterfillmore fork
merlokk [Sat, 11 Nov 2017 20:56:50 +0000 (22:56 +0200)]
Added work with S-Block WTX in 14a apdu on arm side
Iceman [Fri, 10 Nov 2017 23:39:29 +0000 (00:39 +0100)]
Merge pull request #475 from merlokk/master
true fix #472 )))
merlokk [Fri, 10 Nov 2017 23:28:20 +0000 (01:28 +0200)]
true fix #472 )))
Iceman [Fri, 10 Nov 2017 23:24:38 +0000 (00:24 +0100)]
Merge pull request #474 from merlokk/df_fix
change `ul_switch_off_field` to `DropField` fix #473
Iceman [Fri, 10 Nov 2017 23:24:20 +0000 (00:24 +0100)]
Merge pull request #471 from marshmellow42/master
fix lf search bugs when no tag is on antenna …
merlokk [Fri, 10 Nov 2017 23:19:34 +0000 (01:19 +0200)]
change `ul_switch_off_field` to `DropField` fix #473
Iceman [Fri, 10 Nov 2017 22:45:45 +0000 (23:45 +0100)]
Merge pull request #472 from merlokk/master
fix #468
merlokk [Fri, 10 Nov 2017 22:43:29 +0000 (00:43 +0200)]
fix #468
Iceman [Fri, 10 Nov 2017 22:21:26 +0000 (23:21 +0100)]
Merge pull request #470 from pwpiwi/mod_indent
add: proper indentation when printing TLV objects
pwpiwi [Fri, 10 Nov 2017 22:09:08 +0000 (23:09 +0100)]
dump only leaf TLV data
marshmellow42 [Fri, 10 Nov 2017 21:03:55 +0000 (16:03 -0500)]
fix incorrect variable name
that is what i get for going back over my code and trying to mimic the
naming style used previously...
marshmellow42 [Fri, 10 Nov 2017 20:56:52 +0000 (15:56 -0500)]
fix lf search bugs when no tag is on antenna
cotag read could enter endless loop, now cancels if the next bit doesn't
appear
em4x05 detection would loop due to a threshold never being met, now has
a dump out after 1000 samples tested.
fixed some indenting in hitag2 while i was reviewing that code for
potential endless loops...
pwpiwi [Fri, 10 Nov 2017 20:39:10 +0000 (21:39 +0100)]
add: proper indentation when printing TLV objects
Iceman [Fri, 10 Nov 2017 19:53:20 +0000 (20:53 +0100)]
Merge pull request #466 from pwpiwi/mod_14areader
revert field on/off in hf 14a reader, fix typo
pwpiwi [Fri, 10 Nov 2017 19:11:51 +0000 (20:11 +0100)]
revert field on/off in hf 14a reader
fix typo
Iceman [Fri, 10 Nov 2017 17:07:25 +0000 (18:07 +0100)]
Merge pull request #462 from pwpiwi/fix_hfmfsim
Fix hf mf sim (issue #412)
Iceman [Fri, 10 Nov 2017 16:14:38 +0000 (17:14 +0100)]
Merge pull request #461 from merlokk/14a_rework3
added `hf 14a apdu` #447 part 3
merlokk [Fri, 10 Nov 2017 07:15:56 +0000 (09:15 +0200)]
move include modules from h to c file
merlokk [Thu, 9 Nov 2017 20:01:00 +0000 (22:01 +0200)]
eliminate double DropField command
merlokk [Thu, 9 Nov 2017 14:39:40 +0000 (16:39 +0200)]
changed iso14aapdu arm side and client
merlokk [Fri, 3 Nov 2017 11:42:38 +0000 (13:42 +0200)]
moved includes, added clear_trace flag (it was there...) and fixed multiapdu iso14443 stream
pwpiwi [Thu, 2 Nov 2017 20:37:42 +0000 (21:37 +0100)]
Merge branch 'master' into fix_hfmfsim
pwpiwi [Tue, 24 Oct 2017 05:49:14 +0000 (07:49 +0200)]
fix hf mf sim:
* more timing fixes
* correctly determine correction bit (taken from iceman's fork)
* add checking of Access Conditions for Read command
* never allow reading KeyA
merlokk [Thu, 2 Nov 2017 12:28:05 +0000 (14:28 +0200)]
added changelog
Oleg Moiseenko [Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)]
Merge branch 'master' into 14a_rework3
merlokk [Thu, 2 Nov 2017 12:11:42 +0000 (14:11 +0200)]
tlv decoder works.
Oleg Moiseenko [Wed, 1 Nov 2017 19:37:18 +0000 (21:37 +0200)]
added changelog (#460)
Oleg Moiseenko [Wed, 1 Nov 2017 16:48:59 +0000 (18:48 +0200)]
improve `hf 14a info` (#457)
* added validate_prng_nonce from iceman1001 fork
* added DetectClassicPrng from iceman1001 fork
Oleg Moiseenko [Wed, 1 Nov 2017 16:44:43 +0000 (18:44 +0200)]
change comment in iso14443a.c (#459)
merlokk [Wed, 1 Nov 2017 16:34:15 +0000 (18:34 +0200)]
fix behavier reading iso14443-3 and iso14443-4 cards
merlokk [Wed, 1 Nov 2017 16:22:03 +0000 (18:22 +0200)]
revert SAK check
merlokk [Wed, 1 Nov 2017 15:13:27 +0000 (17:13 +0200)]
Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3
merlokk [Wed, 1 Nov 2017 15:02:35 +0000 (17:02 +0200)]
now SAK check is OK
merlokk [Wed, 1 Nov 2017 14:55:12 +0000 (16:55 +0200)]
deleted condition in iso14a select (sak & 0x20 ==0) - error. Usually SAK = 88
marshmellow42 [Wed, 1 Nov 2017 11:57:30 +0000 (07:57 -0400)]
Merge pull request #456 from merlokk/hfreaderfix
fixed bug with `hf search 14a`
merlokk [Wed, 1 Nov 2017 11:54:03 +0000 (13:54 +0200)]
fixed bug with `hf search 14a`
merlokk [Wed, 1 Nov 2017 11:38:29 +0000 (13:38 +0200)]
TLV decoding works
Oleg Moiseenko [Wed, 1 Nov 2017 07:51:05 +0000 (09:51 +0200)]
Add hf mf info, change hf mf reader (#452)
* copy functionality from `hf 14a reader` to `hf 14a info`
* added command `hf 14a reader` with simple anticollision-select procedure.
* add parameters to `hf 14a reader`. may start and end acting as reader
merlokk [Tue, 31 Oct 2017 17:19:49 +0000 (19:19 +0200)]
improved GetAPDUCode()
merlokk [Tue, 31 Oct 2017 17:11:23 +0000 (19:11 +0200)]
small refactoring
merlokk [Tue, 31 Oct 2017 16:14:32 +0000 (18:14 +0200)]
added showing apdu response codes
merlokk [Tue, 31 Oct 2017 14:25:42 +0000 (16:25 +0200)]
move strucrture to .h file
merlokk [Tue, 31 Oct 2017 14:20:23 +0000 (16:20 +0200)]
export apdu function
merlokk [Tue, 31 Oct 2017 14:08:58 +0000 (16:08 +0200)]
apdu sending refactoring
merlokk [Tue, 31 Oct 2017 13:15:57 +0000 (15:15 +0200)]
param parsing convert to procedures
merlokk [Tue, 31 Oct 2017 11:28:16 +0000 (13:28 +0200)]
apdu works.
merlokk [Mon, 30 Oct 2017 15:58:43 +0000 (17:58 +0200)]
fixed bug in CmdHF14ACmdRaw: if we cant select we send command anyway...
merlokk [Mon, 30 Oct 2017 15:29:03 +0000 (17:29 +0200)]
iso14_apdu works via logical channel. not as it needs. it needs to change to raw(
Oleg Moiseenko [Sun, 29 Oct 2017 15:34:51 +0000 (17:34 +0200)]
small fixes in ReaderIso14443a() (#446)
merlokk [Fri, 27 Oct 2017 16:02:45 +0000 (19:02 +0300)]
added sketch for command `hf 14a apdu`
merlokk [Fri, 27 Oct 2017 15:45:42 +0000 (18:45 +0300)]
added `hf 14a apdu` command.
Oleg Moiseenko [Fri, 27 Oct 2017 14:58:24 +0000 (17:58 +0300)]
appveyor.yml. display return values (#451)
* display return values from commands and compare them with value. as promised in #440
pwpiwi [Fri, 27 Oct 2017 07:56:46 +0000 (09:56 +0200)]
Revert "Comms refactor (prerequisite of libproxmark work) (#371)" (#450)
This reverts commit
afdcb8c159a73aba95a017f1cfec98e8fa2b93c1 .
Michael Farrell [Thu, 26 Oct 2017 19:54:27 +0000 (06:54 +1100)]
Comms refactor (prerequisite of libproxmark work) (#371)
* Refactor the comms code only from PR#346, without comms_globals.h.
* OSX: Add note for example serial port
Oleg Moiseenko [Thu, 26 Oct 2017 17:09:53 +0000 (20:09 +0300)]
code cleaning (#445)
Oleg Moiseenko [Thu, 26 Oct 2017 16:32:18 +0000 (19:32 +0300)]
small improvement in tests (test result in green or red) (#448)
Iceman [Thu, 26 Oct 2017 09:46:20 +0000 (11:46 +0200)]
Merge pull request #440 from merlokk/c3
improve appveyor.yml
Oleg Moiseenko [Wed, 25 Oct 2017 05:56:03 +0000 (08:56 +0300)]
identification fix for magic chinese cards (#444)
* fixed #411
Iceman [Tue, 24 Oct 2017 12:28:16 +0000 (14:28 +0200)]
Merge pull request #443 from doegox/flush
Flush stdout when waiting for /dev/ttyACM0
Philippe Teuwen [Tue, 24 Oct 2017 12:10:52 +0000 (14:10 +0200)]
Flush stdout when waiting for /dev/ttyACM0
pwpiwi [Tue, 24 Oct 2017 05:48:38 +0000 (07:48 +0200)]
fix hw status (and USB comm in general) (#434)
* don't ignore ReadLine() errors (Windows)
* lock CmdBuffer with Mutex
* refactor WaitForResponseTimeoutW
Iceman [Mon, 23 Oct 2017 13:05:07 +0000 (15:05 +0200)]
Merge pull request #438 from pwpiwi/fpga_14b
FPGA changes ISO14443B:
merlokk [Mon, 23 Oct 2017 10:43:46 +0000 (13:43 +0300)]
added write-host for tests
Michael Farrell [Mon, 23 Oct 2017 07:04:06 +0000 (18:04 +1100)]
Multiple USB-CDC changes (attempt 6) (#439)
- Fix reporting of string descriptors.
- Add note about ModemManager matching on the manufacturer string.