Merge pull request #162 from crocs-muni/devel

Devel
crocs-muni · Apr 22, 2018 · 9c318c6 · 9c318c6
2 parents 20e8207 + c25ac09
commit 9c318c6
Show file tree

Hide file tree

Showing 10 changed files with 35,982 additions and 1,333 deletions.
diff --git a/AlgTest_JClient/dist/AlgTestJClient.jar b/AlgTest_JClient/dist/AlgTestJClient.jar
diff --git a/AlgTest_JClient/src/algtestjclient/AlgTestJClient.java b/AlgTest_JClient/src/algtestjclient/AlgTestJClient.java
@@ -53,12 +53,18 @@ public class AlgTestJClient {
     public static final String ALGTEST_SINGLEPERAPDU = "AT_SINGLEPERAPDU";      // for 'New' AlgTest
     public static final String ALGTEST_PERFORMANCE = "AT_PERFORMANCE";          // for performance testing
 
+    /**
+     * Version 1.7.4 (20.04.2018) 
+     * + fixed occasional freeze on some cards when testing MessageDigest performance
+     */
+    public final static String ALGTEST_JCLIENT_VERSION_1_7_4 = "1.7.4";
+
     /**
      * Version 1.7.3 (10.06.2017) 
      * + added new constants from JC3.0.5
      * - fixed bug with incorrect testing of KeyAgreement 
      */
-    public final static String ALGTEST_JCLIENT_VERSION_1_7_3 = "1.7.3";
+    //public final static String ALGTEST_JCLIENT_VERSION_1_7_3 = "1.7.3";
 
     /**
      * Version 1.7.2 (06.05.2017) 
@@ -115,7 +121,7 @@ public class AlgTestJClient {
     /**
      * Current version
      */
-    public final static String ALGTEST_JCLIENT_VERSION = ALGTEST_JCLIENT_VERSION_1_7_3;
+    public final static String ALGTEST_JCLIENT_VERSION = ALGTEST_JCLIENT_VERSION_1_7_4;
 
     public final static int STAT_OK = 0;    
     /**

diff --git a/AlgTest_JClient/src/algtestjclient/PerformanceTesting.java b/AlgTest_JClient/src/algtestjclient/PerformanceTesting.java
@@ -1190,12 +1190,12 @@ public void testMessageDigest(byte alg, String info, short numRepeatWholeOperati
 
         if (!m_bTestVariableData) {
             // Ordinary test of all available methods
-            testSet.algorithmMethod = JCConsts.MessageDigest_update;
-            this.perftest_measure(Consts.CLA_CARD_ALGTEST, Consts.INS_PREPARE_TEST_CLASS_MESSAGEDIGEST, Consts.INS_PERF_TEST_CLASS_MESSAGEDIGEST, testSet, info + " MessageDigest_update()");
             testSet.algorithmMethod = JCConsts.MessageDigest_doFinal;
-            this.perftest_measure(Consts.CLA_CARD_ALGTEST, Consts.INS_PREPARE_TEST_CLASS_MESSAGEDIGEST, Consts.INS_PERF_TEST_CLASS_MESSAGEDIGEST, testSet, info + " MessageDigest_doFinal()");
+            double doFinalTime = this.perftest_measure(Consts.CLA_CARD_ALGTEST, Consts.INS_PREPARE_TEST_CLASS_MESSAGEDIGEST, Consts.INS_PERF_TEST_CLASS_MESSAGEDIGEST, testSet, info + " MessageDigest_doFinal()");
+            testSet.algorithmMethod = JCConsts.MessageDigest_update;
+            this.perftest_measure(Consts.CLA_CARD_ALGTEST, Consts.INS_PREPARE_TEST_CLASS_MESSAGEDIGEST, Consts.INS_PERF_TEST_CLASS_MESSAGEDIGEST, testSet, info + " MessageDigest_update()", doFinalTime);
             testSet.algorithmMethod = JCConsts.MessageDigest_reset;
-            this.perftest_measure(Consts.CLA_CARD_ALGTEST, Consts.INS_PREPARE_TEST_CLASS_MESSAGEDIGEST, Consts.INS_PERF_TEST_CLASS_MESSAGEDIGEST, testSet, info + " MessageDigest_reset()");
+            this.perftest_measure(Consts.CLA_CARD_ALGTEST, Consts.INS_PREPARE_TEST_CLASS_MESSAGEDIGEST, Consts.INS_PERF_TEST_CLASS_MESSAGEDIGEST, testSet, info + " MessageDigest_reset()", doFinalTime);
         }
         else {
             // Test of speed dependant on data length

diff --git a/AlgTest_JavaCard/AlgTest_v1.7.4_jc222.cap b/AlgTest_JavaCard/AlgTest_v1.7.4_jc222.cap
diff --git a/AlgTest_JavaCard/src/AlgTest/AlgPerformanceTest.java b/AlgTest_JavaCard/src/AlgTest/AlgPerformanceTest.java
@@ -1206,17 +1206,21 @@ void perftest_class_MessageDigest(APDU apdu) {
         m_testSettings.parse(apdu); 
         short repeats = (short) (m_testSettings.numRepeatWholeOperation * m_testSettings.numRepeatSubOperation);
         short chunkDataLen = (short) (m_testSettings.dataLength1 / m_testSettings.numRepeatSubOperation);
-
+        m_digest.reset();
+
         switch (m_testSettings.algorithmMethod) {
             case JCConsts.MessageDigest_update:   
-                for (short i = 0; i < repeats; i++) { m_digest.update(m_ram1, (short) 0, chunkDataLen); } 
+                for (short i = 0; i < repeats; i++) { 
+                    m_digest.update(m_ram1, (short) 0, chunkDataLen); 
+                    m_digest.reset();   // NOTE: added because some cards freeze after many update() then doFinal() call; time substraction needed                               
+                } 
                 break;
             case JCConsts.MessageDigest_doFinal:  
-                for (short i = 0; i < repeats; i++) { m_digest.doFinal(m_ram1, (short) 0, chunkDataLen, m_ram1, chunkDataLen); } 
+                for (short i = 0; i < repeats; i++) { m_digest.doFinal(m_ram1, (short) 0, chunkDataLen, m_ram2, (short) 0); } 
                 break;
             case JCConsts.MessageDigest_reset:  
                 for (short i = 0; i < m_testSettings.numRepeatWholeOperation; i++) { 
-                    m_digest.doFinal(m_ram1, (short) 0, chunkDataLen, m_ram1, chunkDataLen);    // NOTE: time substraction needed
+                    m_digest.doFinal(m_ram1, (short) 0, chunkDataLen, m_ram2, (short) 0);    // NOTE: time substraction needed
                     m_digest.reset(); 
                 } 
                 break; 

diff --git a/AlgTest_JavaCard/src/AlgTest/JCAlgTestApplet.java b/AlgTest_JavaCard/src/AlgTest/JCAlgTestApplet.java
@@ -54,10 +54,16 @@ may be distributed under the terms of the GNU General Public License (GPL),
 public class JCAlgTestApplet extends javacard.framework.Applet 
 {
     // NOTE: when incrementing version, don't forget to update ALGTEST_JAVACARD_VERSION_CURRENT value
+    /**
+     * Version 1.7.4 (20.04.2018) + fixed occasional freeze on some cards when
+     * testing MessageDigest performance
+     */
+    final static byte ALGTEST_JAVACARD_VERSION_1_7_4[] = {(byte) 0x31, (byte) 0x2e, (byte) 0x37, (byte) 0x2e, (byte) 0x34};
+
     /**
      * Version 1.7.3 (10.06.2017) + fixed issue with incorrect test for KeyAgreement support 
      */
-    final static byte ALGTEST_JAVACARD_VERSION_1_7_3[] = {(byte) 0x31, (byte) 0x2e, (byte) 0x37, (byte) 0x2e, (byte) 0x33};
+    //final static byte ALGTEST_JAVACARD_VERSION_1_7_3[] = {(byte) 0x31, (byte) 0x2e, (byte) 0x37, (byte) 0x2e, (byte) 0x33};
     /**
      * Version 1.7.2 (06.05.2017) 
      * + better support for RSA key collection
@@ -141,7 +147,7 @@ public class JCAlgTestApplet extends javacard.framework.Applet
      */
     //final static byte ALGTEST_JAVACARD_VERSION_1_0[] = {(byte) 0x31, (byte) 0x2e, (byte) 0x30};
 
-    byte ALGTEST_JAVACARD_VERSION_CURRENT[] = ALGTEST_JAVACARD_VERSION_1_7_3;
+    byte ALGTEST_JAVACARD_VERSION_CURRENT[] = ALGTEST_JAVACARD_VERSION_1_7_4;
     // lower byte of exception is value as defined in JCSDK/api_classic/constant-values.htm
     final static short SW_Exception = (short) 0xff01;
     final static short SW_ArrayIndexOutOfBoundsException = (short) 0xff02;

diff --git a/AlgTest_dist_1.7.4.zip b/AlgTest_dist_1.7.4.zip