diff options
| author | Vincent Cuissard <cuissard@marvell.com> | 2014-07-28 10:25:48 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-08-18 18:44:18 +0200 |
| commit | a271496730a07ede9f26ffb062a3fd3e2b58a4fd (patch) | |
| tree | 4bc92cfbc8533af736b9c98557c220cdf2b95824 | |
| parent | 08075484aef83e631b80d7a19d49d2f8fff2ae4c (diff) | |
| download | neard-a271496730a07ede9f26ffb062a3fd3e2b58a4fd.tar.gz neard-a271496730a07ede9f26ffb062a3fd3e2b58a4fd.tar.bz2 neard-a271496730a07ede9f26ffb062a3fd3e2b58a4fd.zip | |
nfctype4: Fix tag reading procedure for DESFire V1
On NXP DESFire tag V1, the SELECT FILEID right after
the SELECT APPNAME has to use P1 = 0 and P2 = 0
(instead of P1 = 0 and P2 = 0x0C).
| -rw-r--r-- | plugins/nfctype4.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/plugins/nfctype4.c b/plugins/nfctype4.c index efb538d..eae6c64 100644 --- a/plugins/nfctype4.c +++ b/plugins/nfctype4.c @@ -2,6 +2,7 @@ * * neard - Near Field Communication manager * + * Copyright (C) 2014 Marvell International Ltd. * Copyright (C) 2011 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -74,6 +75,8 @@ #define T4_ALL_ACCESS 0x00 #define T4_READ_ONLY 0xFF +#define T4_V1 0x01 +#define T4_V2 0x02 #define APDU_STATUS(a) near_get_be16(a) @@ -157,6 +160,7 @@ struct t4_cookie { uint8_t write_access; struct near_ndef_message *ndef; uint16_t memory_size; + uint8_t version; }; static int t4_cookie_release(int err, void *data) @@ -243,17 +247,21 @@ out_err: /* ISO 7816 command: Select applications or files * p1=0 select by "file id" * P1=4 select by "DF name" - * If P1 == 0, then P2 is 0x0C. - * If P2 == 4, then P2 is 0x00. + * If P1 == 0, then P2 is 0x0C if T4_V2, 0 if T4_V1. + * If P1 == 4, then P2 is 0x00. * */ static int ISO_Select(uint8_t *filename, uint8_t fnamelen, uint8_t P1, - near_recv cb, void *cookie) + near_recv cb, void *data) { uint16_t P2; + struct t4_cookie *cookie = data; DBG(""); - P2 = P1 ? 0x00 : 0x0C; + if (cookie->version == T4_V1 && P1 == 0) + P2 = 0; + else + P2 = P1 ? 0x00 : 0x0C; return ISO_send_cmd( 0x00, /* CLA */ @@ -264,7 +272,7 @@ static int ISO_Select(uint8_t *filename, uint8_t fnamelen, uint8_t P1, fnamelen, /* uint8_t cmd_data_length*/ false, cb, - cookie); + data); } /* ISO 7816 command: Read binary data from files */ @@ -521,6 +529,9 @@ static int t4_select_file_by_name_v1(uint8_t *resp, int length, void *data) if (resp[NFC_STATUS] != 0) return t4_cookie_release(-EIO, cookie); + /* Tag is V1 */ + cookie->version = T4_V1; + /* Jump to select phase */ return ISO_Select(iso_cc_fileid, LEN_ISO_CC_FILEID, 0, t4_select_cc, cookie); @@ -552,6 +563,9 @@ static int t4_select_file_by_name_v2(uint8_t *resp, int length, void *data) if (resp[NFC_STATUS] != 0) return t4_cookie_release(-EIO, cookie); + /* Tag is V2 */ + cookie->version = T4_V2; + /* Jump to select phase */ return ISO_Select(iso_cc_fileid, LEN_ISO_CC_FILEID, 0, t4_select_cc, cookie); |