Commit graph

2124 commits

Author SHA1 Message Date
pwpiwi
fa85b08504 fix iso14a_set_timeout() adjustment 2017-12-11 20:40:09 +01:00
pwpiwi
7c7327e7c8 fix: hf mf hardnested failed with new WUPA timing
* allow additional 2 ssp_frame cycles to detect SOF
* use only respective functions to get/set iso14a_timeout
* remove waiting time in MifareAcquireEncryptedNonces(). This is covered by GetATQA() now.
2017-12-10 19:27:46 +01:00
Iceman
bc3b2f7f94
Merge pull request #511 from ikarus23/typo
fix: usage and sample text of hf mf cwipe
2017-12-07 00:00:10 +01:00
ikarus
6148817a7f fix: usage and sample text of hf mf cwipe 2017-12-06 23:30:27 +01:00
Iceman
8afa9712f7
Merge pull request #508 from pwpiwi/fix_AVX512
fixing the fix: older shells don't know about &>
2017-12-06 17:26:49 +01:00
pwpiwi
1ff75f168b fixing the fix: older shells don't know about &> 2017-12-06 09:25:10 +01:00
Iceman
0fb3e45541
Merge pull request #507 from pwpiwi/fix_AVX512
fix: AVX512 detection
2017-12-05 17:26:20 +01:00
Iceman
385e4b5019
Merge pull request #504 from merlokk/emv3
EMV3. hf emv exec 2nd part
2017-12-05 15:39:37 +01:00
pwpiwi
c656c870ae fix: AVX512 detection 2017-12-05 08:25:10 +01:00
merlokk
7a7afeba5c small refactoring 2017-12-04 22:20:29 +02:00
merlokk
5a1b25ac31 added 9f0a tag 2017-12-03 20:36:04 +02:00
merlokk
f7ec230e98 added a tag 2017-12-03 20:28:36 +02:00
merlokk
1e431c5d36 get rid of tabs) 2017-12-02 22:12:41 +02:00
merlokk
b0c73387f0 added if 2017-12-02 22:10:25 +02:00
merlokk
10d4f82338 transactions MSD and M/Chip, qVSDC works 2017-12-02 21:47:30 +02:00
Iceman
2db66b01da
Merge pull request #493 from merlokk/emv2
Emv2. next part of EMV work
2017-12-02 18:39:14 +01:00
merlokk
245a6b2083 added xcode 9 and 9.1 coz 8 and 8.1 links to 8.3 2017-12-02 16:41:39 +02:00
merlokk
3c9b6573ec remove show options 2017-12-02 16:24:47 +02:00
merlokk
a36b278fad add options show 2017-12-02 13:06:51 +02:00
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