status-im/react-native-status-keycard
2
0
Fork 0
mirror of https://github.com/status-im/react-native-status-keycard.git synced 2025-02-28 20:10:28 +00:00
Code Issues Projects Releases Wiki Activity

remove pairing argument internally

Browse Source
This commit is contained in:
Michele Balistreri 2021-03-15 11:05:25 +03:00
parent 1a11d833ef
commit 39921f7387
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -138,7 +138,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -152,7 +152,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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());
@ -167,7 +167,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -181,7 +181,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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());
@ -196,7 +196,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -210,7 +210,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -224,7 +224,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -238,7 +238,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -252,7 +252,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -266,7 +266,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -332,7 +332,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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);
@ -346,7 +346,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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());
@ -361,7 +361,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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());
@ -376,7 +376,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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());
@ -406,7 +406,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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());
@ -421,7 +421,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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());
@ -436,7 +436,7 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
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());

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

@ -179,7 +179,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
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 = securedCommandSet(); KeycardCommandSet cmdSet = securedCommandSet();
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());
@ -197,7 +197,7 @@ 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
byte[] seed = Mnemonic.toBinarySeed(mnemonic, ""); byte[] seed = Mnemonic.toBinarySeed(mnemonic, "");
@ -206,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());
@ -257,7 +257,7 @@ 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
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());
@ -269,7 +269,7 @@ 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
byte[] key = cmdSet.exportCurrentKey(true).checkOK().getData(); byte[] key = cmdSet.exportCurrentKey(true).checkOK().getData();
@ -277,7 +277,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
byte[] key = BIP32KeyPair.fromTLV(cmdSet.exportKey(path, false, true).checkOK().getData()).getPublicKey(); byte[] key = BIP32KeyPair.fromTLV(cmdSet.exportKey(path, false, true).checkOK().getData()).getPublicKey();
@ -285,7 +285,7 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData(); byte[] tlvWhisper = cmdSet.exportKey(WHISPER_PATH, false, false).checkOK().getData();
@ -307,7 +307,7 @@ 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData(); byte[] tlvEncryption = cmdSet.exportKey(ENCRYPTION_PATH, false, false).checkOK().getData();
@ -344,7 +344,7 @@ 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
byte[] seed = Mnemonic.toBinarySeed(mnemonic, ""); byte[] seed = Mnemonic.toBinarySeed(mnemonic, "");
@ -400,26 +400,26 @@ 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
return 3; return 3;
} }
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 = authenticatedCommandSet(currentPin); KeycardCommandSet cmdSet = authenticatedCommandSet(currentPin);
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 = securedCommandSet(); KeycardCommandSet cmdSet = securedCommandSet();
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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.autoUnpair(); cmdSet.autoUnpair();
@ -439,14 +439,14 @@ 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
cmdSet.removeKey(); cmdSet.removeKey();
@ -462,12 +462,12 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
pairings.remove(instanceUID); 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
byte[] hash = Hex.decode(message); byte[] hash = Hex.decode(message);
@ -490,7 +490,7 @@ 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 = authenticatedCommandSet(pin); KeycardCommandSet cmdSet = authenticatedCommandSet(pin);
byte[] hash = Hex.decode(message); byte[] hash = Hex.decode(message);