Commit graph

538 commits

Author SHA1 Message Date
Romain Tartière
32c6ed8f32 Align macros indentation with the rest of the code 2017-06-29 09:27:36 +02:00
Romain Tartière
5bd27a9d68 Merge pull request #66 from janschiefer/master
Convenience function for PICC master key settings, apply 'free_create_delete_files' in MDAPP_SETTINGS()
2017-06-29 09:22:58 +02:00
Dr. Jan Schiefer
091d60e227 1. Add convenience function for managing PICC master key settings. 2. Apply free_create_delete_files in MDAPP_SETTINGS(). 2017-06-29 01:06:33 +02:00
Romain Tartière
22929cd2cb Merge pull request #65 from salcatroppa/master
Update freefare_internal.h
2017-06-27 15:33:54 +02:00
Salvatore Catroppa
78322f486e Update freefare_internal.h 2017-06-27 15:14:51 +02:00
Romain Tartière
b49692848e Merge pull request #64 from nfc-tools/style
Use astyle(1) to make style consistent
2017-06-27 14:35:48 +02:00
Romain Tartière
73dc0529fa Run make style to fix style 2017-06-27 13:58:31 +02:00
Romain Tartière
187481bb4c Ignore new examples 2017-06-27 13:57:05 +02:00
Romain Tartière
9d016f7c3c Add make style target 2017-06-27 11:11:17 +02:00
Martin Dagarin
b2eca838c4 Added support for NTAG 21x tags (#53) 2017-06-27 10:50:50 +02:00
Romain Tartière
2be45f60e2 Merge pull request #63 from nfc-tools/travis-build
Test the build with Travis-CI
2017-06-27 08:10:39 +02:00
Romain Tartière
be3e581eff Build test then run them
We do not run the test suite at the `make check` stage here in order to
have a better output.
2017-06-26 13:17:37 +02:00
Romain Tartière
7536bbde06 Attempt to have a working cutter 2017-06-26 11:52:00 +02:00
Romain Tartière
33eaf7fcce Run the test suite using cutter
This is only available with the autotools build for now.
2017-06-26 11:43:17 +02:00
Romain Tartière
616df0af82 Do not use pkg-config(1) to search for libnfc
Since libnfc is not installed system-wide, pkg-config(1) can't find it.
Set LIBNFC_CFLAGS/LDFLAGS manually.
2017-06-26 11:30:36 +02:00
Romain Tartière
6ef62014d1 Imediatly stop on failure 2017-06-26 11:29:29 +02:00
Romain Tartière
d0f78c4880 Fix autotools build
CMake seems to find the libnfc includes and libraries, but not the
autotools.  Pass them to ./configure.
2017-06-26 11:21:28 +02:00
Romain Tartière
a884eb3dca Fix Travis-CI build
While here, refactor a bit so that a failing libnfc build does not
indicate a failure of the libfreefare build.
2017-06-26 11:15:12 +02:00
Romain Tartière
feb0f15f3e Test build using Travis-CI 2017-06-26 11:09:17 +02:00
Romain Tartière
91c2c5986a Merge pull request #62 from janschiefer/convenience_functions
Convenience function for application settings on Mifare DESFire PICCs.
2017-06-26 09:55:23 +02:00
Dr. Jan Schiefer
f293cf9e8a Add convenience function for handling application settings on Mifare DESFire PICCs. Also add information on structure of settings value. 2017-06-19 23:39:09 +02:00
Romain Tartière
0db44b2f3b Merge pull request #52 from ChristophGr/master
allow to cross-compile 32 and 64 bit dlls using MinGW
2017-06-09 09:41:52 +02:00
Christoph Gritschenberger
4903258749 allow to cross-compile 32 and 64 bit dlls using MinGW 2017-06-07 15:15:55 +02:00
Romain Tartière
45ff2ddf19 Merge pull request #61 from manu0401/crypto_error
Do not fail crypto error without reporting
2017-04-27 18:33:33 +02:00
Emmanuel Dreyfus
494233d33b Do not fail crypto error without reporting
Make sure last_pcd_error is set when failing on crypto
errors.

While there:
- make sure warn()/warnx() are inside WITH_DEBUG,
- set last_pcd_error and res before calling abort()
- #include <stdlib.h> for abort()
2017-04-27 16:55:52 +02:00
Romain Tartière
5e5a0828af Merge pull request #58 from swalkner/master
Fix build with CMake
2017-04-24 09:39:09 +02:00
Stefan Walkner
565ee18b8e Fix build with CMake
- Fix library finding ('nfc' instead of 'libnfc');
- Generate config.h from template on non-win32 platforms;
- While here, include protection for config.h in several files.
2017-04-24 09:35:08 +02:00
Romain Tartière
3975019b3c Fix cast from pointer to integer of different size 2017-04-19 13:15:19 +02:00
Romain Tartière
b131f74ea6 Merge pull request #56 from bettse/macos_endianess_fixes
Macos endianess fixes
2017-04-04 10:08:51 +02:00
Eric Betts
358df7759a macOS endian support 2017-04-03 16:43:23 -07:00
Eric Betts
1f3ed91214 Add macOS endian support to felicia read ndef example 2017-04-03 16:43:23 -07:00
Romuald Conty
295104a893 Merge pull request #51 from ChristophGr/master
Fix build on Windows
2016-12-15 19:54:21 +01:00
Christoph Gritschenberger
6e413c9782 fix build on windows 2016-12-15 18:04:05 +01:00
Philippe Teuwen
d7c1aa6f72 Merge pull request #50 from pi3rrot/master
Add support for Mifare Mini 0.3k
2016-11-29 14:41:54 +01:00
pierre
644c9bd214 Add function declaration + man entry 2016-11-22 23:30:38 +01:00
Pi3rrot
df3165284d Change README 2016-11-22 21:28:44 +01:00
Pi3rrot
b819315caa Add support for Mifare Mini 0.3k 2016-11-22 21:27:30 +01:00
Philippe Teuwen
48c9383ce1 Merge pull request #17 from nfc-tools/tag-detection
Get some flexibility in the tag type detection
2016-01-19 23:08:43 +01:00
Romain Tartière
0ef6a74963 Drop deprecated struct supported_tag. 2016-01-19 15:45:37 +01:00
Romain Tartière
305eb9d73c Make tags allocation API public. 2016-01-19 15:45:37 +01:00
Romain Tartière
99fe8c1682 Deduplicate tag type tracking.
It's available through tag->type.
2016-01-19 15:45:37 +01:00
Romain Tartière
ee628f7ec5 Rework tag allocation.
Split Mifare Classic 1 and 4K tag allocation.
Rely on new tasting functions.
2016-01-19 15:45:37 +01:00
Romain Tartière
0279361873 Introduce tasting functions.
References #17.
2016-01-19 15:45:37 +01:00
Romain Tartière
36d44bdc90 Merge pull request #48 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2016-01-19 12:23:01 +01:00
The Gitter Badger
beda0c3e85 Add Gitter badge 2016-01-19 11:03:09 +00:00
Romain Tartière
e17a54c18e Check tag is a FeliCa before dumping it. 2016-01-18 17:13:22 +01:00
Romain Tartière
9db57c4efc Push my TODO notes 2016-01-18 10:31:22 +01:00
Massimiliano Zilli
636cd9c761 Fix memoy leak. 2015-09-08 17:04:14 +02:00
Romain Tartière
b6792a0a08 Fix dumping send bytes.
Unbreak build with --enable-debug.
Fixes #43.
2015-08-13 09:50:20 +02:00
Romain Tartière
34ee5bd28b Fix build. 2015-06-01 13:16:43 +02:00