SCPWrapper: minor cleanup

Author: promovicz

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

@@ -336,6 +336,9 @@ public void open() throws CardException {
         // create CardAPDU wrapper
         mWrapper = buildWrapper();
 
+        // this is where we start using MAC
+        mWrapper.startMAC();
+
         // perform EXTERNAL AUTHENTICATE to authenticate to card
         LOG.debug("performing authentication");
         performExternalAuthenticate(hostCryptogram);

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

@@ -36,10 +36,10 @@ public abstract class SCPWrapper {
     /** Session keys in use */
     protected final GPKeySet mKeys;
 
-    /** Command encryption currently enabled? */
-    protected boolean mENC;
     /** Command authentication currently enabled? */
     protected boolean mMAC;
+    /** Command encryption currently enabled? */
+    protected boolean mENC;
     /** Response authentication currently enabled? */
     protected boolean mRMAC;
     /** Response encryption currently enabled? */
@@ -51,14 +51,23 @@ public abstract class SCPWrapper {
      */
     SCPWrapper(GPKeySet keys) {
         mKeys = keys;
-        // SCP0102 and SCP03 all start with MAC enabled
+        // most protocols start with MAC enabled
         mMAC = true;
         // other options must be enabled by client
         mENC = false;
         mRMAC = false;
         mRENC = false;
     }
 
+    /**
+     * Used to start command authentication when it is expected
+     *
+     * Subclasses may want to set up state.
+     */
+    protected void startMAC() {
+        mMAC = true;
+    }
+
     /**
      * Used to start command encryption when it is expected
      *