use compatible bc

Merge pull request #29 from bitgamma/sdk-302-compat
upgrade to SDK 3.0.2, handle IO errors separately from APDU errors
2020-11-09 12:04:56 +01:00 · 2020-06-25 09:44:40 +03:00 · 2020-06-05 13:33:53 +03:00 · 2020-06-05 12:08:30 +03:00 · 2020-06-05 10:19:01 +03:00 · 2020-06-05 09:01:34 +03:00
8 changed files with 47 additions and 347 deletions
@@ -46,5 +46,5 @@ dependencies {
    implementation 'com.facebook.react:react-native:+'
    implementation 'org.bouncycastle:bcprov-jdk15on:1.60'
    implementation 'org.apache.commons:commons-lang3:3.9'
-    implementation 'com.github.status-im.status-keycard-java:android:3.0.1'
+    implementation 'com.github.status-im.status-keycard-java:android:3.0.2'
 }
@@ -41,9 +41,10 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements
    @Override
    public void onHostResume() {
        if (this.smartCard == null) {
-            this.smartCard = new SmartCard(getCurrentActivity(), reactContext);
-            smartCard.start();
+            this.smartCard = new SmartCard(reactContext);
        }
+
+        smartCard.start(getCurrentActivity());
    }

    @Override
@@ -52,13 +53,12 @@ public class RNStatusKeycardModule extends ReactContextBaseJavaModule implements

    @Override
    public void onHostDestroy() {
-
    }

    @ReactMethod
    public void nfcIsSupported(final Promise promise) {
        if (smartCard != null) {
-            promise.resolve(smartCard.isNfcSupported());
+            promise.resolve(smartCard.isNfcSupported(getCurrentActivity()));
        } else {
            promise.resolve(false);
        }
@@ -41,8 +41,6 @@ import org.bouncycastle.util.encoders.Hex;

 public class SmartCard extends BroadcastReceiver implements CardListener {
    private NFCCardManager cardManager;
-    private Activity activity;
-    private ReactContext reactContext;
    private NfcAdapter nfcAdapter;
    private CardChannel cardChannel;
    private EventEmitter eventEmitter;
@@ -56,12 +54,9 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
    private static final String ENCRYPTION_PATH = "m/43'/60'/1581'/1'/0";
    private static final int WORDS_LIST_SIZE = 2048;

-    public SmartCard(Activity activity, ReactContext reactContext) {
+    public SmartCard(ReactContext reactContext) {
        this.cardManager = new NFCCardManager();
        this.cardManager.setCardListener(this);
-        this.activity = activity;
-        this.reactContext = reactContext;
-        this.nfcAdapter = NfcAdapter.getDefaultAdapter(activity.getBaseContext());
        this.eventEmitter = new EventEmitter(reactContext);
    }

@@ -73,23 +68,31 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
        Log.d(TAG, s);
    }

-    public boolean start() {
-        if (!started) {
+    public boolean start(Activity activity) {
+        if(activity == null) {
+            return false;
+        }

+        if (!started) {
+            this.nfcAdapter = NfcAdapter.getDefaultAdapter(activity.getBaseContext());
            this.cardManager.start();
            started = true;
+        }

-            if (this.nfcAdapter != null) {
-                IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
-                activity.registerReceiver(this, filter);
-                nfcAdapter.enableReaderMode(activity, this.cardManager, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null);
-                return true;
-            } else {
-                log("not support in this device");
-                return false;
-            }
-        } else {
+        if (this.nfcAdapter != null) {
+            IntentFilter filter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
+            activity.registerReceiver(this, filter);
+            nfcAdapter.enableReaderMode(activity, this.cardManager, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null);
            return true;
+        } else {
+            log("not support in this device");
+            return false;
+        }
+    }
+
+    public void stop(Activity activity) {
+        if (activity != null && nfcAdapter != null) {
+            nfcAdapter.disableReaderMode(activity);
        }
    }

@@ -122,8 +125,8 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
        }
    }

-    public boolean isNfcSupported() {
-        return activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC);
+    public boolean isNfcSupported(Activity activity) {
+        return activity != null && activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC);
    }

    public boolean isNfcEnabled() {
@@ -233,14 +236,18 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
            Boolean isPaired = false;

            if (pairingBase64.length() > 0) {
-                try {
-                    Pairing pairing = new Pairing(pairingBase64);
-                    cmdSet.setPairing(pairing);
+                Pairing pairing = new Pairing(pairingBase64);
+                cmdSet.setPairing(pairing);

+                try {
                    cmdSet.autoOpenSecureChannel();
                    Log.i(TAG, "secure channel opened");
                    isPaired = true;
+                } catch(APDUException e) {
+                    Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage());
+                }

+                if (isPaired) {
                    ApplicationStatus status = new ApplicationStatus(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_APPLICATION).checkOK().getData());

                    Log.i(TAG, "PIN retry counter: " + status.getPINRetryCount());
@@ -248,8 +255,6 @@ public class SmartCard extends BroadcastReceiver implements CardListener {

                    cardInfo.putInt("pin-retry-counter", status.getPINRetryCount());
                    cardInfo.putInt("puk-retry-counter", status.getPUKRetryCount());
-                } catch (IOException | IllegalArgumentException e) {
-                    Log.i(TAG, "autoOpenSecureChannel failed: " + e.getMessage());
                }
            }

@@ -587,7 +592,18 @@ public class SmartCard extends BroadcastReceiver implements CardListener {
        Log.i(TAG, "pin verified");

        byte[] hash = Hex.decode(message);
-        RecoverableSignature signature = new RecoverableSignature(hash, cmdSet.signWithPath(hash, path, false).checkOK().getData());
+
+        RecoverableSignature signature;
+
+        if (cmdSet.getApplicationInfo().getAppVersion() < 0x0202) {
+            String actualPath = new KeyPath(cmdSet.getStatus(KeycardCommandSet.GET_STATUS_P1_KEY_PATH).checkOK().getData()).toString();
+            if (!actualPath.equals(path)) {
+                cmdSet.deriveKey(path).checkOK();
+            }
+            signature = new RecoverableSignature(hash, cmdSet.sign(hash).checkOK().getData());
+        } else {
+            signature = new RecoverableSignature(hash, cmdSet.signWithPath(hash, path, false).checkOK().getData());
+        }

        Log.i(TAG, "Signed hash: " + Hex.toHexString(hash));
        Log.i(TAG, "Recovery ID: " + signature.getRecId());
@@ -1,5 +0,0 @@
-#import <React/RCTBridgeModule.h>
-
-@interface StatusKeycard : NSObject <RCTBridgeModule>
-
-@end
@@ -1,14 +0,0 @@
-#import "StatusKeycard.h"
-
-
-@implementation StatusKeycard
-
-RCT_EXPORT_MODULE()
-
-RCT_EXPORT_METHOD(sampleMethod:(NSString *)stringArgument numberParameter:(nonnull NSNumber *)numberArgument callback:(RCTResponseSenderBlock)callback)
-{
-    // TODO: Implement some actually useful functionality
-    callback(@[[NSString stringWithFormat: @"numberArgument: %@ stringArgument: %@", numberArgument, stringArgument]]);
-}
-
-@end
@@ -1,271 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		B3E7B58A1CC2AC0600A0062D /* StatusKeycard.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		58B511D91A9E6C8500147676 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		134814201AA4EA6300B7C361 /* libStatusKeycard.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libStatusKeycard.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		B3E7B5881CC2AC0600A0062D /* StatusKeycard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatusKeycard.h; sourceTree = "<group>"; };
-		B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusKeycard.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		58B511D81A9E6C8500147676 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		134814211AA4EA7D00B7C361 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				134814201AA4EA6300B7C361 /* libStatusKeycard.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		58B511D21A9E6C8500147676 = {
-			isa = PBXGroup;
-			children = (
-				B3E7B5881CC2AC0600A0062D /* StatusKeycard.h */,
-				B3E7B5891CC2AC0600A0062D /* StatusKeycard.m */,
-				134814211AA4EA7D00B7C361 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		58B511DA1A9E6C8500147676 /* StatusKeycard */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "StatusKeycard" */;
-			buildPhases = (
-				58B511D71A9E6C8500147676 /* Sources */,
-				58B511D81A9E6C8500147676 /* Frameworks */,
-				58B511D91A9E6C8500147676 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = StatusKeycard;
-			productName = RCTDataManager;
-			productReference = 134814201AA4EA6300B7C361 /* libStatusKeycard.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		58B511D31A9E6C8500147676 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0920;
-				ORGANIZATIONNAME = Facebook;
-				TargetAttributes = {
-					58B511DA1A9E6C8500147676 = {
-						CreatedOnToolsVersion = 6.1.1;
-					};
-				};
-			};
-			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "StatusKeycard" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 58B511D21A9E6C8500147676;
-			productRefGroup = 58B511D21A9E6C8500147676;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				58B511DA1A9E6C8500147676 /* StatusKeycard */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		58B511D71A9E6C8500147676 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				B3E7B58A1CC2AC0600A0062D /* StatusKeycard.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		58B511ED1A9E6C8500147676 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		58B511EE1A9E6C8500147676 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		58B511F01A9E6C8500147676 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-				"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../../React/**",
-					"$(SRCROOT)/../../react-native/React/**",
-				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = StatusKeycard;
-				SKIP_INSTALL = YES;
-			};
-			name = Debug;
-		};
-		58B511F11A9E6C8500147676 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../../React/**",
-					"$(SRCROOT)/../../react-native/React/**",
-				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = StatusKeycard;
-				SKIP_INSTALL = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "StatusKeycard" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				58B511ED1A9E6C8500147676 /* Debug */,
-				58B511EE1A9E6C8500147676 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "StatusKeycard" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				58B511F01A9E6C8500147676 /* Debug */,
-				58B511F11A9E6C8500147676 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 58B511D31A9E6C8500147676 /* Project object */;
-}
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:StatusKeycard.xcodeproj">
-   </FileRef>
-</Workspace>
@@ -1,19 +0,0 @@
-require "json"
-
-pkg = JSON.parse(File.read("package.json"))
-
-Pod::Spec.new do |s|
-  s.name         = pkg["name"]
-  s.name         = "react-native-status-keycard"
-  s.version      = pkg["version"]
-  s.summary      = pkg["description"]
-  s.requires_arc = true
-  s.license      = pkg["license"]
-  s.homepage     = pkg["homepage"]
-  s.author       = pkg["author"]
-  s.source       = { :git => pkg["repository"]["url"],
-                     :tag => "v" + pkg["version"] }
-  s.source_files = 'ios/**/*.{h,m}'
-  s.platform     = :ios, "8.0"
-  s.dependency 'React/Core'
-end
Author	SHA1	Message	Date
Michele Balistreri	f431c7d6cb	use compatible bc	2020-11-09 12:04:56 +01:00
Bitgamma	c19d58bb5d	Merge pull request #29 from bitgamma/sdk-302-compat upgrade to SDK 3.0.2, handle IO errors separately from APDU errors	2020-06-25 09:44:40 +03:00
Bitgamma	ff570d4720	Merge pull request #30 from bitgamma/stop-start-nfc do not store references to Activity. Start and stop reader as needed	2020-06-05 13:33:53 +03:00
Michele Balistreri	c0d09e3a49	dont explicitly stop the reader	2020-06-05 12:08:30 +03:00
Michele Balistreri	d5feacb4ee	add null handling	2020-06-05 10:19:01 +03:00
Michele Balistreri	eeeaa26819	do not store references to Activity. Start and stop reader as needed	2020-06-05 09:01:34 +03:00
Michele Balistreri	29b3a3c578	upgrade to SDK 3.0.2, handle IO errors separately from APDU errors	2020-06-04 08:04:57 +03:00
Bitgamma	b7fe831dd7	Merge pull request #27 from bitgamma/master make compatible with 2.1 Keycard applet	2020-05-18 17:33:05 +03:00
Bitgamma	26db8dfd25	Merge pull request #1 from status-im/master sync	2020-05-18 15:19:29 +03:00
Michele Balistreri	59052a36d7	make compatible with 2.1 Keycard applet	2020-05-18 13:36:18 +03:00