GPContext: remove reader finding

This should go in the tool. Needs cleanup now.

Author: promovicz

globalplatform/src/main/java/org/openjavacard/gp/client/GPContext.java

@@ -19,14 +19,12 @@
 
 package org.openjavacard.gp.client;
 
-import org.openjavacard.generic.GenericContext;
-import org.openjavacard.gp.keys.GPKeySet;
-import org.openjavacard.iso.AID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import javax.smartcardio.CardException;
-import javax.smartcardio.CardTerminal;
+public class GPContext {
 
-public class GPContext extends GenericContext {
+    private static final Logger LOG = LoggerFactory.getLogger(GPContext.class);
 
     private boolean mKeyLoggingEnabled = false;
 
@@ -46,37 +44,4 @@ public void enableKeyLogging() {
         mKeyLoggingEnabled = true;
     }
 
-    public GPCard findSingleGPCard(String prefix) {
-        return findSingleGPCard(prefix, null, GPKeySet.GLOBALPLATFORM);
-    }
-
-    public GPCard findSingleGPCard(String prefix, AID sd, GPKeySet keys) {
-        LOG.debug("findSingleCard()");
-        GPCard card;
-        CardTerminal terminal = findSingleTerminal(prefix);
-        try {
-            // check card presence
-            if (!terminal.isCardPresent()) {
-                throw new Error("No card present in terminal");
-            }
-            // create GP client
-            card = new GPCard(this, terminal);
-            // tell the client if we know the SD AID
-            if(sd != null) {
-                card.setISD(sd);
-            }
-            if(keys != null) {
-                card.setKeys(keys);
-            }
-            // detect GP applet
-            //boolean detected = card.detect();
-            //if (!detected) {
-            //    throw new Error("Could not find a GlobalPlatform applet on the card");
-            //}
-        } catch (CardException e) {
-            throw new Error("Error detecting card", e);
-        }
-        return card;
-    }
-
 }

testbench/src/main/java/org/openjavacard/testbench/main/Bench.java

@@ -19,6 +19,7 @@
 
 package org.openjavacard.testbench.main;
 
+import org.openjavacard.generic.GenericContext;
 import org.openjavacard.gp.client.GPContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +36,7 @@ public class Bench {
     private BenchConfiguration mConfig;
 
     private GPContext mContext;
+    private GenericContext mGeneric;
 
     private List<BenchReader> mReaders;
 
@@ -57,12 +59,12 @@ public void configure() {
         List<CardTerminal> terminals;
         if(mConfig.allReaders) {
             // all means all
-            terminals = mContext.findTerminals();
+            terminals = mGeneric.findTerminals();
         } else {
             // else filter for given names/prefixes
             terminals = new ArrayList<>();
             for(String readerName: mConfig.reader) {
-                terminals.add(mContext.findSingleTerminal(readerName));
+                terminals.add(mGeneric.findSingleTerminal(readerName));
             }
         }
         // complain if no readers at all

tool/src/main/java/org/openjavacard/tool/command/gp/GPCommand.java

@@ -21,6 +21,7 @@
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.validators.PositiveInteger;
+import org.openjavacard.generic.GenericContext;
 import org.openjavacard.gp.client.GPCard;
 import org.openjavacard.gp.client.GPContext;
 import org.openjavacard.gp.keys.GPKey;
@@ -36,6 +37,7 @@
 import org.openjavacard.util.HexUtil;
 
 import javax.smartcardio.CardException;
+import javax.smartcardio.CardTerminal;
 import java.io.PrintStream;
 
 public abstract class GPCommand implements Runnable {
@@ -121,9 +123,11 @@ public abstract class GPCommand implements Runnable {
     private boolean logKeys = false;
 
     private GPContext mContext;
+    private GenericContext mGeneric;
 
     public GPCommand(GPContext context) {
         mContext = context;
+        mGeneric = new GenericContext();
     }
 
     public GPContext getContext() {
@@ -159,7 +163,35 @@ private GPCard prepareOperation() {
             keys = buildKeysFromParameters(scpKeyId, scpKeyVersion, scpKeyCipher, scpKeyTypes, scpKeySecrets);
         }
 
-        return mContext.findSingleGPCard(reader, isd, keys);
+        return findSingleGPCard(reader, isd, keys);
+    }
+
+    public GPCard findSingleGPCard(String prefix, AID sd, GPKeySet keys) {
+        GPCard card;
+        CardTerminal terminal = mGeneric.findSingleTerminal(prefix);
+        try {
+            // check card presence
+            if (!terminal.isCardPresent()) {
+                throw new Error("No card present in terminal");
+            }
+            // create GP client
+            card = new GPCard(mContext, terminal);
+            // tell the client if we know the SD AID
+            if(sd != null) {
+                card.setISD(sd);
+            }
+            if(keys != null) {
+                card.setKeys(keys);
+            }
+            // detect GP applet
+            //boolean detected = card.detect();
+            //if (!detected) {
+            //    throw new Error("Could not find a GlobalPlatform applet on the card");
+            //}
+        } catch (CardException e) {
+            throw new Error("Error detecting card", e);
+        }
+        return card;
     }
 
     /**

tool/src/main/java/org/openjavacard/tool/main/Tool.java

@@ -21,6 +21,7 @@
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
+import org.openjavacard.generic.GenericContext;
 import org.openjavacard.gp.client.GPContext;
 import org.openjavacard.tool.command.aid.AIDInfo;
 import org.openjavacard.tool.command.aid.AIDNow;
@@ -63,9 +64,11 @@ public class Tool {
     )
     boolean help = false;
 
+    private final GenericContext mGeneric;
     private final GPContext mContext;
 
     Tool() {
+        mGeneric = new GenericContext();
         mContext = new GPContext();
     }
 
@@ -117,8 +120,8 @@ JCommander makeCommander() {
         JCommander jc = new JCommander();
         jc.addConverterFactory(new ConverterFactory());
 
-        jc.addCommand(new GenericAPDU(mContext));
-        jc.addCommand(new GenericReaders(mContext));
+        jc.addCommand(new GenericAPDU(mGeneric));
+        jc.addCommand(new GenericReaders(mGeneric));
 
         jc.addCommand(new AIDInfo());
         jc.addCommand(new AIDNow());
@@ -144,8 +147,8 @@ JCommander makeCommander() {
         jc.addCommand(new PkgList(mContext));
         jc.addCommand(new PkgSearch(mContext));
 
-        jc.addCommand(new ScanName(mContext));
-        jc.addCommand(new ScanFID(mContext));
+        jc.addCommand(new ScanName(mGeneric));
+        jc.addCommand(new ScanFID(mGeneric));
 
         return jc;
     }