jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,558 Commits 3 Branches 26 Tags
f07d784b8b4ce460ee827fcf2aed46a23f3c106c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe Teuwen f07d784b8b make style 2013-03-02 13:17:57 +01:00
Philippe Teuwen abf54c7598 Debian: remove non-exported symbol 2013-03-02 12:55:43 +01:00
Philippe Teuwen ae571941c5 usbbus: make usb_initialized static 2013-03-02 12:43:15 +01:00
Philippe Teuwen 1f0b0e5b81 Fix zealous double free 2013-03-02 12:26:24 +01:00
Philippe Teuwen b2b1d2a2a2 make style 2013-03-02 02:52:07 +01:00
Philippe Teuwen a6c405a5d5 malloc/free: some more cleaning & checking malloc errors 2013-03-02 02:51:33 +01:00
Philippe Teuwen 0708279215 malloc/free: some cleaning & checking malloc errors 2013-03-02 02:25:13 +01:00
Philippe Teuwen 35b08dc5cc Add new symbols from usbbus.c 2013-03-02 01:39:59 +01:00
Philippe Teuwen d7e7abb061 Fix mem leak in config file parser (opendir) 
This fixes the following leaks:

==30517== 32,808 bytes in 1 blocks are definitely lost in loss record 11 of 12
==30517==    at 0x4C28BED: malloc (vg_replace_malloc.c:263)
==30517==    by 0x50F4B2A: __alloc_dir (opendir.c:186)
==30517==    by 0x4E34998: conf_devices_load.constprop.1 (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==30517==    by 0x4E36350: nfc_context_new (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==30517==    by 0x4E34D98: nfc_init (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
 2013-03-02 01:21:13 +01:00
Philippe Teuwen 3d9ebb5044 Fix mem leak in config file parser 
This fixes the following leaks:

==18690== 256 bytes in 1 blocks are definitely lost in loss record 75 of 100
==18690==    at 0x4C28BED: malloc (vg_replace_malloc.c:263)
==18690==    by 0x511613F: regcomp (regcomp.c:487)
==18690==    by 0x4E34313: conf_parse_file (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==18690==    by 0x4E349F5: conf_devices_load.constprop.1 (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==18690==    by 0x4E362C0: nfc_context_new (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==18690==    by 0x4E34D08: nfc_init (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==18690==
==18690== 32,068 (224 direct, 31,844 indirect) bytes in 1 blocks are definitely lost in loss record 98 of 100
==18690==    at 0x4C28BED: malloc (vg_replace_malloc.c:263)
==18690==    by 0x4C28D6F: realloc (vg_replace_malloc.c:632)
==18690==    by 0x5115DF3: re_compile_internal (regcomp.c:760)
==18690==    by 0x51161AB: regcomp (regcomp.c:506)
==18690==    by 0x4E34313: conf_parse_file (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==18690==    by 0x4E349F5: conf_devices_load.constprop.1 (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==18690==    by 0x4E362C0: nfc_context_new (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==18690==    by 0x4E34D08: nfc_init (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
 2013-03-02 01:09:47 +01:00
Philippe Teuwen 9dcf7378b6 Fix mem leak with libusb by introducing buses/usbbus.c 
Now call only once usb_init(); usb_find_busses(); usb_find_devices()
instead of multiple calls in several scan() then open()

This fixes the following leaks:

==1159== 8 bytes in 1 blocks are definitely lost in loss record 9 of 102
==1159==    at 0x4C28BED: malloc (vg_replace_malloc.c:263)
==1159==    by 0x53D9931: usb_parse_configuration (in /lib/x86_64-linux-gnu/libusb-0.1.so.4.4.4)
==1159==    by 0x53DB8B1: usb_os_find_devices (in /lib/x86_64-linux-gnu/libusb-0.1.so.4.4.4)
==1159==    by 0x53D8FDC: usb_find_devices (in /lib/x86_64-linux-gnu/libusb-0.1.so.4.4.4)
==1159==    by 0x4E41D79: pn53x_usb_scan (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==1159==
==1159== 8 bytes in 1 blocks are definitely lost in loss record 10 of 102
==1159==    at 0x4C28BED: malloc (vg_replace_malloc.c:263)
==1159==    by 0x53D9931: usb_parse_configuration (in /lib/x86_64-linux-gnu/libusb-0.1.so.4.4.4)
==1159==    by 0x53DB8B1: usb_os_find_devices (in /lib/x86_64-linux-gnu/libusb-0.1.so.4.4.4)
==1159==    by 0x53D8FDC: usb_find_devices (in /lib/x86_64-linux-gnu/libusb-0.1.so.4.4.4)
==1159==    by 0x4E42CC7: pn53x_usb_open (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
==1159==    by 0x4E351E6: nfc_open (in /usr/lib/x86_64-linux-gnu/libnfc.so.4.0.0)
 2013-03-02 01:08:07 +01:00
Philippe Teuwen a0ebd8ba15 Fix warning in tests: Variable might get clobbered by 'longjmp' or 'vfork' 2013-02-22 22:30:44 +01:00
Philippe Teuwen 7e3549819e Split --disable-conf into --disable-conffiles & --disable-envvars 2013-02-22 21:53:16 +01:00
Philippe Teuwen 72b10c5d9b Fix warnings: ignoring return value of 'pipe' & discarding const qualifier 2013-02-21 23:20:28 +01:00
Philippe Teuwen 24e1edd858 make style 2013-02-21 22:39:39 +01:00
Philippe Teuwen 5ced93fcbf Makefile.am: move header files from noinst_HEADERS to _SOURCES 
Ensures proper recompilation when a header file is edited.
cf https://www.gnu.org/software/automake/manual/html_node/Headers.html
 2013-02-21 22:37:20 +01:00
Philippe Teuwen 7af127ac0d pn53x-tamashell: allow larger commands up to full extended frame (264 bytes) 
It was arbitrarily limited to MAX_FRAME_LEN-10 probably because of bug in LOG_HEX() fixed in previous commit
 2013-02-21 22:36:23 +01:00
Philippe Teuwen 9935095a36 Fix stack smash bug in LOG_HEX() macro 
Fixes issue 232
 2013-02-21 22:31:19 +01:00
Philippe Teuwen 911bbfa38d Debian: Fix symbols 2013-02-16 22:19:55 +01:00
Philippe Teuwen 09ce0e822c nfc_free(): fix related doc 2013-02-16 22:18:00 +01:00
Philippe Teuwen 0203ade66c Debian control: misc:Pre-Depends is only for packages providing a shared library 
Fixes warnings:
dpkg-gencontrol: warning: Pre-Depends field of package libnfc-dev: unknown substitution variable ${misc:Pre-Depends}
dpkg-gencontrol: warning: Pre-Depends field of package libnfc4-dbg: unknown substitution variable ${misc:Pre-Depends}
 2013-02-06 15:16:40 +01:00
Philippe Teuwen f961452cf8 Debian: add nfc_register_driver() to symbol list 2013-02-06 15:08:30 +01:00
Philippe Teuwen 43a1e57a62 Add nfc_register_driver() to NEWS & Changelog 2013-02-06 15:08:20 +01:00
Philippe Teuwen 73992041b4 Merge remote-tracking branch 'ahti/issue-137' into master 
* ahti/issue-137:
  Add nfc_register_driver.

Fixes issue 225
Helps issue 137
 2013-02-06 15:07:18 +01:00
Philippe Teuwen 487c8050ef Debian: rc3->rc4 2013-02-06 15:06:50 +01:00
Philippe Teuwen 414d00529e debian .gitignore gardening 2013-02-04 10:33:04 +01:00
Philippe Teuwen 6b140bef11 debian: fix multiarch issues 2013-02-02 11:45:01 +01:00
Philippe Teuwen 4d0ee443d1 Fix crash in nfc-relay-picc -i/-t if fd3 or fd4 is missing 2013-02-01 21:55:29 +01:00
Philippe Teuwen 386e08d8b3 Fix nfc_initiator_select_passive_target() in several utils if tag is missing 2013-02-01 20:52:49 +01:00
Philippe Teuwen 06bfed11b9 Various typos 2013-01-31 21:58:29 +01:00
Philippe Teuwen fff6a092ab Fix Readme for drivers reqs 2013-01-31 16:44:37 +01:00
Philippe Teuwen 8bc7a1c291 call idle() from driver-dependent close() rather than from nfc_close() as some driver still need to do an ack() before 2013-01-31 01:18:23 +01:00
Philippe Teuwen 683505f39b pn53x_idle: call driver-dependent PowerDown & do InRelease first, skip redundant InDeselect 2013-01-31 01:16:37 +01:00
Philippe Teuwen 1682a86166 Add driver-dependent PowerDown 2013-01-31 01:15:03 +01:00
Philippe Teuwen db8033622a acr122_pcsc: fix log category 2013-01-31 01:08:23 +01:00
Philippe Teuwen f7010faf18 Changelog 2013-01-31 01:05:28 +01:00
Philippe Teuwen 5446242094 acr122_usb: remove pn53x_idle support. Fixes issue #217 2013-01-30 01:27:18 +01:00
Philippe Teuwen b675db73be nfc-scan-device: fix option -i 2013-01-29 13:52:53 +01:00
Philippe Teuwen 3d580dc3ec Missing ref to nfc-scan-device.1 in debian/libnfc-bin.install 2013-01-25 16:09:27 +01:00
Philippe Teuwen 5876e33e49 Fix returned value ((res=f()<0)) => ((res=f())<0); this solves a bug in nfc-relay-picc 2013-01-22 00:56:34 +01:00
Philippe Teuwen 0ac3b26982 nfc-relay-picc: Fix received bytes count 2013-01-22 00:54:47 +01:00
Philippe Teuwen 9815ac728f nfc-emulate-uid: fix BCC 2013-01-22 00:45:42 +01:00
Philippe Teuwen edacadbce6 make style 2013-01-20 15:48:32 +01:00
Philippe Teuwen ea05559fa5 Prepare for version 1.7.0-RC2 2013-01-20 15:45:57 +01:00
Philippe Teuwen 84af758877 Add /etc/nfc/devices.d/ example in NEWS 2013-01-20 15:41:53 +01:00
Philippe Teuwen 532b30a2cd Merge branch 'test_user_defined_device_optional' 
* test_user_defined_device_optional:
  Fix double malloc
  Allow device.optional=true to tolerate missing device
 2013-01-20 15:36:29 +01:00
Philippe Teuwen bcd53a7cdc Fix double malloc 2013-01-20 15:24:03 +01:00
Philippe Teuwen 4576bad369 Fix ISO14443B' ATS broken by updated API 2013-01-19 00:14:19 +01:00
Philippe Teuwen 04a7d2a3ba Allow device.optional=true to tolerate missing device 2013-01-18 22:54:44 +01:00
Philippe Teuwen 24fed18590 Require cutter >=1.1.7 rather than >=1.1.8 2013-01-18 22:48:24 +01:00
Philippe Teuwen 2fbf5ab741 Fix debian/control for new API version libnfc3->libnfc4 2013-01-16 08:16:10 +01:00
Philippe Teuwen 0458c8e24e debian/rules: don't enable debug by default anymore as it can be done easily at runtime with LIBNFC_LOG_LEVEL 2013-01-10 23:57:12 +01:00
Philippe Teuwen 6be0b2396c Fix typos 2012-12-05 01:32:45 +01:00
Philippe Teuwen cf6d843c18 Fix pseudo-logging API when no logging is used 2012-12-04 19:14:37 +01:00
Philippe Teuwen 2651cdce2e Remove last SVN cruft 2012-11-27 18:56:54 +01:00
Philippe Teuwen ac1d05328b update NEWS to reflect API change for nfc_initiator_transceive_*() 2012-11-27 18:50:00 +01:00
Philippe Teuwen 7437f76007 simplify quick_start_example1 and add quick_start_example2 2012-11-16 12:25:27 +01:00
Philippe Teuwen fda8d60ce0 Adapt *transmit_bytes_timed API to be closer to *transmit_bytes 2012-11-12 16:54:03 +01:00
Philippe Teuwen 6c7c0a6e63 ReadMobib: make it compatible with Basic card 2012-11-10 17:11:48 +01:00
Philippe Teuwen 2a1558fb32 Deleting manpage present already twice 2012-09-28 09:16:30 +00:00
Philippe Teuwen 6e7fdb1c80 Adds nfc-emulate-forum-tag2 man page 2012-09-19 10:25:33 +00:00
Philippe Teuwen c87eab4958 Add support for OpenPCD2 2012-07-01 11:22:45 +00:00
Philippe Teuwen 86e92fd2a0 Tolerate older autotools version 2012-06-28 23:11:02 +00:00
Philippe Teuwen 4b5b45f14a Add "usb" keyword support to connstring to specify all usb drivers at once 2012-06-06 01:10:05 +00:00
Philippe Teuwen 723e2860ae Adding make style 2012-05-29 15:56:02 +00:00
Philippe Teuwen 568317929d astyle --formatted --mode=c --indent=spaces=2 --indent-switches --indent-preprocessor --keep-one-line-blocks --max-instatement-indent=60 --brackets=linux --pad-oper --unpad-paren --pad-header --align-pointer=name 2012-05-29 15:55:35 +00:00
Philippe Teuwen 01303fab0d astyle --formatted --mode=c --indent=spaces=2 --indent-switches --indent-preprocessor --keep-one-line-blocks --max-instatement-indent=60 --brackets=linux --pad-oper --unpad-paren --pad-header 2012-05-29 15:54:36 +00:00
Philippe Teuwen 562205cc14 astyle --formatted --mode=c --indent=spaces=2 --indent-switches --indent-preprocessor --keep-one-line-blocks --max-instatement-indent=60 --brackets=linux --pad-oper 2012-05-29 15:54:00 +00:00
Philippe Teuwen 67522bae65 astyle --formatted --mode=c --indent=spaces=2 --indent-switches --indent-preprocessor --keep-one-line-blocks --max-instatement-indent=60 --brackets=linux 2012-05-29 15:53:43 +00:00
Philippe Teuwen a2cd236441 astyle --formatted --mode=c --indent=spaces=2 --indent-switches --indent-preprocessor --keep-one-line-blocks --max-instatement-indent=60 2012-05-29 15:52:51 +00:00
Philippe Teuwen 26569c2202 Indent manually some comments to prepare astyle 2012-05-29 15:52:29 +00:00
Philippe Teuwen 7da28b87d2 HACKING: document EOL cleaning, thanks Ludovic 2012-05-29 07:59:04 +00:00
Philippe Teuwen dd12a4dd87 drivers/acr122_pcsc: allow LIBNFC_DEFAULT_DEVICE=acr122_pcsc:N where N is the Nth device accepted by the driver 2012-05-22 23:49:32 +00:00
Philippe Teuwen 912e32ecab Adding HACKING file, draft to be continued 2012-05-22 20:20:53 +00:00
Philippe Teuwen 47e90ee510 drivers/acr122_pcsc: allow LIBNFC_DEFAULT_DEVICE=acr122_pcsc 2012-05-22 17:25:48 +00:00
Philippe Teuwen ff87cf62b1 Fix segfault in pn53x_initiator_transceive_bytes when pszRx in NULL 
Cause was "return *pszRx"
Segfault occured when listing a typeB'
 2012-05-18 21:54:55 +00:00
Philippe Teuwen 969102c1a0 utils/nfc-list: always display the card type when a card is found 2012-05-18 21:54:45 +00:00
Philippe Teuwen 4bfd6ac874 fix disruptancies between tools location in src (utils<>examples) and in Debian packages (libnfc-bin<>libnfc-examples) 2012-05-17 19:22:25 +00:00
Philippe Teuwen 028db71d79 utils/nfc-emulate-forum-tag4: add support for v2.0 of the spec 2012-05-14 22:13:19 +00:00
Philippe Teuwen 7597055f26 fix typos 2012-05-14 19:44:03 +00:00
Philippe Teuwen 896fa54ece nfc-utils: some changes on the newly introduced fingerprinting method, see log for details 
* avoid hardcoded list sizes in #define
* merge card_link data into const_ca
* indexes start at 0, not 1, and use -1 as marker rather than 0
* fix bug in DESFire ATQA
* remove CL1 entries for double size UIDs, in practice we'll always get the latest SAK of the cascade
* remove CL2 tags, cf previous point
* compact const_cs considering the previous points
* keep const_cs strings only where they are informative
* premature halt of inner loop if there is no more SAK index to treat
* change atqa & sak types to uint16_t & uint8_t

* skip redundant matches in the old fingerprinting method
 2012-05-02 23:48:06 +00:00
Philippe Teuwen b10de698dd nfc-utils: new fingerprinting method closer to AN10833, patch proposed by Balazs Bucsay (thanks!) 2012-05-02 23:47:57 +00:00
Philippe Teuwen 93157dd30d nfc-utils.h: rename function oddparity_bytes_ts() to be coherent with nfc-utils.c 2012-05-02 21:18:46 +00:00
Philippe Teuwen 1cf9154296 nfc-utils: fix bug (remaining calls to old OddParity table) 2012-05-02 21:18:31 +00:00
Philippe Teuwen b84e3d0f20 nfc-utils: smaller oddparity code 2012-05-02 10:02:56 +00:00
Philippe Teuwen 789cb13dec Avoid readline auto-detection when cross-compiling. Still feasible to use readline if you specify the path to it. 2011-10-18 13:28:01 +00:00
Philippe Teuwen 7c88fc27b5 RC-S360, work-in-progress 2011-06-09 08:59:06 +00:00
Philippe Teuwen 082edbf598 More attempt to support Sony RC-S360 reader 
Adapt InDeselect & InRelease to RC-S360
nfc-list now supports discovery of several typeA tags properly

Current status of RC-S360 support is:
    - nfc-list          => ok except for B' & 3B
    - nfc-anticol       => fails to send raw frames before select
    - nfc-mfultralight  => ok
    - nfc-mfclassic     => ok
    - pn53x-tamashell   => ok
    - pn53x-diagnose    => ok
    - nfc-dep-initiator => ok
    - nfc-dep-target    => fails in InitAsTarget
    - nfc-emulate-*     => fails in InitAsTarget

Commands momentarily disabled for RC-S360:
    - select_passive_target for B'& 3B
 2011-06-08 00:09:57 +00:00
Philippe Teuwen 80a5ad1fd6 More attempt to support Sony S360 reader 
Initialisation of RC-S360 in mode 0
Better generic nfc-list, does not rely only on DeSelect to avoid duplicates
Restore SetParameters for RC-S360
Handle Diagnose communication test properly

Tested:
    - nfc-list          => ok except for B' & 3B
    - nfc-anticol       => fails to send raw frames before select
    - nfc-mfultralight  => ok
    - nfc-mfclassic     => ok
    - pn53x-tamashell   => ok
    - pn53x-diagnose    => ok
    - nfc-dep-initiator => ok
    - nfc-dep-target    => fails in InitAsTarget
    - nfc-emulate-*     => fails in InitAsTarget

Commands momentarily disabled for RC-S330:
    - InDeselect
    - InRelease
    - select_passive_target for B'& 3B
 2011-06-07 20:36:20 +00:00
Philippe Teuwen cbbda20018 nfc-anticol: -f option to force RATS 2011-06-07 18:47:20 +00:00
Philippe Teuwen 91c46050c0 First attempt to support Sony S330 reader 
Tested:
- nfc-list
- nfc-anticol
- nfc-mfultralight
- nfc-mfclassic

Commands momentarily disabled:
- SetParameters
- InDeselect
- InRelease
 2011-06-05 22:25:05 +00:00
Philippe Teuwen f4c3d9d4ed nfc-mfclassic: handle 7-byte UID cards & MFC Mini 2011-05-26 22:49:45 +00:00
Philippe Teuwen 96538d052b Extend max length for firmware description & fix typo 2011-05-25 19:53:45 +00:00
Philippe Teuwen ff7696fffb nfc.c: reformulate comments of prev commit in chip-agnostic way. BTW there is more to do... 2011-05-12 20:51:44 +00:00
Philippe Teuwen e5601e562f _timed(): now allows indirect control of intern prescaler via max expected cycles count 2011-05-12 20:33:00 +00:00
Philippe Teuwen b98afced69 Move prescaler to CHIP_DATA struct & remove some compilation warnings 2011-05-11 23:22:52 +00:00
Philippe Teuwen ab54a37678 list_targets support for ASK CTS512B (no anticol support yet) 2011-05-11 23:00:54 +00:00
Philippe Teuwen 53f1acfdcb _timed() fcts: allow 32b cycles counter & prescaler!=0 2011-05-11 20:56:09 +00:00
Philippe Teuwen ca3c5007f6 pn53x _timed fcts now use burst read/write on fifo register 2011-05-10 23:44:36 +00:00
Philippe Teuwen 21dfe81d0b Some optimisations in initialisation of registers 2011-05-10 23:44:27 +00:00