Olliver Schinagl
7b1ff70a52
nfc-mfultralight: Show help when no arguments are supplied
...
For some reason, 0cece94778
changed the argc count check to only show
the help if argc is 0. Obviously, argc is never zero, as the first
argument in argv is always the binary itself. Revert that and show usage
if there is no arguments supplied to the binary.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2016-05-11 09:38:39 +02:00
Olliver Schinagl
e1a25a8203
nfc-mfclassic: Add option to specify key
...
The nfc-mfclassic utility will pick a seemingly random (the libnfc
default which seems to be the lowest UID). With the new (u|U) options
it is now possible to force a UID and thus write a specific tag, which
can be very useful if there are more then one tag visible.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2016-05-11 09:38:39 +02:00
Olliver Schinagl
898f3a4d2f
nfc-mfclassic: check argc < 4 only once
...
Currently the check on argc is done twice, once in each if branch. This
is silly and we can just check once and fail right away.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
2016-05-11 09:38:39 +02:00
Romuald Conty
83b70d6326
Merge pull request #349 from frankmorgner/foreign
...
tell Automake that we will not follow GNU Standards
2016-05-03 11:15:47 +02:00
Frank Morgner
7d4352dc98
tell Automake that we will not follow GNU Standards
...
NEWS and README are mandatory for autoconf. Fixes problem introduced in
b1a81b385d
closes https://github.com/nfc-tools/libnfc/pull/346
fixes https://github.com/nfc-tools/libnfc/issues/347
2016-05-03 10:53:55 +02:00
Romuald Conty
e23f8a9f9c
Merge pull request #345 from quantum-x/ultralight-gen-2
...
Adding support for UL Gen 2 Badges
2016-04-09 11:25:11 +02:00
Simon Yorkston
e37de54e18
Updated to remove bugs
...
- For cards that aren’t magic, system will refuse to attempt writing
to block 0 / 1
- Tested on Gen 1 & Gen 2 cards:
Gen 1
$ ./nfc-mfultralight w ul-test.dmp --full
NFC device: SCM Micro / SCL3711-NFC&RW opened
Found MIFARE Ultralight card with UID: 044e075ad42184
Writing 16 pages |................|
Done, 16 of 16 pages written (0 pages skipped).
Gen 2
$ ./nfc-mfultralight w ul-test.dmp --full
NFC device: SCM Micro / SCL3711-NFC&RW opened
Found MIFARE Ultralight card with UID: 044e075ad42184
Writing 16 pages |................|
Done, 16 of 16 pages written (0 pages skipped).
Non-magic
$ ./nfc-mfultralight w ul-test.dmp --full
NFC device: SCM Micro / SCL3711-NFC&RW opened
Found MIFARE Ultralight card with UID: 044e075ad42184
Writing 16 pages |
Unable to unlock card - are you sure the card is magic?
$
2016-04-09 03:42:01 +10:00
Romuald Conty
e8e1826eeb
Merge pull request #344 from hiddewie/markdown2
...
Actual Markdown for the README and HACKING files
2016-04-08 18:53:05 +02:00
Simon Yorkston
8de7ce3899
Adding support for UL Gen 2 Badges
2016-04-09 01:32:14 +10:00
Hidde Wieringa
1f68888020
Added Markdown to HACKING file
2016-04-08 11:02:40 +02:00
Hidde Wieringa
291f70edee
Updated README-Windows for Markdown
2016-04-08 10:56:12 +02:00
Hidde Wieringa
62159a33ef
Added more Markdown formatting to README
2016-04-08 10:52:25 +02:00
Romuald Conty
d63e624b09
Merge pull request #341 from hiddewie/markdown
...
Changed a few README Markdown files to the .md extension so GitHub interprets it as Markdown
2016-04-07 20:09:46 +02:00
Hidde Wieringa
b1a81b385d
Changed a few README Markdown files to the .md extension so GitHub
...
interprets it as Markdown
2016-04-07 13:52:12 +02:00
Romuald Conty
bc8bb8de89
Merge pull request #315 from xantares/travis
...
Add travis config file
2016-03-19 12:44:59 +01:00
Romuald Conty
c228396c2d
Merge pull request #337 from surr/typo
...
Fix improper pnd->name initialization
2016-03-19 12:43:32 +01:00
Alexander Inyukhin
10398b6bd9
А typo leads to improper pnd->name initialization
...
A for loop condition is always false so pnd->name
is not initialized. This results in garbage when
printing device name.
2016-03-19 08:08:38 +03:00
Romuald Conty
24979c65cc
Merge pull request #327 from paulmenzel/fix-typo-in-readme
...
README: Fix typo in *is a registered*
2015-12-04 14:12:42 +01:00
Paul Menzel
c7f386dbcf
README: Fix typo in *is a registered*
2015-12-04 13:59:59 +01:00
Romuald Conty
42d455c4e7
Merge pull request #325 from quantum-x/master
...
Extends nfc-mfultralight functionality (Magic cards, unattended mode)
2015-11-19 00:02:04 +01:00
Simon Yorkston
619b476028
Cleaned non-magic exit
2015-11-18 23:11:59 +01:00
Simon Yorkston
0cece94778
Adds --check-magic flag to nfc-mfultralight
2015-11-18 23:03:36 +01:00
Simon Yorkston
3aa2d46588
Added automatic mode to nfc-mfultralight
2015-11-18 08:56:48 +01:00
Romuald Conty
73c2ef8582
Merge pull request #323 from bhack/SCL3712
...
Add SCM_SCL3712 support
2015-11-04 20:34:21 +01:00
bhack
1d4720671e
Add SCM_SCL3712 support
2015-11-04 20:15:56 +01:00
Romuald Conty
2046fb9461
Merge pull request #322 from quantum-x/quantum-x-unlockbehavior
...
Unlock read/write magic card fallback
2015-11-04 02:03:02 +01:00
quantum-x
758cb0cc05
Update nfc-mfclassic.c
2015-11-03 18:52:39 +01:00
quantum-x
c71d7267ac
Update nfc-mfclassic.c
...
Tweaking back the unlocked_read / write_block_zero after magic2 card discovered
2015-11-03 18:48:22 +01:00
quantum-x
20f22b97e7
Updating nesting typo
2015-11-03 18:39:03 +01:00
quantum-x
b5684c1755
Removing typo
...
Removing typo
2015-11-03 18:33:53 +01:00
quantum-x
87c6053d6f
Updating nfc-mfclassic.c
...
Modifying behavior relating to magic cards.
If a user has a 'magic2' card (IE, direct-write, not a 'fully magic' card) - we'll warn them that they don't need to use the W / R modes, and then proceed with the unlock operation, instead of exiting.
2015-11-03 18:11:51 +01:00
xantares
e7feb6587d
Add travis config file
2015-09-01 09:33:06 +02:00
Romuald Conty
48c271e49d
Merge pull request #314 from xantares/patch-3
...
CMake: use options() to disable examples and utils
2015-09-01 09:13:45 +02:00
Romuald Conty
53edc32a21
Merge pull request #313 from xantares/patch-2
...
CMake: use options() function
2015-09-01 09:13:13 +02:00
Romuald Conty
4193bb4873
Merge pull request #312 from xantares/patch-1
...
set default cmake build type
2015-09-01 09:12:43 +02:00
xantares
b7f620fdab
options to disable samples
2015-09-01 08:58:35 +02:00
xantares
141e99959e
use options
2015-09-01 08:57:11 +02:00
xantares
5d2052e77f
set default cmake build type
2015-09-01 08:55:53 +02:00
Romuald Conty
555f9ce4cf
Fixes #286 : udev rule was executed to early
2015-08-19 11:50:52 +02:00
Romuald Conty
792e3d9cbd
Do not include extra header in nfc.h
...
Fixes #310
2015-08-19 11:47:22 +02:00
Romuald Conty
13fee61e87
Fix typo
...
Closes #309
2015-08-19 11:44:23 +02:00
Ray Lee
09ce2233ce
Bugfix:Set variable "prefix" for WIN32
2015-08-16 18:22:15 +08:00
Ray Lee
e72fe468a4
Bugfix:function setenv()and unsetenv()
...
The original setenv() and unsetenv() function is invalid,I have rewrited to fix.
2015-08-16 16:34:35 +08:00
Romuald Conty
738970c135
Merge pull request #304 from xaqq/drop_pcre
...
Drop PCRE dependency.
2015-08-04 10:14:01 +02:00
Romuald Conty
c55bbec50d
Merge pull request #306 from Mincka/master
...
Fix nfc-poll card removing check
2015-08-03 17:43:54 +02:00
Julien Ehrhart
7ae5a0c333
Fix nfc-poll card removing check (should be done only if a target has been found).
2015-08-02 16:16:19 +00:00
xaqq
17ed36a7a5
Drop PCRE dependency.
...
The config file is now manually parsed instead of using regex.
While this is less beautifull, it allows us to drop PCRE
as a dependency on Windows.
2015-07-22 15:47:36 +02:00
Romuald Conty
6be73720fa
Merge pull request #301 from xantares/patch-1
...
CMake: fix drivers include
2015-06-23 06:43:26 +02:00
xantares
59f6c5de54
fix drivers include
...
```
cc1: warning: /home/xantares/projects/libnfc/drivers: No such file or directory [-Wmissing-include-dirs]
```
2015-06-22 20:47:04 +02:00
Philippe Teuwen
49dde9c28c
Merge branch 'nfc_get_supported_baud_rate_proposal'
...
* nfc_get_supported_baud_rate_proposal:
nfc_get_supported_baud_rate() proposal to reverse API
2015-06-18 22:07:09 +02:00