Compare commits

...
8 Commits
Author SHA1 Message Date
Michele Balistreri 4d77e475af bump version 2024-09-23 11:27:28 +02:00
Michele Balistreri cb6eb0a9c6 add missing empty emitter methods 2024-09-23 10:50:43 +02:00
Michele Balistreri 3953d66cbc add try statements 2024-09-19 10:16:07 +02:00
Michele Balistreri f2d5c2ca53 fix compilation 2024-09-19 10:09:05 +02:00
Michele Balistreri fe748a8dcd add verifyCard for iOS 2024-09-19 09:49:45 +02:00
Michele Balistreri 36887aeb86 typo 2024-09-16 13:38:06 +02:00
Michele Balistreri 8698594eff typo 2024-09-16 13:32:54 +02:00
Michele Balistreri a360897369 add verifyCard command (android) 2024-09-16 13:31:33 +02:00
6 changed files with 65 additions and 6 deletions
@@ -56,6 +56,17 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
public void onHostDestroy() {
}
// Required for rn built in EventEmitter Calls.
@ReactMethod
public void addListener(String eventName) {
}
@ReactMethod
public void removeListeners(Integer count) {
}
@ReactMethod
public void nfcIsSupported(final Promise promise) {
if (smartCard != null) {
@@ -490,6 +501,20 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
}).start();
}
@ReactMethod
public void verifyCard(final String challenge, final Promise promise) {
new Thread(new Runnable() {
public void run() {
try {
promise.resolve(smartCard.verifyCard(challenge));
} catch (IOException | APDUException e) {
Log.d(TAG, e.getMessage());
promise.reject(e);
}
}
}).start();
}
// These three methods below are a nop on Android since NFC is always listening and we have a custom UI. They are needed in iOS to show the NFC dialog
@ReactMethod
public void startNFC(String prompt, final Promise promise) {
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Iterator;
import im.status.keycard.applet.RecoverableSignature;
import im.status.keycard.applet.Certificate;
import im.status.keycard.globalplatform.GlobalPlatformCommandSet;
import im.status.keycard.io.APDUException;
import im.status.keycard.io.APDUResponse;
@@ -628,6 +629,20 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
return sig;
}
public WritableMap verifyCard(final String challenge) throws IOException, APDUException {
KeycardCommandSet cmdSet = new KeycardCommandSet(this.cardChannel);
cmdSet.select().checkOK();
byte[] rawChallenge = Hex.decode(challenge);
byte[] data = cmdSet.identifyCard(rawChallenge).checkOK().getData();
byte[] caPubKey = Certificate.verifyIdentity(rawChallenge, data);
WritableMap out = Arguments.createMap();
out.putString("ca-public-key", Hex.toHexString(caPubKey));
out.putString("tlv-data", Hex.toHexString(data));
return out;
}
public void setPairings(ReadableMap newPairings) {
pairings.clear();
Iterator<Map.Entry<String,Object>> i = newPairings.getEntryIterator();
+18 -5
View File
@@ -113,7 +113,7 @@ class SmartCard {
try cmdSet.installKeycardInstance().checkOK()
os_log("Keycard applet instance re-installed")
factoryResetPost(channel, resolve, reject)
try factoryResetPost(channel: channel, resolve: resolve, reject: reject)
}
func factoryReset(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
@@ -121,24 +121,37 @@ class SmartCard {
var resp = try cmdSet.select()
if (resp.sw != 0x9000) {
factoryResetFallback(channel, resolve, reject)
try factoryResetFallback(channel: channel, resolve: resolve, reject: reject)
return
}
let info = try ApplicationInfo(resp.data)
if (!info.hasFactoryResetCapability) {
factoryResetFallback(channel, resolve, reject)
try factoryResetFallback(channel: channel, resolve: resolve, reject: reject)
return
}
resp = try cmdSet.factoryReset()
if (resp.sw != 0x9000) {
factoryResetFallback(channel, resolve, reject)
try factoryResetFallback(channel: channel, resolve: resolve, reject: reject)
return
}
factoryResetPost(channel, resolve, reject)
try factoryResetPost(channel: channel, resolve: resolve, reject: reject)
}
func verifyCard(channel: CardChannel, challenge: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws {
let cmdSet = KeycardCommandSet(cardChannel: channel)
try cmdSet.select().checkOK()
let rawChallenge = hexToBytes(challenge);
let data = try cmdSet.identifyCard(challenge: rawChallenge).checkOK().data
let caPubKey = try Certificate.verifyIdentity(hash: rawChallenge, tlvData: data);
resolve([
"ca-public-key": bytesToHex(caPubKey ?? []),
"tlv-data": bytesToHex(data)
])
}
func getApplicationInfo(channel: CardChannel, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) throws -> Void {
+1
View File
@@ -13,6 +13,7 @@ RCT_EXTERN_METHOD(generateAndLoadKey:(NSString *)mnemonic pin:(NSString *)pin re
RCT_EXTERN_METHOD(saveMnemonic:(NSString *)mnemonic pin:(NSString *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(getApplicationInfo:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(factoryReset:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(verifyCard:(NSString *)challenge 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 *)pin resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
RCT_EXTERN_METHOD(exportKeyWithPath:(NSString *)pin path:(NSString *)path resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+5
View File
@@ -72,6 +72,11 @@ class StatusKeycard: RCTEventEmitter {
func factoryReset(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.factoryReset(channel: channel, resolve: resolve, reject: reject) }
}
@objc
func verifyCard(_ challenge: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
keycardInvokation(reject) { [unowned self] channel in try self.smartCard.verifyCard(channel: channel, challenge: challenge, resolve: resolve, reject: reject) }
}
@objc
func getApplicationInfo(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "react-native-status-keycard",
"homepage": "https://keycard.status.im/",
"version": "2.5.40",
"version": "2.6.0",
"description": "React Native library to interact with Status Keycard using NFC connection",
"main": "index.js",
"scripts": {