Merge pull request #219 from crocs-muni/devel

repo cleaning, new card profiles

.gitignore

@@ -1,20 +1,23 @@
 /!!!temp/
-/AlgTest_JavaCard/nbproject/private/
-/AlgTest_JavaCard/!uploader/
+/AlgTest_JavaCard/nbproject/private/*
+/AlgTest_JavaCard/!uploader/*
+/AlgTest_JavaCard/build/*
+/AlgTest_JavaCard/nbproject/project.properties
+
+
 /AlgTest_JClient/nbproject/private/
-/AlgTest_Process/nbproject/private/
-/AlgTest_JavaCard/build/
-/AlgTest_JClient/build/
+/AlgTest_JClient/build/*
 /AlgTest_JClient/test/*.jar
-/AlgTest_Process/build/
-/AlgTest_JClient/dist/README.TXT
-/AlgTest_Process/dist/README.TXT
+/AlgTest_JClient/dist/*
+/AlgTest_JClient/nbproject/*
+
+
+/AlgTest_Process/dist/*
+/AlgTest_Process/test-output/*
+/AlgTest_Process/build/*
+/AlgTest_Process/nbproject/private/*
+/AlgTest_Process/nbproject/*
+/AlgTest_Process/dist/*
+
 *.class
-/AlgTest_JavaCard/nbproject/project.properties
-AlgTest_JavaCard/nbproject/project.properties
-AlgTest_JavaCard/!card_uploaders/AlgTest_possibly_uploaded_onGD.cap
-AlgTest_JavaCard/nbproject/project.properties
-AlgTest_JClient/nbproject/build-impl.xml
-AlgTest_JClient/nbproject/genfiles.properties
-AlgTest_JClient/nbproject/build-impl.xml
-AlgTest_JClient/nbproject/project.properties
+

AlgTest_JClient/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=04cacdaf
 build.xml.stylesheet.CRC32=[email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=a6d9dab8
-nbproject/build-impl.xml.script.CRC32=29a389f8
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
+nbproject/build-impl.xml.data.CRC32=168c3420
+nbproject/build-impl.xml.script.CRC32=c2b597fa
+nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.91.1.48

AlgTest_JavaCard/buildReupload.bat

@@ -0,0 +1,4 @@
+cd !uploader
+gp -uninstall AlgTest_222.cap -d
+gp -install AlgTest_222.cap -d
+cd ..

AlgTest_Process/annotated_algorithms.list

@@ -1020,10 +1020,18 @@ KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_256 Signature_ALG_ECDSA_SHA Signature_
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_256 Signature_ALG_ECDSA_SHA Signature_sign();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_256 Signature_ALG_ECDSA_SHA Signature_verify();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_256 Signature_ALG_ECDSA_SHA Signature_init();ASYMCRYPTO
+KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_320 Signature_ALG_ECDSA_SHA Signature_update();ASYMCRYPTO
+KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_320 Signature_ALG_ECDSA_SHA Signature_sign();ASYMCRYPTO
+KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_320 Signature_ALG_ECDSA_SHA Signature_verify();ASYMCRYPTO
+KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_320 Signature_ALG_ECDSA_SHA Signature_init();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_384 Signature_ALG_ECDSA_SHA Signature_update();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_384 Signature_ALG_ECDSA_SHA Signature_sign();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_384 Signature_ALG_ECDSA_SHA Signature_verify();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_384 Signature_ALG_ECDSA_SHA Signature_init();ASYMCRYPTO
+KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_512 Signature_ALG_ECDSA_SHA Signature_update();ASYMCRYPTO
+KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_512 Signature_ALG_ECDSA_SHA Signature_sign();ASYMCRYPTO
+KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_512 Signature_ALG_ECDSA_SHA Signature_verify();ASYMCRYPTO
+KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_512 Signature_ALG_ECDSA_SHA Signature_init();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_521 Signature_ALG_ECDSA_SHA Signature_update();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_521 Signature_ALG_ECDSA_SHA Signature_sign();ASYMCRYPTO
 KeyPair_ALG_EC_FP KeyBuilder_LENGTH_EC_FP_521 Signature_ALG_ECDSA_SHA Signature_verify();ASYMCRYPTO
@@ -2329,5 +2337,7 @@ ALG_EC_FP LENGTH_EC_FP_160 KeyPair_genKeyPair();ASYMCRYPTO
 ALG_EC_FP LENGTH_EC_FP_192 KeyPair_genKeyPair();ASYMCRYPTO
 ALG_EC_FP LENGTH_EC_FP_224 KeyPair_genKeyPair();ASYMCRYPTO
 ALG_EC_FP LENGTH_EC_FP_256 KeyPair_genKeyPair();ASYMCRYPTO
+ALG_EC_FP LENGTH_EC_FP_320 KeyPair_genKeyPair();ASYMCRYPTO
 ALG_EC_FP LENGTH_EC_FP_384 KeyPair_genKeyPair();ASYMCRYPTO
+ALG_EC_FP LENGTH_EC_FP_512 KeyPair_genKeyPair();ASYMCRYPTO
 ALG_EC_FP LENGTH_EC_FP_521 KeyPair_genKeyPair();ASYMCRYPTO

AlgTest_Process/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
 build.xml.data.CRC32=70b8bc73
 build.xml.script.CRC32=531480e0
-build.xml.stylesheet.CRC32=8064a381@1.68.1.46
+build.xml.stylesheet.CRC32=f85dc8f2@1.92.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=70b8bc73
-nbproject/build-impl.xml.script.CRC32=321a49b5
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
+nbproject/build-impl.xml.script.CRC32=c02d571e
+nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.92.0.48

AlgTest_Process/nbproject/project.properties

@@ -19,38 +19,46 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
 dist.jar=${dist.dir}/AlgTestProcess.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.AlgTestJClient.jar=..\\AlgTest_JClient\\test\\AlgTestJClient.jar
+file.reference.AlgTestJClient.jar=..\\AlgTest_JClient\\dist\\AlgTestJClient.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${file.reference.AlgTestJClient.jar}:\
-    ${libs.JC3.0.4.classpath}:\
-    ${libs.JavaCard3.0.4.classpath}
+    ${file.reference.AlgTestJClient.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.8
 javac.target=1.8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
+javadoc.html5=false
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
@@ -59,6 +67,8 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
+jlink.launcher=false
+jlink.launcher.name=AlgTestProcess
 jnlp.codebase.type=no.codebase
 jnlp.descriptor=application
 jnlp.enabled=false
@@ -80,9 +90,13 @@ run.classpath=\
 # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
 # To set system properties for unit tests define test-sys-prop.name=value:
 run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test