status-im/react-native-status-keycard
2
0
Fork 0
mirror of https://github.com/status-im/react-native-status-keycard.git synced 2025-03-01 12:30:32 +00:00
Code Issues Projects Releases Wiki Activity

Handle multiple pairings (#38)

Browse Source 
handle multiple pairings
This commit is contained in:
Bitgamma 2021-03-17 18:15:50 +03:00 committed by GitHub
parent f602fadf80
commit d1098e969a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 265 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
android/src/main/java/im/status/ethereum/keycard/RNStatusKeycardModule.java
View File

@ -14,6 +14,7 @@ import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.WritableMap; import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.ReadableMap;
import java.io.IOException; import java.io.IOException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
@ -119,11 +120,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void generateMnemonic(final String pairing, final String words, final Promise promise) { public void generateMnemonic(final String words, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.generateMnemonic(pairing, words)); promise.resolve(smartCard.generateMnemonic(words));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -133,11 +134,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void generateAndLoadKey(final String mnemonic, final String pairing, final String pin, final Promise promise) { public void generateAndLoadKey(final String mnemonic, final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.generateAndLoadKey(mnemonic, pairing, pin)); promise.resolve(smartCard.generateAndLoadKey(mnemonic, pin));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -147,11 +148,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void saveMnemonic(final String mnemonic, final String pairing, final String pin, final Promise promise) { public void saveMnemonic(final String mnemonic, final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
smartCard.saveMnemonic(mnemonic, pairing, pin); smartCard.saveMnemonic(mnemonic, pin);
promise.resolve(true); promise.resolve(true);
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
@ -162,11 +163,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void getApplicationInfo(final String pairingBase64, final Promise promise) { public void getApplicationInfo(final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.getApplicationInfo(pairingBase64)); promise.resolve(smartCard.getApplicationInfo());
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -176,11 +177,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void deriveKey(final String path, final String pairing, final String pin, final Promise promise) { public void deriveKey(final String path, final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
smartCard.deriveKey(path, pairing, pin); smartCard.deriveKey(path, pin);
promise.resolve(path); promise.resolve(path);
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
@ -191,11 +192,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void exportKey(final String pairing, final String pin, final Promise promise) { public void exportKey(final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.exportKey(pairing, pin)); promise.resolve(smartCard.exportKey(pin));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -205,11 +206,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void exportKeyWithPath(final String pairing, final String pin, final String path, final Promise promise) { public void exportKeyWithPath(final String pin, final String path, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.exportKeyWithPath(pairing, pin, path)); promise.resolve(smartCard.exportKeyWithPath(pin, path));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -219,11 +220,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void getKeys(final String pairing, final String pin, final Promise promise) { public void getKeys(final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.getKeys(pairing, pin)); promise.resolve(smartCard.getKeys(pin));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -233,11 +234,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void importKeys(final String pairing, final String pin, final Promise promise) { public void importKeys(final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.importKeys(pairing, pin)); promise.resolve(smartCard.importKeys(pin));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -247,11 +248,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void sign(final String pairing, final String pin, final String hash, final Promise promise) { public void sign(final String pin, final String hash, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.sign(pairing, pin, hash)); promise.resolve(smartCard.sign(pin, hash));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -261,11 +262,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void signWithPath(final String pairing, final String pin, final String path, final String hash, final Promise promise) { public void signWithPath(final String pin, final String path, final String hash, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.signWithPath(pairing, pin, path, hash)); promise.resolve(smartCard.signWithPath(pin, path, hash));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -327,11 +328,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void verifyPin(final String pairing, final String pin, final Promise promise) { public void verifyPin(final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
promise.resolve(smartCard.verifyPin(pairing, pin)); promise.resolve(smartCard.verifyPin(pin));
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
promise.reject(e); promise.reject(e);
@ -341,11 +342,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void changePin(final String pairing, final String currentPin, final String newPin, final Promise promise) { public void changePin(final String currentPin, final String newPin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
smartCard.changePin(pairing, currentPin, newPin); smartCard.changePin(currentPin, newPin);
promise.resolve(true); promise.resolve(true);
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
@ -356,11 +357,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void unblockPin(final String pairing, final String puk, final String newPin, final Promise promise) { public void unblockPin(final String puk, final String newPin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
smartCard.unblockPin(pairing, puk, newPin); smartCard.unblockPin(puk, newPin);
promise.resolve(true); promise.resolve(true);
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
@ -371,11 +372,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void unpair(final String pairing, final String pin, final Promise promise) { public void unpair(final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
smartCard.unpair(pairing, pin); smartCard.unpair(pin);
promise.resolve(true); promise.resolve(true);
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
@ -401,11 +402,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void removeKey(final String pairing, final String pin, final Promise promise) { public void removeKey(final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
smartCard.removeKey(pairing, pin); smartCard.removeKey(pin);
promise.resolve(true); promise.resolve(true);
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
@ -416,11 +417,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void removeKeyWithUnpair(final String pairing, final String pin, final Promise promise) { public void removeKeyWithUnpair(final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
smartCard.removeKeyWithUnpair(pairing, pin); smartCard.removeKeyWithUnpair(pin);
promise.resolve(true); promise.resolve(true);
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
@ -431,11 +432,11 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
} }
@ReactMethod @ReactMethod
public void unpairAndDelete(final String pairing, final String pin, final Promise promise) { public void unpairAndDelete(final String pin, final Promise promise) {
new Thread(new Runnable() { new Thread(new Runnable() {
public void run() { public void run() {
try { try {
smartCard.unpairAndDelete(pairing, pin); smartCard.unpairAndDelete(pin);
promise.resolve(true); promise.resolve(true);
} catch (IOException | APDUException e) { } catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage()); Log.d(TAG, e.getMessage());
@ -460,4 +461,10 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
public void setNFCMessage(String message, final Promise promise) { public void setNFCMessage(String message, final Promise promise) {
promise.resolve(true); promise.resolve(true);
} }
@ReactMethod
public void setPairings(ReadableMap pairings, final Promise promise) {
smartCard.setPairings(pairings);
promise.resolve(true);
}
} }

298
android/src/main/java/im/status/ethereum/keycard/SmartCard.java
View File

@ -21,6 +21,9 @@ import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException; import java.security.spec.InvalidKeySpecException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Scanner; import java.util.Scanner;
import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
import im.status.keycard.applet.RecoverableSignature; import im.status.keycard.applet.RecoverableSignature;
import im.status.keycard.globalplatform.GlobalPlatformCommandSet; import im.status.keycard.globalplatform.GlobalPlatformCommandSet;
@ -46,6 +49,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
private EventEmitter eventEmitter; private EventEmitter eventEmitter;
private static final String TAG = "SmartCard"; private static final String TAG = "SmartCard";
private Boolean started = false; private Boolean started = false;
private HashMap<String, String> pairings;
private static final String MASTER_PATH = "m"; private static final String MASTER_PATH = "m";
private static final String ROOT_PATH = "m/44'/60'/0'/0"; private static final String ROOT_PATH = "m/44'/60'/0'/0";
@ -58,6 +62,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
this.cardManager = new NFCCardManager(); this.cardManager = new NFCCardManager();
this.cardManager.setCardListener(this); this.cardManager.setCardListener(this);
this.eventEmitter = new EventEmitter(reactContext); this.eventEmitter = new EventEmitter(reactContext);
this.pairings = new HashMap<>();
} }
public String getName() { public String getName() {
@ -160,7 +165,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
// First thing to do is selecting the applet on the card. // First thing to do is selecting the applet on the card.
ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData()); ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
Log.i(TAG, "Instance UID: " + Hex.toHexString(info.getInstanceUID())); String instanceUID = Hex.toHexString(info.getInstanceUID());
Log.i(TAG, "Instance UID: " + instanceUID);
Log.i(TAG, "Key UID: " + Hex.toHexString(info.getKeyUID())); Log.i(TAG, "Key UID: " + Hex.toHexString(info.getKeyUID()));
Log.i(TAG, "Secure channel public key: " + Hex.toHexString(info.getSecureChannelPubKey())); Log.i(TAG, "Secure channel public key: " + Hex.toHexString(info.getSecureChannelPubKey()));
Log.i(TAG, "Application version: " + info.getAppVersionString()); Log.i(TAG, "Application version: " + info.getAppVersionString());
@ -169,19 +175,12 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
cmdSet.autoPair(pairingPassword); cmdSet.autoPair(pairingPassword);
Pairing pairing = cmdSet.getPairing(); Pairing pairing = cmdSet.getPairing();
pairings.put(instanceUID, pairing.toBase64());
return pairing.toBase64(); return pairing.toBase64();
} }
public String generateMnemonic(String pairingBase64, String words) throws IOException, APDUException { public String generateMnemonic(String words) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = securedCommandSet();
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
Mnemonic mnemonic = new Mnemonic(cmdSet.generateMnemonic(KeycardCommandSet.GENERATE_MNEMONIC_12_WORDS).checkOK().getData()); Mnemonic mnemonic = new Mnemonic(cmdSet.generateMnemonic(KeycardCommandSet.GENERATE_MNEMONIC_12_WORDS).checkOK().getData());
@ -198,18 +197,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
return mnemonic.toMnemonicPhrase(); return mnemonic.toMnemonicPhrase();
} }
public void saveMnemonic(String mnemonic, String pairingBase64, String pin) throws IOException, APDUException { public void saveMnemonic(String mnemonic, String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
byte[] seed = Mnemonic.toBinarySeed(mnemonic, ""); byte[] seed = Mnemonic.toBinarySeed(mnemonic, "");
cmdSet.loadKey(seed); cmdSet.loadKey(seed);
@ -217,7 +206,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
log("seed loaded to card"); log("seed loaded to card");
} }
public WritableMap getApplicationInfo(final String pairingBase64) throws IOException, APDUException { public WritableMap getApplicationInfo() throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData()); ApplicationInfo info = new ApplicationInfo(cmdSet.select().checkOK().getData());
@ -227,7 +216,9 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
cardInfo.putBoolean("initialized?", info.isInitializedCard()); cardInfo.putBoolean("initialized?", info.isInitializedCard());
if (info.isInitializedCard()) { if (info.isInitializedCard()) {
Log.i(TAG, "Instance UID: " + Hex.toHexString(info.getInstanceUID())); String instanceUID = Hex.toHexString(info.getInstanceUID());
Log.i(TAG, "Instance UID: " + instanceUID);
Log.i(TAG, "Key UID: " + Hex.toHexString(info.getKeyUID())); Log.i(TAG, "Key UID: " + Hex.toHexString(info.getKeyUID()));
Log.i(TAG, "Secure channel public key: " + Hex.toHexString(info.getSecureChannelPubKey())); Log.i(TAG, "Secure channel public key: " + Hex.toHexString(info.getSecureChannelPubKey()));
Log.i(TAG, "Application version: " + info.getAppVersionString()); Log.i(TAG, "Application version: " + info.getAppVersionString());
@ -235,13 +226,9 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
Boolean isPaired = false; Boolean isPaired = false;
if (pairingBase64.length() > 0) { if (pairings.containsKey(instanceUID)) {
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
try { try {
cmdSet.autoOpenSecureChannel(); openSecureChannel(cmdSet);
Log.i(TAG, "secure channel opened");
isPaired = true; isPaired = true;
} catch(APDUException e) { } catch(APDUException e) {
Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage()); Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage());
@ -270,18 +257,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
return cardInfo; return cardInfo;
} }
public void deriveKey(final String path, final String pairingBase64, final String pin) throws IOException, APDUException { public void deriveKey(final String path, final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
KeyPath currentPath = new KeyPath(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_KEY_PATH).checkOK().getData()); KeyPath currentPath = new KeyPath(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_KEY_PATH).checkOK().getData());
Log.i(TAG, "Current key path: " + currentPath); Log.i(TAG, "Current key path: " + currentPath);
@ -292,54 +269,24 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
} }
} }
public String exportKey(final String pairingBase64, final String pin) throws IOException, APDUException { public String exportKey(final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
byte[] key = cmdSet.exportCurrentKey(true).checkOK().getData(); byte[] key = cmdSet.exportCurrentKey(true).checkOK().getData();
return Hex.toHexString(key); return Hex.toHexString(key);
} }
public String exportKeyWithPath(final String pairingBase64, final String pin, final String path) throws IOException, APDUException { public String exportKeyWithPath(final String pin, final String path) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
byte[] key = BIP32KeyPair.fromTLV(cmdSet.exportKey(path, false, true).checkOK().getData()).getPublicKey(); byte[] key = BIP32KeyPair.fromTLV(cmdSet.exportKey(path, false, true).checkOK().getData()).getPublicKey();
return Hex.toHexString(key); return Hex.toHexString(key);
} }
public WritableMap getKeys(final String pairingBase64, final String pin) throws IOException, APDUException { public WritableMap getKeys(final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData(); byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData();
BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlvWhisper); BIP32KeyPair whisperKeyPair = BIP32KeyPair.fromTLV(tlvWhisper);
@ -360,18 +307,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
return data; return data;
} }
public WritableMap importKeys(final String pairingBase64, final String pin) throws IOException, APDUException { public WritableMap importKeys(final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData(); byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption); BIP32KeyPair encryptionKeyPair = BIP32KeyPair.fromTLV(tlvEncryption);
@ -407,18 +344,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
return data; return data;
} }
public WritableMap generateAndLoadKey(final String mnemonic, final String pairingBase64, final String pin) throws IOException, APDUException { public WritableMap generateAndLoadKey(final String mnemonic, final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
byte[] seed = Mnemonic.toBinarySeed(mnemonic, ""); byte[] seed = Mnemonic.toBinarySeed(mnemonic, "");
BIP32KeyPair keyPair = BIP32KeyPair.fromBinarySeed(seed); BIP32KeyPair keyPair = BIP32KeyPair.fromBinarySeed(seed);
@ -473,70 +400,32 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
return init(userPin); return init(userPin);
} }
public int verifyPin(final String pairingBase64, final String pin) throws IOException, APDUException { public int verifyPin(final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK(); return 3;
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
ApplicationStatus status = new ApplicationStatus(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_APPLICATION).checkOK().getData());
return status.getPINRetryCount();
} }
public void changePin(final String pairingBase64, final String currentPin, final String newPin) throws IOException, APDUException { public void changePin(final String currentPin, final String newPin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(currentPin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(currentPin).checkOK();
Log.i(TAG, "pin verified");
cmdSet.changePIN(0, newPin); cmdSet.changePIN(0, newPin);
Log.i(TAG, "pin changed"); Log.i(TAG, "pin changed");
} }
public void unblockPin(final String pairingBase64, final String puk, final String newPin) throws IOException, APDUException { public void unblockPin(final String puk, final String newPin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = securedCommandSet();
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.unblockPIN(puk, newPin).checkOK(); cmdSet.unblockPIN(puk, newPin).checkOK();
Log.i(TAG, "pin unblocked"); Log.i(TAG, "pin unblocked");
} }
public void unpair(final String pairingBase64, final String pin) throws IOException, APDUException { public void unpair(final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
cmdSet.autoUnpair(); cmdSet.autoUnpair();
Log.i(TAG, "card unpaired"); Log.i(TAG, "card unpaired");
String instanceUID = Hex.toHexString(cmdSet.getApplicationInfo().getInstanceUID());
pairings.remove(instanceUID);
} }
public void delete() throws IOException, APDUException { public void delete() throws IOException, APDUException {
@ -550,35 +439,15 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
Log.i(TAG, "instance and package deleted"); Log.i(TAG, "instance and package deleted");
} }
public void removeKey(final String pairingBase64, final String pin) throws IOException, APDUException { public void removeKey(final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
cmdSet.removeKey(); cmdSet.removeKey();
Log.i(TAG, "key removed"); Log.i(TAG, "key removed");
} }
public void removeKeyWithUnpair(final String pairingBase64, final String pin) throws IOException, APDUException { public void removeKeyWithUnpair(final String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
cmdSet.removeKey(); cmdSet.removeKey();
Log.i(TAG, "key removed"); Log.i(TAG, "key removed");
@ -588,25 +457,18 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
cmdSet.autoUnpair(); cmdSet.autoUnpair();
Log.i(TAG, "card unpaired"); Log.i(TAG, "card unpaired");
String instanceUID = Hex.toHexString(cmdSet.getApplicationInfo().getInstanceUID());
pairings.remove(instanceUID);
} }
public void unpairAndDelete(final String pairingBase64, final String pin) throws IOException, APDUException { public void unpairAndDelete(final String pin) throws IOException, APDUException {
unpair(pairingBase64, pin); unpair(pin);
delete(); delete();
} }
public String sign(final String pairingBase64, final String pin, final String message) throws IOException, APDUException { public String sign(final String pin, final String message) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
byte[] hash = Hex.decode(message); byte[] hash = Hex.decode(message);
RecoverableSignature signature = new RecoverableSignature(hash, cmdSet.sign(hash).checkOK().getData()); RecoverableSignature signature = new RecoverableSignature(hash, cmdSet.sign(hash).checkOK().getData());
@ -628,18 +490,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
return sig; return sig;
} }
public String signWithPath(final String pairingBase64, final String pin, final String path, final String message) throws IOException, APDUException { public String signWithPath(final String pin, final String path, final String message) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.select().checkOK();
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
byte[] hash = Hex.decode(message); byte[] hash = Hex.decode(message);
@ -695,4 +547,46 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
return sig; return sig;
} }
public void setPairings(ReadableMap newPairings) {
pairings.clear();
Iterator<Map.Entry<String,Object>> i = newPairings.getEntryIterator();
while (i.hasNext()) {
Map.Entry<String, Object> entry = i.next();
String value = ((ReadableMap) entry.getValue()).getString("pairing");
pairings.put(entry.getKey(), value);
}
}
private KeycardCommandSet authenticatedCommandSet(String pin) throws IOException, APDUException {
KeycardCommandSet cmdSet = securedCommandSet();
cmdSet.verifyPIN(pin).checkOK();
Log.i(TAG, "pin verified");
return cmdSet;
}
private KeycardCommandSet securedCommandSet() throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
cmdSet.select().checkOK();
openSecureChannel(cmdSet);
return cmdSet;
}
private void openSecureChannel(KeycardCommandSet cmdSet) throws IOException, APDUException {
String instanceUID = Hex.toHexString(cmdSet.getApplicationInfo().getInstanceUID());
String pairingBase64 = pairings.get(instanceUID);
if (pairingBase64 == null) {
throw new APDUException("No pairing found");
}
Pairing pairing = new Pairing(pairingBase64);
cmdSet.setPairing(pairing);
cmdSet.autoOpenSecureChannel();
Log.i(TAG, "secure channel opened");
}
} }

107
ios/SmartCard.swift
View File

@ -4,6 +4,7 @@ import os.log
enum SmartCardError: Error { enum SmartCardError: Error {
case invalidBase64 case invalidBase64
case noPairing
} }
enum DerivationPath: String { enum DerivationPath: String {
@ -15,6 +16,8 @@ enum DerivationPath: String {
} }
class SmartCard { class SmartCard {
var pairings: [String: String] = [:]
func initialize(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func initialize(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let puk = self.randomPUK() let puk = self.randomPUK()
let pairingPassword = self.randomPairingPassword(); let pairingPassword = self.randomPairingPassword();
@ -33,12 +36,13 @@ class SmartCard {
logAppInfo(info) logAppInfo(info)
try cmdSet.autoPair(password: pairingPassword) try cmdSet.autoPair(password: pairingPassword)
let pairing = Data(cmdSet.pairing!.bytes).base64EncodedString()
resolve(Data(cmdSet.pairing!.bytes).base64EncodedString()) self.pairings[bytesToHex(info.instanceUID)] = pairing
resolve(pairing)
} }
func generateMnemonic(channel: CardChannel, pairingBase64: String, words: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func generateMnemonic(channel: CardChannel, words: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try securedCommandSet(channel: channel, pairingBase64: pairingBase64) let cmdSet = try securedCommandSet(channel: channel)
let mnemonic = try Mnemonic(rawData: cmdSet.generateMnemonic(length: GenerateMnemonicP1.length12Words).checkOK().data) let mnemonic = try Mnemonic(rawData: cmdSet.generateMnemonic(length: GenerateMnemonicP1.length12Words).checkOK().data)
mnemonic.wordList = words.components(separatedBy: .newlines) mnemonic.wordList = words.components(separatedBy: .newlines)
@ -46,8 +50,8 @@ class SmartCard {
resolve(mnemonic.toMnemonicPhrase()) resolve(mnemonic.toMnemonicPhrase())
} }
func generateAndLoadKey(channel: CardChannel, mnemonic: String, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func generateAndLoadKey(channel: CardChannel, mnemonic: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let seed = Mnemonic.toBinarySeed(mnemonicPhrase: mnemonic) let seed = Mnemonic.toBinarySeed(mnemonicPhrase: mnemonic)
let keyPair = BIP32KeyPair(fromSeed: seed) let keyPair = BIP32KeyPair(fromSeed: seed)
@ -77,15 +81,15 @@ class SmartCard {
]) ])
} }
func saveMnemonic(channel: CardChannel, mnemonic: String, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func saveMnemonic(channel: CardChannel, mnemonic: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let seed = Mnemonic.toBinarySeed(mnemonicPhrase: mnemonic) let seed = Mnemonic.toBinarySeed(mnemonicPhrase: mnemonic)
try cmdSet.loadKey(seed: seed).checkOK() try cmdSet.loadKey(seed: seed).checkOK()
os_log("seed loaded to card"); os_log("seed loaded to card");
resolve(true) resolve(true)
} }
func getApplicationInfo(channel: CardChannel, pairingBase64: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func getApplicationInfo(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = KeycardCommandSet(cardChannel: channel) let cmdSet = KeycardCommandSet(cardChannel: channel)
let info = try ApplicationInfo(cmdSet.select().checkOK().data) let info = try ApplicationInfo(cmdSet.select().checkOK().data)
@ -97,9 +101,9 @@ class SmartCard {
logAppInfo(info) logAppInfo(info)
var isPaired = false var isPaired = false
if (!pairingBase64.isEmpty) { if let _ = self.pairings[bytesToHex(info.instanceUID)] {
do { do {
try openSecureChannel(cmdSet: cmdSet, pairingBase64: pairingBase64) try openSecureChannel(cmdSet: cmdSet)
isPaired = true isPaired = true
} catch let error as CardError { } catch let error as CardError {
os_log("autoOpenSecureChannel failed: %@", String(describing: error)); os_log("autoOpenSecureChannel failed: %@", String(describing: error));
@ -130,8 +134,8 @@ class SmartCard {
resolve(cardInfo) resolve(cardInfo)
} }
func deriveKey(channel: CardChannel, path: String, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func deriveKey(channel: CardChannel, path: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let currentPath = try KeyPath(data: cmdSet.getStatus(info: GetStatusP1.keyPath.rawValue).checkOK().data); let currentPath = try KeyPath(data: cmdSet.getStatus(info: GetStatusP1.keyPath.rawValue).checkOK().data);
os_log("Current key path: %@", currentPath.description) os_log("Current key path: %@", currentPath.description)
@ -143,21 +147,21 @@ class SmartCard {
resolve(true) resolve(true)
} }
func exportKey(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func exportKey(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let key = try cmdSet.exportCurrentKey(publicOnly: true).checkOK().data let key = try cmdSet.exportCurrentKey(publicOnly: true).checkOK().data
resolve(bytesToHex(key)) resolve(bytesToHex(key))
} }
func exportKeyWithPath(channel: CardChannel, pairingBase64: String, pin: String, path: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func exportKeyWithPath(channel: CardChannel, pin: String, path: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let key = try BIP32KeyPair(fromTLV: cmdSet.exportKey(path: path, makeCurrent: false, publicOnly: true).checkOK().data).publicKey; let key = try BIP32KeyPair(fromTLV: cmdSet.exportKey(path: path, makeCurrent: false, publicOnly: true).checkOK().data).publicKey;
resolve(bytesToHex(key)) resolve(bytesToHex(key))
} }
func importKeys(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func importKeys(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let encryptionKeyPair = try exportKey(cmdSet: cmdSet, path: .encryptionPath, makeCurrent: false, publicOnly: false) let encryptionKeyPair = try exportKey(cmdSet: cmdSet, path: .encryptionPath, makeCurrent: false, publicOnly: false)
let masterPair = try exportKey(cmdSet: cmdSet, path: .masterPath, makeCurrent: false, publicOnly: true) let masterPair = try exportKey(cmdSet: cmdSet, path: .masterPath, makeCurrent: false, publicOnly: true)
@ -183,8 +187,8 @@ class SmartCard {
]) ])
} }
func getKeys(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func getKeys(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let whisperKeyPair = try exportKey(cmdSet: cmdSet, path: .whisperPath, makeCurrent: false, publicOnly: false) let whisperKeyPair = try exportKey(cmdSet: cmdSet, path: .whisperPath, makeCurrent: false, publicOnly: false)
let encryptionKeyPair = try exportKey(cmdSet: cmdSet, path: .encryptionPath, makeCurrent: false, publicOnly: false) let encryptionKeyPair = try exportKey(cmdSet: cmdSet, path: .encryptionPath, makeCurrent: false, publicOnly: false)
@ -201,14 +205,14 @@ class SmartCard {
]) ])
} }
func sign(channel: CardChannel, pairingBase64: String, pin: String, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func sign(channel: CardChannel, pin: String, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let sig = try processSignature(message) { return try cmdSet.sign(hash: $0) } let sig = try processSignature(message) { return try cmdSet.sign(hash: $0) }
resolve(sig) resolve(sig)
} }
func signWithPath(channel: CardChannel, pairingBase64: String, pin: String, path: String, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func signWithPath(channel: CardChannel, pin: String, path: String, message: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
let sig = try processSignature(message) { let sig = try processSignature(message) {
if (cmdSet.info!.appVersion < 0x0202) { if (cmdSet.info!.appVersion < 0x0202) {
let currentPath = try KeyPath(data: cmdSet.getStatus(info: GetStatusP1.keyPath.rawValue).checkOK().data); let currentPath = try KeyPath(data: cmdSet.getStatus(info: GetStatusP1.keyPath.rawValue).checkOK().data);
@ -234,45 +238,45 @@ class SmartCard {
resolve(sig) resolve(sig)
} }
func verifyPin(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func verifyPin(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let _ = try authenticatedCommandSet(channel: channel, pin: pin)
let status = try ApplicationStatus(cmdSet.getStatus(info: GetStatusP1.application.rawValue).checkOK().data); resolve(3)
resolve(status.pinRetryCount)
} }
func changePin(channel: CardChannel, pairingBase64: String, currentPin: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func changePin(channel: CardChannel, currentPin: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: currentPin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: currentPin)
try cmdSet.changePIN(pin: newPin).checkOK() try cmdSet.changePIN(pin: newPin).checkOK()
os_log("pin changed") os_log("pin changed")
resolve(true) resolve(true)
} }
func unblockPin(channel: CardChannel, pairingBase64: String, puk: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func unblockPin(channel: CardChannel, puk: String, newPin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try securedCommandSet(channel: channel, pairingBase64: pairingBase64) let cmdSet = try securedCommandSet(channel: channel)
try cmdSet.unblockPIN(puk: puk, newPIN: newPin).checkAuthOK() try cmdSet.unblockPIN(puk: puk, newPIN: newPin).checkAuthOK()
os_log("pin unblocked") os_log("pin unblocked")
resolve(true) resolve(true)
} }
func unpair(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func unpair(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
try cmdSet.autoUnpair() try cmdSet.autoUnpair()
os_log("card unpaired") os_log("card unpaired")
self.pairings[bytesToHex(cmdSet.info!.instanceUID)] = nil
resolve(true) resolve(true)
} }
func removeKey(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func removeKey(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
try cmdSet.removeKey().checkOK() try cmdSet.removeKey().checkOK()
os_log("key removed") os_log("key removed")
resolve(true) resolve(true)
} }
func removeKeyWithUnpair(channel: CardChannel, pairingBase64: String, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void { func removeKeyWithUnpair(channel: CardChannel, pin: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
let cmdSet = try authenticatedCommandSet(channel: channel, pairingBase64: pairingBase64, pin: pin) let cmdSet = try authenticatedCommandSet(channel: channel, pin: pin)
try cmdSet.removeKey().checkOK() try cmdSet.removeKey().checkOK()
os_log("key removed") os_log("key removed")
@ -282,6 +286,8 @@ class SmartCard {
try cmdSet.autoUnpair() try cmdSet.autoUnpair()
os_log("card unpaired") os_log("card unpaired")
self.pairings[bytesToHex(cmdSet.info!.instanceUID)] = nil
resolve(true) resolve(true)
} }
@ -301,27 +307,40 @@ class SmartCard {
return try BIP32KeyPair(fromTLV: tlvRoot) return try BIP32KeyPair(fromTLV: tlvRoot)
} }
func authenticatedCommandSet(channel: CardChannel, pairingBase64: String, pin: String) throws -> KeycardCommandSet { func setPairings(newPairings: NSDictionary, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
let cmdSet = try securedCommandSet(channel: channel, pairingBase64: pairingBase64) self.pairings.removeAll()
for case let (instanceUID as String, v as NSDictionary) in newPairings {
self.pairings[instanceUID] = v["pairing"] as? String
}
resolve(true)
}
func authenticatedCommandSet(channel: CardChannel, pin: String) throws -> KeycardCommandSet {
let cmdSet = try securedCommandSet(channel: channel)
try cmdSet.verifyPIN(pin: pin).checkAuthOK() try cmdSet.verifyPIN(pin: pin).checkAuthOK()
os_log("pin verified") os_log("pin verified")
return cmdSet; return cmdSet;
} }
func securedCommandSet(channel: CardChannel, pairingBase64: String) throws -> KeycardCommandSet { func securedCommandSet(channel: CardChannel) throws -> KeycardCommandSet {
let cmdSet = KeycardCommandSet(cardChannel: channel) let cmdSet = KeycardCommandSet(cardChannel: channel)
try cmdSet.select().checkOK() try cmdSet.select().checkOK()
try openSecureChannel(cmdSet: cmdSet, pairingBase64: pairingBase64) try openSecureChannel(cmdSet: cmdSet)
return cmdSet return cmdSet
} }
func openSecureChannel(cmdSet: KeycardCommandSet, pairingBase64: String) throws -> Void { func openSecureChannel(cmdSet: KeycardCommandSet) throws -> Void {
if let pairingBase64 = self.pairings[bytesToHex(cmdSet.info!.instanceUID)] {
cmdSet.pairing = try base64ToPairing(pairingBase64) cmdSet.pairing = try base64ToPairing(pairingBase64)
try cmdSet.autoOpenSecureChannel() try cmdSet.autoOpenSecureChannel()
os_log("secure channel opened") os_log("secure channel opened")
} else {
throw SmartCardError.noPairing
}
} }
func processSignature(_ message: String, sign: ([UInt8]) throws -> APDUResponse) throws -> String { func processSignature(_ message: String, sign: ([UInt8]) throws -> APDUResponse) throws -> String {

37
ios/StatusKeycard.m
View File

@ -8,30 +8,31 @@ RCT_EXTERN_METHOD(nfcIsEnabled:(RCTPromiseResolveBlock)resolve reject: (RCTPromi
RCT_EXTERN_METHOD(openNfcSettings:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(openNfcSettings:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(init:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(init:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(pair:(NSString *)pairingPassword resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(pair:(NSString *)pairingPassword resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(generateMnemonic:(NSString *)pairing words:(NSString *)words resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(generateMnemonic:(NSString *)words resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(generateAndLoadKey:(NSString *)mnemonic pairing: (NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(generateAndLoadKey:(NSString *)mnemonic pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(saveMnemonic:(NSString *)mnemonic pairing: (NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(saveMnemonic:(NSString *)mnemonic pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(getApplicationInfo:(NSString *)pairingBase64 resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(getApplicationInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(deriveKey:(NSString *)path pairing: (NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(deriveKey:(NSString *)path pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(exportKey:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(exportKey:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(exportKeyWithPath:(NSString *)pairing pin:(NSString *)pin path:(NSString *)path resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(exportKeyWithPath:(NSString *)pin path:(NSString *)path resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(importKeys:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(importKeys:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(getKeys:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(getKeys:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(sign:(NSString *)pairing pin:(NSString *)pin hash:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(sign:(NSString *)pin hash:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(signWithPath:(NSString *)pairing pin:(NSString *)pin path:(NSString *)path hash:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(signWithPath:(NSString *)pin path:(NSString *)path hash:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(signPinless:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(signPinless:(NSString *)hash resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(installApplet:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(installApplet:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(installAppletAndInitCard:(String *)pin resolve: (RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(installAppletAndInitCard:(String *)pin resolve: (RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(verifyPin:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(verifyPin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(changePin:(NSString *)pairing currentPin:(NSString *)currentPin newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(changePin:(NSString *)currentPin newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(unblockPin:(NSString *)pairing puk:(NSString *)puk newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(unblockPin:(NSString *)puk newPin:(NSString *)newPin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(unpair:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(unpair:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(delete:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(delete:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(removeKey:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(removeKey:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(removeKeyWithUnpair:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(removeKeyWithUnpair:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(unpairAndDelete:(NSString *)pairing pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(unpairAndDelete:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(startNFC:(NSString *)prompt resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(startNFC:(NSString *)prompt resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(stopNFC:(NSString *)err resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(stopNFC:(NSString *)err resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(setNFCMessage:(NSString *)message resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject) RCT_EXTERN_METHOD(setNFCMessage:(NSString *)message resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(setPairings:(NSDictionary *)pairings resolve:(RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject)
@end @end

75
ios/StatusKeycard.swift
View File

@ -44,58 +44,58 @@ class StatusKeycard: RCTEventEmitter {
} }
@objc @objc
func generateMnemonic(_ pairing: String, words: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func generateMnemonic(_ words: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.generateMnemonic(channel: channel, pairingBase64: pairing, words: words, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.generateMnemonic(channel: channel, words: words, resolve: resolve, reject: reject) }
} }
@objc @objc
func generateAndLoadKey(_ mnemonic: String, pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func generateAndLoadKey(_ mnemonic: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.generateAndLoadKey(channel: channel, mnemonic: mnemonic, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.generateAndLoadKey(channel: channel, mnemonic: mnemonic, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func saveMnemonic(_ mnemonic: String, pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func saveMnemonic(_ mnemonic: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.saveMnemonic(channel: channel, mnemonic: mnemonic, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.saveMnemonic(channel: channel, mnemonic: mnemonic, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func getApplicationInfo(_ pairingBase64: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func getApplicationInfo(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getApplicationInfo(channel: channel, pairingBase64: pairingBase64, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getApplicationInfo(channel: channel, resolve: resolve, reject: reject) }
} }
@objc @objc
func deriveKey(_ path: String, pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func deriveKey(_ path: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.deriveKey(channel: channel, path: path, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.deriveKey(channel: channel, path: path, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func exportKey(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func exportKey(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.exportKey(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.exportKey(channel: channel, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func exportKeyWithPath(_ pairing: String, pin: String, path: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func exportKeyWithPath(_ pin: String, path: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.exportKeyWithPath(channel: channel, pairingBase64: pairing, pin: pin, path: path, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.exportKeyWithPath(channel: channel, pin: pin, path: path, resolve: resolve, reject: reject) }
} }
@objc @objc
func importKeys(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func importKeys(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.importKeys(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.importKeys(channel: channel, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func getKeys(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func getKeys(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getKeys(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.getKeys(channel: channel, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func sign(_ pairing: String, pin: String, hash: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func sign(_ pin: String, hash: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.sign(channel: channel, pairingBase64: pairing, pin: pin, message: hash, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.sign(channel: channel, pin: pin, message: hash, resolve: resolve, reject: reject) }
} }
@objc @objc
func signWithPath(_ pairing: String, pin: String, path: String, hash: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func signWithPath(_ pin: String, path: String, hash: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.signWithPath(channel: channel, pairingBase64: pairing, pin: pin, path: path, message: hash, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.signWithPath(channel: channel, pin: pin, path: path, message: hash, resolve: resolve, reject: reject) }
} }
@objc @objc
@ -114,23 +114,23 @@ class StatusKeycard: RCTEventEmitter {
} }
@objc @objc
func verifyPin(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func verifyPin(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.verifyPin(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.verifyPin(channel: channel, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func changePin(_ pairing: String, currentPin: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func changePin(_ currentPin: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePin(channel: channel, pairingBase64: pairing, currentPin: currentPin, newPin: newPin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.changePin(channel: channel, currentPin: currentPin, newPin: newPin, resolve: resolve, reject: reject) }
} }
@objc @objc
func unblockPin(_ pairing: String, puk: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func unblockPin(_ puk: String, newPin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.unblockPin(channel: channel, pairingBase64: pairing, puk: puk, newPin: newPin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.unblockPin(channel: channel, puk: puk, newPin: newPin, resolve: resolve, reject: reject) }
} }
@objc @objc
func unpair(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func unpair(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.unpair(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.unpair(channel: channel, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
@ -139,20 +139,25 @@ class StatusKeycard: RCTEventEmitter {
} }
@objc @objc
func removeKey(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func removeKey(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.removeKey(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.removeKey(channel: channel, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func removeKeyWithUnpair(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func removeKeyWithUnpair(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.removeKeyWithUnpair(channel: channel, pairingBase64: pairing, pin: pin, resolve: resolve, reject: reject) } keycardInvokation(reject) { [unowned self] channel in try self.smartCard.removeKeyWithUnpair(channel: channel, pin: pin, resolve: resolve, reject: reject) }
} }
@objc @objc
func unpairAndDelete(_ pairing: String, pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { func unpairAndDelete(_ pin: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
reject("E_KEYCARD", "Not implemented (unused)", nil) reject("E_KEYCARD", "Not implemented (unused)", nil)
} }
@objc
func setPairings(_ pairings: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
self.smartCard.setPairings(newPairings: pairings, resolve: resolve, reject: reject)
}
@objc @objc
func startNFC(_ prompt: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void { func startNFC(_ prompt: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
if #available(iOS 13.0, *) { if #available(iOS 13.0, *) {

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "react-native-status-keycard", "name": "react-native-status-keycard",
"homepage": "https://keycard.status.im/", "homepage": "https://keycard.status.im/",
"version": "2.5.32", "version": "2.5.33",
"description": "React Native library to interact with Status Keycard using NFC connection (Android only)", "description": "React Native library to interact with Status Keycard using NFC connection (Android only)",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {