merlokk
2e35aa3aa7
added info
2017-12-02 11:51:12 +02:00
merlokk
755c72b798
rename travis file
2017-12-01 18:57:31 +02:00
merlokk
b6c370f171
added REPOSITORY_EP var
2017-12-01 18:54:54 +02:00
merlokk
b35c11f95e
init travis from https://github.com/pwpiwi/proxmark3/tree/travis_test
2017-12-01 18:49:31 +02:00
Iceman
d217282541
Merge pull request #502 from merlokk/apduhelp
...
added hint on `hf 14a apdu`. close #495
2017-11-30 20:04:16 +01:00
merlokk
606eddca8d
added hint on hf 14a apdu. close #495
2017-11-30 19:34:20 +02:00
Iceman
dc93020701
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.
2017-11-30 12:46:40 +01:00
Iceman
653e5ed3ca
Merge pull request #488 from pwpiwi/fix_usbpower
...
fix: USB Power requirements
2017-11-28 21:26:57 +01:00
pwpiwi
f380317220
Change USB Configuration to "Bus Powered"
2017-11-28 21:22:29 +01:00
Iceman
14971507b1
Merge pull request #494 from qaisjp/patch-1
...
Make README file markdown
2017-11-26 06:15:48 +01:00
Qais Patankar
1ccdd4f631
Make README file markdown
2017-11-26 04:41:24 +00:00
merlokk
78528074b1
optimization UDOL creation. does not affect on functionality.
2017-11-25 21:17:56 +02:00
merlokk
44128a0e9a
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
2017-11-25 14:40:23 +02:00
merlokk
87fc2dad14
merged emvcore
2017-11-25 14:30:53 +02:00
merlokk
66efdc1f64
part of changes
2017-11-25 12:58:50 +02:00
Iceman
45eb1383e3
Merge pull request #491 from pwpiwi/mod_select
...
minor iso14443a timing fixes to avoid select errors
2017-11-25 09:51:39 +01:00
Iceman
137dd5826e
Merge pull request #486 from KenzyCarey/master
...
Add brutesim script
2017-11-24 12:39:45 +01:00
pwpiwi
47b78133a0
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
2017-11-22 19:43:12 +01:00
Oleg Moiseenko
3c5fce2ba7
Add: Emv first part of commands
...
* hf emv search
* hf emv pse
* hf emv select
* hf emv exec command - only part of functionality
2017-11-22 06:16:33 +01:00
pwpiwi
4058a2d7df
fix: avoid SspClk overflow due to incomplete reset
...
* should fix watchdog reset during hf mf mifare. Thanks @iceman1001 for the hint.
2017-11-21 07:31:42 +01:00
Kenzy Carey
dfa1628ac3
Add files via upload
2017-11-17 14:42:52 -08:00
pwpiwi
0363be9358
fix: USB Power requirements
...
* correctly indicate the maximum current drawn from the USB bus
2017-11-17 09:13:37 +01:00
Oleg Moiseenko
c95affa8d3
minor fixes
...
* fix timeout set in PR #481
* fix warning in util.c printf
2017-11-15 07:49:18 +01:00
pwpiwi
db68bcdb06
Complete WTX handling
2017-11-15 07:47:18 +01:00
marshmellow42
aa264aba1d
Merge pull request #480 from pwpiwi/fix_nested
...
fix memory overflow in hf mf nested (issue #479 )
2017-11-13 09:42:56 -05:00
pwpiwi
e537c3e894
fix memory overflow in hf mf nested (issue #479 )
2017-11-12 18:08:57 +01:00
Iceman
c3511781a1
Merge pull request #478 from wsmoses/master
...
Fix memory bounds error
2017-11-11 22:45:37 +01:00
Iceman
230eaa5391
Merge pull request #477 from merlokk/wtx
...
Added work with S-Block WTX in 14a apdu on arm side
2017-11-11 22:16:19 +01:00
William S. Moses
874572d419
Fix memory bounds error
2017-11-11 16:15:29 -05:00
merlokk
ba4f95b4af
added some info from @peterfillmore fork
2017-11-11 23:05:08 +02:00
merlokk
a63505c953
Added work with S-Block WTX in 14a apdu on arm side
2017-11-11 22:56:50 +02:00
Iceman
c0e852f907
Merge pull request #475 from merlokk/master
...
true fix #472 )))
2017-11-11 00:39:29 +01:00
merlokk
298143218a
true fix #472 )))
2017-11-11 01:28:20 +02:00
Iceman
8b5ec1f4a6
Merge pull request #474 from merlokk/df_fix
...
change `ul_switch_off_field` to `DropField` fix #473
2017-11-11 00:24:38 +01:00
Iceman
7c84f80657
Merge pull request #471 from marshmellow42/master
...
fix lf search bugs when no tag is on antenna …
2017-11-11 00:24:20 +01:00
merlokk
872337e019
change ul_switch_off_field to DropField fix #473
2017-11-11 01:19:34 +02:00
Iceman
c425cc7efc
Merge pull request #472 from merlokk/master
...
fix #468
2017-11-10 23:45:45 +01:00
merlokk
77499f6fb2
fix #468
2017-11-11 00:43:29 +02:00
Iceman
d940ebfbad
Merge pull request #470 from pwpiwi/mod_indent
...
add: proper indentation when printing TLV objects
2017-11-10 23:21:26 +01:00
pwpiwi
33a9982c76
dump only leaf TLV data
2017-11-10 23:09:08 +01:00
marshmellow42
cb593491df
fix incorrect variable name
...
that is what i get for going back over my code and trying to mimic the
naming style used previously...
2017-11-10 16:03:55 -05:00
marshmellow42
217cfb6b29
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...
2017-11-10 15:57:55 -05:00
pwpiwi
43912d6349
add: proper indentation when printing TLV objects
2017-11-10 21:54:07 +01:00
Iceman
7c8115b273
Merge pull request #466 from pwpiwi/mod_14areader
...
revert field on/off in hf 14a reader, fix typo
2017-11-10 20:53:20 +01:00
pwpiwi
f5adb06fae
revert field on/off in hf 14a reader
...
fix typo
2017-11-10 20:14:00 +01:00
Iceman
e464f62258
Merge pull request #462 from pwpiwi/fix_hfmfsim
...
Fix hf mf sim (issue #412 )
2017-11-10 18:07:25 +01:00
Iceman
881eacc8aa
Merge pull request #461 from merlokk/14a_rework3
...
added `hf 14a apdu` #447 part 3
2017-11-10 17:14:38 +01:00
merlokk
9658b9e137
move include modules from h to c file
2017-11-10 09:15:56 +02:00
merlokk
86a1c1dc25
eliminate double DropField command
2017-11-09 22:01:00 +02:00
merlokk
b7d3e89923
changed iso14aapdu arm side and client
2017-11-09 16:39:40 +02:00
