Merge pull request #188 from crocs-muni/devel

Improvements, new profiles, web files
crocs-muni · Mar 10, 2019 · 9090f17 · 9090f17
2 parents 3cdee6e + a045679
commit 9090f17
Show file tree

Hide file tree

Showing 206 changed files with 247,039 additions and 1,505 deletions.
diff --git a/AlgTest_JClient/src/algtestjclient/AlgTestJClient.java b/AlgTest_JClient/src/algtestjclient/AlgTestJClient.java
@@ -354,7 +354,7 @@ static void performKeyHarvest() throws CardException {
             m_SystemOutLogger.println("Wrong number. Number of keys to generate is set to " + numOfKeys + ".");
         }
 
-        keyHarvest.gatherRSAKeys(autoUploadBefore, bitLength_start, bitLength_step, bitLength_end, useCrt, numOfKeys);        
+        keyHarvest.gatherRSAKeys(autoUploadBefore, bitLength_start, bitLength_step, bitLength_end, useCrt, numOfKeys, USE_JCARDSIM);        
     }
 
     static CardTerminal selectTargetReader() {

diff --git a/AlgTest_JClient/src/algtestjclient/KeyHarvest.java b/AlgTest_JClient/src/algtestjclient/KeyHarvest.java
@@ -31,6 +31,7 @@ may be distributed under the terms of the GNU General Public License (GPL),
 
 package algtestjclient;
 
+import cardTools.SimulatedCardTerminal;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -50,25 +51,31 @@ public KeyHarvest(DirtyLogger logger) {
         cardManager = new CardMngr(m_SystemOutLogger);
     }
 
-    void gatherRSAKeys(boolean autoUploadBefore, short bitLength_start, short bitLength_step, short bitLength_end, boolean useCrt, int numOfKeys) throws CardException {
-	    //
-            // Obtain all readers with cards
-            //
-            List<CardTerminal> readersList = CardMngr.GetReaderList();
+    void gatherRSAKeys(boolean autoUploadBefore, short bitLength_start, short bitLength_step, short bitLength_end, boolean useCrt, int numOfKeys, boolean bUseSimulator) throws CardException {
             ArrayList<CardTerminal> readersWithCardList = new ArrayList();
-            if (readersList.isEmpty()) { m_SystemOutLogger.println("No terminals found"); }
-            for (int i = 0; i < readersList.size(); i++) {
-                CardTerminal terminal = (CardTerminal) readersList.get(i);
-                if (terminal.isCardPresent()) {
-                    // store readers with cards
-                    readersWithCardList.add(readersList.get(i));
-                    m_SystemOutLogger.println(i + " : " + readersList.get(i) + " : card present");
-                }
-                else {
-                    m_SystemOutLogger.println(i + " : " + readersList.get(i) + " : card NOT present");
+            // Add simulated card if required
+            if (bUseSimulator) {
+                readersWithCardList.add(new SimulatedCardTerminal());
+            }
+            else {
+                //
+                // Obtain all readers with cards
+                //
+                List<CardTerminal> readersList = CardMngr.GetReaderList();
+                if (readersList.isEmpty()) { m_SystemOutLogger.println("No terminals found"); }
+                for (int i = 0; i < readersList.size(); i++) {
+                    CardTerminal terminal = (CardTerminal) readersList.get(i);
+                    if (terminal.isCardPresent()) {
+                        // store readers with cards
+                        readersWithCardList.add(readersList.get(i));
+                        m_SystemOutLogger.println(i + " : " + readersList.get(i) + " : card present");
+                    }
+                    else {
+                        m_SystemOutLogger.println(i + " : " + readersList.get(i) + " : card NOT present");
+                    }
                 }
             }
-
+            
             m_SystemOutLogger.println("TOTAL cards: " + readersWithCardList.size());
 
 	    // Run separate thread for every reader / card		

diff --git a/AlgTest_JClient/src/cardTools/SimulatedCardTerminal.java b/AlgTest_JClient/src/cardTools/SimulatedCardTerminal.java
@@ -17,7 +17,7 @@ public class SimulatedCardTerminal extends CardTerminal {
 
     @Override
     public String getName() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        return "JCardSim terminal"; 
     }
 
     @Override
@@ -27,7 +27,7 @@ public Card connect(String string) throws CardException {
 
     @Override
     public boolean isCardPresent() throws CardException {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        return true;
     }
 
     @Override

diff --git a/AlgTest_JavaCard/AlgTest_v1.7.6_jc222.cap b/AlgTest_JavaCard/AlgTest_v1.7.6_jc222.cap
diff --git a/AlgTest_dist_1.7.6.zip b/AlgTest_dist_1.7.6.zip
diff --git a/Profiles/AlgTest_html_table.html b/Profiles/AlgTest_html_table.html
diff --git a/Profiles/AlgTest_html_table_20190301.html b/Profiles/AlgTest_html_table_20190301.html
diff --git a/...les/aid/Taisys_SIMoME_VAULT_AIDSUPPORT_3B9F95803FC7A08031E073FA21106300000083F09000BB.csv b/...les/aid/Taisys_SIMoME_VAULT_AIDSUPPORT_3B9F95803FC7A08031E073FA21106300000083F09000BB.csv
@@ -0,0 +1,94 @@
+jcAIDScan version; 0.1.2
+Card ATR; 3B9F95803FC7A08031E073FA21106300000083F09000BB
+Card name; Taisys SIMoME VAULT
+
+PACKAGE AID; MAJOR VERSION; MINOR VERSION; PACKAGE NAME; INTRODUCING JC API VERSION;
+a0000000620001; 1; 0; java.lang; 2.1
+a0000000620002; 1; 0; java.io; 2.2.0
+a0000000620101; 1; 0; javacard.framework; 2.1
+a0000000620101; 1; 1; javacard.framework; 2.2.0
+a0000000620101; 1; 2; javacard.framework; 2.2.1
+a0000000620101; 1; 3; javacard.framework; 2.2.2
+a0000000620101; 1; 4; javacard.framework; 3.0.1
+a0000000620101; 1; 5; javacard.framework; 3.0.4
+a0000000620102; 1; 0; javacard.security; 2.1
+a0000000620102; 1; 1; javacard.security; 2.1.1
+a0000000620102; 1; 2; javacard.security; 2.2.1
+a0000000620102; 1; 3; javacard.security; 2.2.2
+a0000000620102; 1; 4; javacard.security; 3.0.1
+a0000000620102; 1; 5; javacard.security; 3.0.4
+a0000000620201; 1; 0; javacardx.crypto; 2.1
+a0000000620201; 1; 1; javacardx.crypto; 2.1.1
+a0000000620201; 1; 2; javacardx.crypto; 2.2.1
+a0000000620201; 1; 3; javacardx.crypto; 2.2.2
+a0000000620201; 1; 4; javacardx.crypto; 3.0.1
+a0000000620201; 1; 5; javacardx.crypto; 3.0.4
+
+FULL PACKAGE AID; IS SUPPORTED?; PACKAGE NAME WITH VERSION; 
+000107A0000000620001; 	yes; 	java.lang v1.0 a0000000620001;
+010107A0000000620001; 	no; 	java.lang v1.1 a0000000620001;
+000107A0000000620002; 	yes; 	java.io v1.0 a0000000620002;
+010107A0000000620002; 	no; 	java.io v1.1 a0000000620002;
+000107A0000000620003; 	no; 	java.rmi v1.0 a0000000620003;
+010107A0000000620003; 	no; 	java.rmi v1.1 a0000000620003;
+000107A0000000620101; 	yes; 	javacard.framework v1.0 a0000000620101;
+010107A0000000620101; 	yes; 	javacard.framework v1.1 a0000000620101;
+020107A0000000620101; 	yes; 	javacard.framework v1.2 a0000000620101;
+030107A0000000620101; 	yes; 	javacard.framework v1.3 a0000000620101;
+040107A0000000620101; 	yes; 	javacard.framework v1.4 a0000000620101;
+050107A0000000620101; 	yes; 	javacard.framework v1.5 a0000000620101;
+060107A0000000620101; 	no; 	javacard.framework v1.6 a0000000620101;
+070107A0000000620101; 	no; 	javacard.framework v1.7 a0000000620101;
+000108A000000062010101; 	no; 	javacard.framework.service v1.0 a000000062010101;
+010108A000000062010101; 	no; 	javacard.framework.service v1.1 a000000062010101;
+000107A0000000620102; 	yes; 	javacard.security v1.0 a0000000620102;
+010107A0000000620102; 	yes; 	javacard.security v1.1 a0000000620102;
+020107A0000000620102; 	yes; 	javacard.security v1.2 a0000000620102;
+030107A0000000620102; 	yes; 	javacard.security v1.3 a0000000620102;
+040107A0000000620102; 	yes; 	javacard.security v1.4 a0000000620102;
+050107A0000000620102; 	yes; 	javacard.security v1.5 a0000000620102;
+060107A0000000620102; 	no; 	javacard.security v1.6 a0000000620102;
+070107A0000000620102; 	no; 	javacard.security v1.7 a0000000620102;
+000107A0000000620201; 	yes; 	javacardx.crypto v1.0 a0000000620201;
+010107A0000000620201; 	yes; 	javacardx.crypto v1.1 a0000000620201;
+020107A0000000620201; 	yes; 	javacardx.crypto v1.2 a0000000620201;
+030107A0000000620201; 	yes; 	javacardx.crypto v1.3 a0000000620201;
+040107A0000000620201; 	yes; 	javacardx.crypto v1.4 a0000000620201;
+050107A0000000620201; 	yes; 	javacardx.crypto v1.5 a0000000620201;
+060107A0000000620201; 	no; 	javacardx.crypto v1.6 a0000000620201;
+070107A0000000620201; 	no; 	javacardx.crypto v1.7 a0000000620201;
+000107A0000000620202; 	no; 	javacardx.biometry v1.0 a0000000620202;
+010107A0000000620202; 	no; 	javacardx.biometry v1.1 a0000000620202;
+020107A0000000620202; 	no; 	javacardx.biometry v1.2 a0000000620202;
+030107A0000000620202; 	no; 	javacardx.biometry v1.3 a0000000620202;
+040107A0000000620202; 	no; 	javacardx.biometry v1.4 a0000000620202;
+000107A0000000620203; 	no; 	javacardx.external v1.0 a0000000620203;
+010107A0000000620203; 	no; 	javacardx.external v1.1 a0000000620203;
+000107A0000000620204; 	no; 	javacardx.biometry1toN v1.0 a0000000620204;
+010107A0000000620204; 	no; 	javacardx.biometry1toN v1.1 a0000000620204;
+000107A0000000620205; 	no; 	javacardx.security v1.0 a0000000620205;
+010107A0000000620205; 	no; 	javacardx.security v1.1 a0000000620205;
+000108A000000062020801; 	no; 	javacardx.framework.util v1.0 a000000062020801;
+010108A000000062020801; 	no; 	javacardx.framework.util v1.1 a000000062020801;
+020108A000000062020801; 	no; 	javacardx.framework.util v1.2 a000000062020801;
+000109A00000006202080101; 	no; 	javacardx.framework.util.intx v1.0 a00000006202080101;
+010109A00000006202080101; 	no; 	javacardx.framework.util.intx v1.1 a00000006202080101;
+000108A000000062020802; 	no; 	javacardx.framework.math v1.0 a000000062020802;
+010108A000000062020802; 	no; 	javacardx.framework.math v1.1 a000000062020802;
+000108A000000062020803; 	no; 	javacardx.framework.tlv v1.0 a000000062020803;
+010108A000000062020803; 	no; 	javacardx.framework.tlv v1.1 a000000062020803;
+000108A000000062020804; 	no; 	javacardx.framework.string v1.0 a000000062020804;
+010108A000000062020804; 	no; 	javacardx.framework.string v1.1 a000000062020804;
+000107A0000000620209; 	no; 	javacardx.apdu v1.0 a0000000620209;
+010107A0000000620209; 	no; 	javacardx.apdu v1.1 a0000000620209;
+000108A000000062020901; 	no; 	javacardx.apdu.util v1.0 a000000062020901;
+010108A000000062020901; 	no; 	javacardx.apdu.util v1.1 a000000062020901;
+
+JC CONVERTOR VERSION; CAP SUCCESSFULLY UPLOADED?;;
+2.1.1; yes;
+2.2.0; yes;
+2.2.1; yes;
+2.2.2; yes;
+3.0.1; yes;
+3.0.4; yes;
+3.0.5; no;