@ukeyfe/react-native-nfc-litecard 1.0.4 → 1.0.6

package/dist/nfc-core.js

@@ -143,12 +143,13 @@ function computeCommandCmac(sessionKey, cmdCtr, command) {
     return truncateCmac(mac);
 }
 /**
- * Truncate a 16-byte CMAC to 8 bytes using the MIFARE convention:
- * select even-indexed bytes: MAC[0], MAC[2], MAC[4], ..., MAC[14].
+ * Truncate a 16-byte CMAC to 8 bytes using the NXP MIFARE convention:
+ * select odd-indexed bytes (0-based): MAC[1], MAC[3], MAC[5], ..., MAC[15].
+ * NXP docs refer to these as "even-numbered bytes" using 1-based numbering.
  * (First introduced in MIFARE Plus, see NXP AN13452.)
  */
 function truncateCmac(mac) {
-    return new Uint8Array([mac[0], mac[2], mac[4], mac[6], mac[8], mac[10], mac[12], mac[14]]);
+    return new Uint8Array([mac[1], mac[3], mac[5], mac[7], mac[9], mac[11], mac[13], mac[15]]);
 }
 /**
  * Compute the 8-byte truncated CMAC for an NFC response.
@@ -188,27 +189,26 @@ async function transceive(command, _timeoutMs = 2000, retryCount = 0) {
         const result = react_native_1.Platform.OS === 'ios'
             ? await react_native_nfc_manager_1.default.sendMifareCommandIOS(cmdToSend)
             : await react_native_nfc_manager_1.default.nfcAHandler.transceive(cmdToSend);
+        if (cmacSessionKey) {
+            // CmdCtr increments between command and response (datasheet §8.8.3)
+            cmacCmdCtr++;
+        }
         if (cmacSessionKey && result && result.length >= 8) {
             // Response has CMAC appended: split data and MAC
             const dataLen = result.length - 8;
             const responseData = result.slice(0, dataLen);
             const responseMac = result.slice(dataLen);
-            // Verify response CMAC (constant-time comparison)
+            // Verify response CMAC with incremented CmdCtr
             const expectedMac = computeResponseCmac(cmacSessionKey, cmacCmdCtr, responseData);
-            let macValid = true;
+            let diff = 0;
             for (let i = 0; i < 8; i++) {
-                macValid = macValid && (responseMac[i] === expectedMac[i]);
+                diff |= responseMac[i] ^ expectedMac[i];
             }
-            if (!macValid) {
+            if (diff !== 0) {
                 throw new Error('CMAC_VERIFY_FAILED');
             }
-            cmacCmdCtr++;
             return responseData;
         }
-        if (cmacSessionKey) {
-            // ACK-only response (e.g. WRITE command) — MAC replaces ACK
-            cmacCmdCtr++;
-        }
         return result;
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ukeyfe/react-native-nfc-litecard",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "NFC read/write for MIFARE Ultralight AES (LiteCard mnemonic storage)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",