7121808f28
Merge branch 'khorben/blocking'
2017-12-13 23:07:45 +01:00
b9a8782828
Merge branch 'khorben/netbsd'
2017-12-13 23:07:41 +01:00
b215c2fac7
Merge branch 'khorben/script-list-crash'
2017-12-13 23:07:31 +01:00
3417a775e8
Merge branch 'khorben/extern'
2017-12-13 23:07:12 +01:00
f95eb23ebe
Merge branch 'khorben/warnings'
2017-12-13 23:07:08 +01:00
75e9fc825b
Avoid a crash in "script list"
...
This command crashes if the path to the executable directory could not
be found.
2017-12-13 22:59:33 +01:00
bf1c94092d
Also set the serial port as blocking
2017-12-13 22:23:07 +01:00
6f0f4abe8c
Fix build on NetBSD (conflicting macro)
2017-12-13 21:09:25 +01:00
c02d36a2f7
Also use posix_memalign() on NetBSD
...
This helps fix the build on this platform.
2017-12-13 21:08:50 +01:00
80bbafecfc
Fix detection of the executable directory on NetBSD
2017-12-13 21:08:50 +01:00
669957afee
Register NetBSD into the build system
...
This is probably not the best way. Also, I have not looked at Lua yet;
it may need to be built differently than with -DLUA_USE_LINUX.
2017-12-13 21:08:50 +01:00
39e3909ae2
Avoid a crash in "script list"
...
This command crashes if the path to the executable directory could not
be found.
2017-12-13 20:36:47 +01:00
8dfe981515
Do not use "extern" in header files
2017-12-13 16:58:27 +01:00
9707ba5567
Avoid a warning in client/util.c
2017-12-13 16:58:27 +01:00
e0b2de0cce
Fix warnings and missing #include for <ctype.h>
2017-12-13 16:58:27 +01:00
Iceman
feb1bf4184
Merge pull request #515 from pwpiwi/fix_14atimeout
...
fix: hf mf hardnested failed with new WUPA timing
2017-12-12 15:50:53 +01:00
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
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
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
