Merge branch 'devel'

1 files changed, 4 insertions, 25 deletions

diff --git a/src/cz/crcs/ectester/applet/AppletUtil.java b/src/cz/crcs/ectester/applet/AppletUtil.java
index 532b44e..9869aa4 100644
--- a/src/cz/crcs/ectester/applet/AppletUtil.java
+++ b/src/cz/crcs/ectester/applet/AppletUtil.java
@@ -1,9 +1,7 @@
 package cz.crcs.ectester.applet;
 
-import javacard.framework.APDU;
 import javacard.framework.ISO7816;
 import javacard.framework.ISOException;
-import javacard.framework.Util;
 import javacard.security.KeyAgreement;
 import javacard.security.KeyPair;
 import javacard.security.Signature;
@@ -20,37 +18,18 @@ public class AppletUtil {
     }
 
     public static short objCheck(Object obj) {
-        return nullCheck(obj, ECTesterApplet.SW_OBJECT_NULL);
+        return nullCheck(obj, AppletBase.SW_OBJECT_NULL);
     }
 
     public static short keypairCheck(KeyPair keyPair) {
-        return nullCheck(keyPair, ECTesterApplet.SW_KEYPAIR_NULL);
+        return nullCheck(keyPair, AppletBase.SW_KEYPAIR_NULL);
     }
 
     public static short kaCheck(KeyAgreement keyAgreement) {
-        return nullCheck(keyAgreement, ECTesterApplet.SW_KA_NULL);
+        return nullCheck(keyAgreement, AppletBase.SW_KA_NULL);
     }
 
     public static short signCheck(Signature signature) {
-        return nullCheck(signature, ECTesterApplet.SW_SIGNATURE_NULL);
-    }
-
-    public static short readAPDU(APDU apdu, byte[] buffer, short length) {
-        short read = apdu.setIncomingAndReceive();
-        read += apdu.getOffsetCdata();
-        short total = apdu.getIncomingLength();
-        if (total > length) {
-            return 0;
-        }
-        byte[] apduBuffer = apdu.getBuffer();
-
-        short sum = 0;
-
-        do {
-            Util.arrayCopyNonAtomic(apduBuffer, (short) 0, buffer, sum, read);
-            sum += read;
-            read = apdu.receiveBytes((short) 0);
-        } while (sum < total);
-        return 0;
+        return nullCheck(signature, AppletBase.SW_SIGNATURE_NULL);
     }
 }