Updated proto and libs

index.js

@@ -1,3 +1,6 @@
+// pre-requsit for react-native
+require('cbor-rn-prereqs');
+
 import { CKTapCard } from './protocol';
 
 export { CKTapCard };

nfc/index.js

@@ -22,7 +22,6 @@ async function send(cmd, args = {}) {
     const bytes = cborEncode(args);
     const r = await NfcManager.isoDepHandler.transceive(bytes);
     const { response, status } = decodeAndSplitResponse(r);
-    // await NfcManager.cancelTechnologyRequest();
     return { response, status };
   } catch (ex) {
     console.log(ex);

nfc/parser.js

@@ -1,5 +1,4 @@
-const CBOR = require('cbor');
-var Buffer = require('@craftzdog/react-native-buffer').Buffer;
+const CBOR = require('@ellipticoin/cbor');
 
 // transceive data format: CLA, INS, P1, P2, Data Len, Data (bytes array)
 export const cborEncode = (obj) => {
@@ -10,7 +9,7 @@ export const cborEncode = (obj) => {
 
 export const decodeAndSplitResponse = (r) => {
   return {
-    response: CBOR.decode(Buffer.from(r.slice(0, r.length - 2))),
+    response: CBOR.decode(Buffer.from(r)),
     status: bytesToHex(Buffer.from(r.slice(r.length - 2))),
   };
 };

package.json

@@ -16,12 +16,12 @@
   "author": "Praneeth G",
   "license": "MIT",
   "dependencies": {
+    "@ellipticoin/cbor": "^1.0.4",
     "bech32": "^2.0.0",
     "bip32": "^2.0.6",
     "bs58": "^5.0.0",
     "buf-b32": "^2.2.0",
     "buffer-xor": "^2.0.2",
-    "cbor": "^8.1.0",
     "ecpair": "^2.0.1",
     "js-sha256": "^0.9.0",
     "ripemd160": "^2.0.2",

protocol.js

@@ -21,12 +21,10 @@ import base58 from 'bs58';
 
 const { randomBytes } = require('crypto');
 
-//TODO: will update after nfc integration
 async function _send(cmd, args = {}) {
   const { status: stat_word, response: resp } = await transceive(cmd, args);
   return { stat_word, resp };
 }
-
 export class CKTapCard {
   constructor() {
     this.card_nonce = null;
@@ -38,6 +36,7 @@ export class CKTapCard {
     this.auth_delay = null;
     this.is_tapsigner = null;
     this.path = null;
+    this.num_backups = null;
   }
 
   async initialise() {
@@ -82,7 +81,6 @@ export class CKTapCard {
       const code = resp['code'] || 500;
       throw new Error(`${code} on ${cmd}: ${msg}`);
     }
-
     return resp;
   }
 
@@ -111,6 +109,7 @@ export class CKTapCard {
     this.auth_delay = resp['auth_delay'] || 0;
     this.is_tapsigner = resp['tapsigner'] || false;
     this.path = resp['path'] ? path2str(resp['path']) : null;
+    this.num_backups = resp['num_backups'] || 0;
     const { active_slot, num_slots } = resp['slots'] || {
       active_slot: 0,
       num_slots: 1,
@@ -144,10 +143,7 @@ export class CKTapCard {
     if (cmd === 'sign') {
       args.digest = xor_bytes(args.digest, session_key);
     } else if (cmd === 'change') {
-      args.data = xor_bytes(
-        Buffer.from(args.data),
-        session_key.slice(0, args.data.length)
-      );
+      args.data = xor_bytes(args.data, session_key.slice(0, args.data.length));
     }
     const resp = await this.send(cmd, args);
     return { session_key, resp };
@@ -278,7 +274,7 @@ export class CKTapCard {
       master: true,
     });
     const xpub = resp['xpub'];
-    // python: return hash160(xpub[-33:])[0:4]
+    // TODO: check hash160
     return hash160(xpub.slice(-33)).slice(0, 4);
   }
 
@@ -314,7 +310,7 @@ export class CKTapCard {
       console.warn('CVC must be 6..32 characters long');
       return;
     }
-    await this.send_auth('change', old_cvc, { data: force_bytes(new_cvc) });
+    return this.send_auth('change', old_cvc, { data: force_bytes(new_cvc) });
   }
 
   async certificate_check() {
@@ -556,11 +552,7 @@ export class CKTapCard {
   }
 
   async wait() {
-    for (var i = 0; i < 15; i++) {
-      try {
-        await this.send_auth('wait');
-      } catch (e) {}
-    }
+    return this.send('wait');
   }
 
   async read(cvc) {

utils.js

@@ -38,7 +38,7 @@ function xor_bytes(a, b) {
     console.warn('Length mismatch: Expected same lengths at xor_bytes');
     return;
   }
-  return xor(a, b);
+  return Buffer.from(xor(a, b));
 }
 
 function pick_nonce() {
@@ -197,7 +197,10 @@ function recover_pubkey(status_resp, read_resp, my_nonce, ses_key) {
 
   // have to decrypt pubkey
   let pubkey = read_resp['pubkey'];
-  pubkey = pubkey.sloce(0, 1) + xor_bytes(pubkey.sloce(1), ses_key);
+  pubkey = Buffer.concat([
+    pubkey.slice(0, 1),
+    xor_bytes(pubkey.sloce(1), ses_key),
+  ]);
 
   // Critical: proves card knows key
   // TODO: implement sha256 everywhere