Do not bleed out BouncyCastle into library API

keycard-tech · Oct 26, 2018 · 4a9c662 · 4a9c662
1 parent 2186f44
commit 4a9c662
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/demo/src/main/java/im/status/hardwallet_lite_android/app/MainActivity.java b/demo/src/main/java/im/status/hardwallet_lite_android/app/MainActivity.java
@@ -10,13 +10,8 @@
 import im.status.hardwallet_lite_android.io.CardManager;
 import im.status.hardwallet_lite_android.io.OnCardConnectedListener;
 import im.status.hardwallet_lite_android.wallet.WalletAppletCommandSet;
-import java.security.Security;
-import org.spongycastle.util.encoders.Hex;
 
 public class MainActivity extends AppCompatActivity {
-  static {
-    Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
-  }
 
   private static final String TAG = "MainActivity";
 
@@ -43,25 +38,36 @@ public void onConnected(CardChannel cardChannel) {
           // First thing to do is selecting the applet on the card.
           cmdSet.select().checkOK();
 
+          Log.i(TAG, "Applet is installed on the connected card.");
+
           // In real projects, the pairing key should be saved and used for all new sessions.
           cmdSet.autoPair("WalletAppletTest");
 
+          Log.i(TAG, "Pairing with card is done.");
+
           // Opening a Secure Channel is needed for all other applet commands
           cmdSet.autoOpenSecureChannel();
 
+          Log.i(TAG, "Secure channel opened.");
+
           // We send a GET STATUS command, which does not require PIN authentication
           APDUResponse resp = cmdSet.getStatus(WalletAppletCommandSet.GET_STATUS_P1_APPLICATION).checkOK();
 
+          Log.i(TAG, "Got status (response length=" + resp.getData().length + ")." );
+
           // PIN authentication allows execution of privileged commands
           cmdSet.verifyPIN("000000").checkOK();
 
+          Log.i(TAG, "Pin Verified.");
+
           // Cleanup, in a real application you would not unpair and instead keep the pairing key for successive interactions.
           // We also remove all other pairings so that we do not fill all slots with failing runs. Again in real application
           // this would be a very bad idea to do.
           cmdSet.unpairOthers();
           cmdSet.autoUnpair();
 
-          Log.i(TAG, "GET STATUS response: " + Hex.toHexString(resp.getData()));
+          Log.i(TAG, "Unpaired.");
+
         } catch (Exception e) {
           Log.e(TAG, e.getMessage());
         }

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -21,6 +21,6 @@ android {
 }
 
 dependencies {
-    api 'com.madgag.spongycastle:core:1.58.0.0'
-    api 'com.madgag.spongycastle:prov:1.58.0.0'
+    implementation 'com.madgag.spongycastle:core:1.58.0.0'
+    implementation 'com.madgag.spongycastle:prov:1.58.0.0'
 }
diff --git a/lib/src/main/java/im/status/hardwallet_lite_android/io/CardManager.java b/lib/src/main/java/im/status/hardwallet_lite_android/io/CardManager.java
@@ -6,8 +6,14 @@
 import android.os.SystemClock;
 import android.util.Log;
 import java.io.IOException;
+import java.security.Security;
 
 public class CardManager extends Thread implements NfcAdapter.ReaderCallback {
+
+    public CardManager() {
+        Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
+    }
+
     private static final String TAG = "CardManager";
 
     private IsoDep isoDep;