GPSecureChannel: eliminate use of wrappers

We do not want the SCP to use the wrappers so that it is simpler and
more reusable.

Author: promovicz

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

@@ -381,7 +381,7 @@ public void connect() throws CardException {
             mCardKeyInfo.checkKeysetForUsage(mKeys);
 
             // create a secure channel object
-            mSecureChannel = new GPSecureChannel(mContext, mBasicWrapper, mKeys, mDiversification, mProtocolPolicy, mSecurityPolicy);
+            mSecureChannel = new GPSecureChannel(mContext, mBasicChannel, mKeys, mDiversification, mProtocolPolicy, mSecurityPolicy);
 
             // set protocol expectation of secure channel
             if (mCardData != null) {

globalplatform/src/main/java/org/openjavacard/gp/scp/GPSecureChannel.java

@@ -28,7 +28,6 @@
 import org.openjavacard.gp.keys.GPKeyUsage;
 import org.openjavacard.gp.protocol.GP;
 import org.openjavacard.gp.structure.GPInitUpdateResponse;
-import org.openjavacard.gp.wrapper.GPBasicWrapper;
 import org.openjavacard.iso.ISO7816;
 import org.openjavacard.iso.SW;
 import org.openjavacard.iso.SWException;
@@ -58,8 +57,6 @@ public class GPSecureChannel extends CardChannel {
     private final SecureRandom mRandom;
     /** Context for checks */
     private final GPContext mContext;
-    /** Underlying channel wrapper for communication */
-    private final GPBasicWrapper mBasicWrapper;
     /** Underlying card channel */
     private final CardChannel mChannel;
     /** Initial static keys */
@@ -90,18 +87,17 @@ public class GPSecureChannel extends CardChannel {
      * Objects are not intended to be reconfigured.
      * <p/>
      * @param context for this secure channel
-     * @param basicWrapper to communicate through
+     * @param channel to communicate through
      * @param keys to use
      * @param protocolPolicy to conform to
      * @param securityPolicy to conform to
      */
-    public GPSecureChannel(GPContext context, GPBasicWrapper basicWrapper,
+    public GPSecureChannel(GPContext context, CardChannel channel,
                            GPKeySet keys, GPKeyDiversification diversification,
                            SCPProtocolPolicy protocolPolicy, SCPSecurityPolicy securityPolicy) {
         mRandom = new SecureRandom();
         mContext = context;
-        mBasicWrapper = basicWrapper;
-        mChannel = mBasicWrapper.getChannel();
+        mChannel = channel;
         mStaticKeys = keys;
         mDiversification = diversification;
         mProtocolPolicy = protocolPolicy;
@@ -242,7 +238,7 @@ private ResponseAPDU transmitInternal(CommandAPDU command) throws CardException
         // wrap the command (sign, encrypt)
         CommandAPDU wrappedCommand = mWrapper.wrap(command);
         // send the wrapped command
-        ResponseAPDU wrappedResponse = mBasicWrapper.transmitRaw(wrappedCommand);
+        ResponseAPDU wrappedResponse = mChannel.transmit(wrappedCommand);
         // unwrap the response, but not if it is an error
         int sw = wrappedResponse.getSW();
         ResponseAPDU response = wrappedResponse;
@@ -547,7 +543,7 @@ private GPInitUpdateResponse performInitializeUpdate(byte keyVersion, byte keyId
                 hostChallenge
         );
         // and transmit it on the underlying channel
-        ResponseAPDU initResponse = mBasicWrapper.transmitRaw(initCommand);
+        ResponseAPDU initResponse = mChannel.transmit(initCommand);
         // check the response
         checkResponse(initResponse);
         // parse the response