Commit Graph

  • 741566957d Do not use "extern" in header files khorben/extern Pierre Pronchery 2017-12-13 16:21:13 +01:00
  • 7121808f28 Merge branch 'khorben/blocking' master Pierre Pronchery 2017-12-13 23:07:45 +01:00
  • b9a8782828 Merge branch 'khorben/netbsd' Pierre Pronchery 2017-12-13 23:07:41 +01:00
  • b215c2fac7 Merge branch 'khorben/script-list-crash' Pierre Pronchery 2017-12-13 23:07:31 +01:00
  • 3417a775e8 Merge branch 'khorben/extern' Pierre Pronchery 2017-12-13 23:07:12 +01:00
  • f95eb23ebe Merge branch 'khorben/warnings' Pierre Pronchery 2017-12-13 23:07:08 +01:00
  • 75e9fc825b Avoid a crash in "script list" khorben/script-list-crash Pierre Pronchery 2017-12-13 17:03:22 +01:00
  • bf1c94092d Also set the serial port as blocking khorben/blocking Pierre Pronchery 2017-12-13 22:21:13 +01:00
  • 6f0f4abe8c Fix build on NetBSD (conflicting macro) Pierre Pronchery 2017-12-13 21:09:25 +01:00
  • c02d36a2f7 Also use posix_memalign() on NetBSD Pierre Pronchery 2017-12-13 20:46:59 +01:00
  • 80bbafecfc Fix detection of the executable directory on NetBSD Pierre Pronchery 2017-12-13 17:31:55 +01:00
  • 669957afee Register NetBSD into the build system Pierre Pronchery 2017-12-13 17:06:47 +01:00
  • 39e3909ae2 Avoid a crash in "script list" Pierre Pronchery 2017-12-13 17:03:22 +01:00
  • 6f4b0fce3a Fix detection of the executable directory on NetBSD khorben/netbsd Pierre Pronchery 2017-12-13 17:31:55 +01:00
  • bdeede6683 Register NetBSD into the build system Pierre Pronchery 2017-12-13 17:06:47 +01:00
  • 8e51b68e83 Avoid a crash in "script list" Pierre Pronchery 2017-12-13 17:03:22 +01:00
  • 8dfe981515 Do not use "extern" in header files Pierre Pronchery 2017-12-13 16:21:13 +01:00
  • 9707ba5567 Avoid a warning in client/util.c khorben/warnings Pierre Pronchery 2017-12-13 16:56:26 +01:00
  • e0b2de0cce Fix warnings and missing #include for <ctype.h> Pierre Pronchery 2017-12-13 16:54:32 +01:00
  • feb1bf4184
    Merge pull request #515 from pwpiwi/fix_14atimeout Iceman 2017-12-12 15:50:53 +01:00
  • fa85b08504 fix iso14a_set_timeout() adjustment pwpiwi 2017-12-11 20:40:09 +01:00
  • 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. pwpiwi 2017-12-10 11:57:15 +01:00
  • bc3b2f7f94
    Merge pull request #511 from ikarus23/typo Iceman 2017-12-07 00:00:10 +01:00
  • 6148817a7f fix: usage and sample text of hf mf cwipe ikarus 2017-12-06 23:30:27 +01:00
  • 8afa9712f7
    Merge pull request #508 from pwpiwi/fix_AVX512 Iceman 2017-12-06 17:26:49 +01:00
  • 1ff75f168b fixing the fix: older shells don't know about &> pwpiwi 2017-12-06 09:25:10 +01:00
  • 0fb3e45541
    Merge pull request #507 from pwpiwi/fix_AVX512 Iceman 2017-12-05 17:26:20 +01:00
  • 385e4b5019
    Merge pull request #504 from merlokk/emv3 Iceman 2017-12-05 15:39:37 +01:00
  • c656c870ae fix: AVX512 detection pwpiwi 2017-12-05 08:25:10 +01:00
  • 7a7afeba5c small refactoring merlokk 2017-12-04 22:20:29 +02:00
  • 5a1b25ac31 added 9f0a tag merlokk 2017-12-03 20:36:04 +02:00
  • f7ec230e98 added a tag merlokk 2017-12-03 20:28:36 +02:00
  • 10d4f82338 transactions MSD and M/Chip, qVSDC works merlokk 2017-12-02 21:47:30 +02:00
  • 2db66b01da
    Merge pull request #493 from merlokk/emv2 Iceman 2017-12-02 18:39:14 +01:00
  • d217282541
    Merge pull request #502 from merlokk/apduhelp Iceman 2017-11-30 20:04:16 +01:00
  • 606eddca8d added hint on hf 14a apdu. close #495 merlokk 2017-11-30 19:34:20 +02:00
  • dc93020701 Update fpgaloader.c (#500) Iceman 2017-11-30 12:46:40 +01:00
  • 653e5ed3ca
    Merge pull request #488 from pwpiwi/fix_usbpower Iceman 2017-11-28 21:26:57 +01:00
  • f380317220
    Change USB Configuration to "Bus Powered" pwpiwi 2017-11-28 21:22:29 +01:00
  • 14971507b1
    Merge pull request #494 from qaisjp/patch-1 Iceman 2017-11-26 06:15:48 +01:00
  • 1ccdd4f631
    Make README file markdown Qais Patankar 2017-11-26 04:41:24 +00:00
  • 78528074b1 optimization UDOL creation. does not affect on functionality. merlokk 2017-11-25 21:17:56 +02:00
  • 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 merlokk 2017-11-25 14:40:23 +02:00
  • 87fc2dad14 merged emvcore merlokk 2017-11-25 14:30:53 +02:00
  • 66efdc1f64 part of changes merlokk 2017-11-25 12:58:50 +02:00
  • 45eb1383e3
    Merge pull request #491 from pwpiwi/mod_select Iceman 2017-11-25 09:51:39 +01:00
  • 137dd5826e
    Merge pull request #486 from KenzyCarey/master Iceman 2017-11-24 12:39:45 +01:00
  • 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 pwpiwi 2017-11-22 17:46:00 +01:00
  • 3c5fce2ba7 Add: Emv first part of commands Oleg Moiseenko 2017-11-22 07:16:33 +02:00
  • 4058a2d7df
    fix: avoid SspClk overflow due to incomplete reset pwpiwi 2017-11-21 07:31:42 +01:00
  • dfa1628ac3
    Add files via upload Kenzy Carey 2017-11-17 14:42:52 -08:00
  • 0363be9358 fix: USB Power requirements * correctly indicate the maximum current drawn from the USB bus pwpiwi 2017-11-17 09:13:37 +01:00
  • c95affa8d3 minor fixes Oleg Moiseenko 2017-11-15 08:49:18 +02:00
  • db68bcdb06
    Complete WTX handling pwpiwi 2017-11-15 07:47:18 +01:00
  • aa264aba1d
    Merge pull request #480 from pwpiwi/fix_nested marshmellow42 2017-11-13 09:42:56 -05:00
  • e537c3e894 fix memory overflow in hf mf nested (issue #479) pwpiwi 2017-11-12 18:08:57 +01:00
  • c3511781a1
    Merge pull request #478 from wsmoses/master Iceman 2017-11-11 22:45:37 +01:00
  • 230eaa5391
    Merge pull request #477 from merlokk/wtx Iceman 2017-11-11 22:16:19 +01:00
  • 874572d419 Fix memory bounds error William S. Moses 2017-11-11 16:08:57 -05:00
  • ba4f95b4af added some info from @peterfillmore fork merlokk 2017-11-11 23:05:08 +02:00
  • a63505c953 Added work with S-Block WTX in 14a apdu on arm side merlokk 2017-11-11 22:56:50 +02:00
  • c0e852f907
    Merge pull request #475 from merlokk/master Iceman 2017-11-11 00:39:29 +01:00
  • 298143218a true fix #472 ))) merlokk 2017-11-11 01:28:20 +02:00
  • 8b5ec1f4a6
    Merge pull request #474 from merlokk/df_fix Iceman 2017-11-11 00:24:38 +01:00
  • 7c84f80657
    Merge pull request #471 from marshmellow42/master Iceman 2017-11-11 00:24:20 +01:00
  • 872337e019 change ul_switch_off_field to DropField fix #473 merlokk 2017-11-11 01:19:34 +02:00
  • c425cc7efc
    Merge pull request #472 from merlokk/master Iceman 2017-11-10 23:45:45 +01:00
  • 77499f6fb2 fix #468 merlokk 2017-11-11 00:43:29 +02:00
  • d940ebfbad
    Merge pull request #470 from pwpiwi/mod_indent Iceman 2017-11-10 23:21:26 +01:00
  • 33a9982c76 dump only leaf TLV data pwpiwi 2017-11-10 23:09:08 +01:00
  • cb593491df fix incorrect variable name marshmellow42 2017-11-10 16:03:55 -05:00
  • 217cfb6b29 fix lf search bugs when no tag is on antenna marshmellow42 2017-11-10 15:56:52 -05:00
  • 43912d6349 add: proper indentation when printing TLV objects pwpiwi 2017-11-10 21:39:10 +01:00
  • 7c8115b273
    Merge pull request #466 from pwpiwi/mod_14areader Iceman 2017-11-10 20:53:20 +01:00
  • f5adb06fae revert field on/off in hf 14a reader fix typo pwpiwi 2017-11-10 20:11:51 +01:00
  • e464f62258
    Merge pull request #462 from pwpiwi/fix_hfmfsim Iceman 2017-11-10 18:07:25 +01:00
  • 881eacc8aa
    Merge pull request #461 from merlokk/14a_rework3 Iceman 2017-11-10 17:14:38 +01:00
  • 9658b9e137 move include modules from h to c file merlokk 2017-11-10 09:15:56 +02:00
  • 86a1c1dc25 eliminate double DropField command merlokk 2017-11-09 22:01:00 +02:00
  • b7d3e89923 changed iso14aapdu arm side and client merlokk 2017-11-09 16:39:40 +02:00
  • eb6e8de45d moved includes, added clear_trace flag (it was there...) and fixed multiapdu iso14443 stream merlokk 2017-11-03 13:42:38 +02:00
  • 82f4955245 Merge branch 'master' into fix_hfmfsim pwpiwi 2017-11-02 21:37:42 +01:00
  • b35e04a7c6 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 pwpiwi 2017-10-24 07:49:14 +02:00
  • 1d6f7bc8ac added changelog merlokk 2017-11-02 14:28:05 +02:00
  • 378d3406ca
    Merge branch 'master' into 14a_rework3 Oleg Moiseenko 2017-11-02 14:14:55 +02:00
  • 23207d748f tlv decoder works. merlokk 2017-11-02 14:11:42 +02:00
  • 75e42ef5df added changelog (#460) Oleg Moiseenko 2017-11-01 21:37:18 +02:00
  • fe6bf3c58c improve hf 14a info (#457) Oleg Moiseenko 2017-11-01 18:48:59 +02:00
  • 83df98d691 change comment in iso14443a.c (#459) Oleg Moiseenko 2017-11-01 18:44:43 +02:00
  • 499df9088d fix behavier reading iso14443-3 and iso14443-4 cards merlokk 2017-11-01 18:34:15 +02:00
  • 7376da5c44 revert SAK check merlokk 2017-11-01 18:22:03 +02:00
  • bed3e4c20d Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3 merlokk 2017-11-01 17:13:27 +02:00
  • 89ec86abd2 now SAK check is OK merlokk 2017-11-01 17:02:35 +02:00
  • c5e9a0212e deleted condition in iso14a select (sak & 0x20 ==0) - error. Usually SAK = 88 merlokk 2017-11-01 16:55:12 +02:00
  • 9d139870cb
    Merge pull request #456 from merlokk/hfreaderfix marshmellow42 2017-11-01 07:57:30 -04:00
  • fe842bed9c fixed bug with hf search 14a merlokk 2017-11-01 13:54:03 +02:00
  • a2bb2735d5 TLV decoding works merlokk 2017-11-01 13:38:29 +02:00
  • 7dac1034e5 Add hf mf info, change hf mf reader (#452) Oleg Moiseenko 2017-11-01 09:51:05 +02:00
  • 78a94ff902 improved GetAPDUCode() merlokk 2017-10-31 19:19:49 +02:00
  • 5bcb3496fa small refactoring merlokk 2017-10-31 19:11:23 +02:00