major changes, ECTester rewrite, moved to valid package

reader: ECTester, mostly rewritten SimpleAPDU
 - communication with applet now done through simpler
 instructions: allocate, set, generate, ecdh, ecdsa
 - moved to a valid Java package dir cz.crcs.ectester
 - SimpleAPDU: renamed to ECTester
 - CardMngr: seamlessly supports simulation vs real card
 - DirtyLogger: takes a nullable String and creates file
 - ECTester: currently only supports key generation,
 curve testing under way
   - supports external curve setting, example files
   in data package
   - tests can be done through files, to achieve a more
   modular approach
 - Util: static utility class
 - ParamReader: reads curve domain parameters and keys from
 simple csv-like human-readable files with hex strings

applet: ECTesterApplet, rewrite of SimpleECCApplet
 - more granularity in instructions
 - moved complexity over to the reader side
 - ECKeyGenerator: now a class that takes KeyPair as param
 - ECKeyTester: now a class that takes KeyPair as param
 - EC_Consts: removed ecsp curves(now done externally),
 removed unused methods
 - ECTesterApplet: currently only tested instructions are:
 allocate, set, generate

data: contains several curve and pubkey files in format supported
by ParamReader
 - Prime field curves:
   p,a,b,gx,gy,r,k
 - Binary field curves:
   e1,a,b,gx,gy,r,k   or   e1,e2,e3,a,b,gx,gy,r,k
 - Public key:
   wx,wy
 - Private key:
   s
 - Key:
   wx,wy,s
 - all values are hex strings

1 files changed, 17 insertions, 0 deletions

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 49b2ea6..41e7d89 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -25,6 +25,7 @@ debug.test.classpath=\
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
 dist.dir=dist
+<<<<<<< HEAD
 dist.jar=${dist.dir}/SimpleAPDU.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
@@ -33,6 +34,18 @@ includes=**
 jar.compress=false
 javac.classpath=\
     ${libs.JCardSim2.2.classpath}
+=======
+dist.jar=${dist.dir}/ECTester.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+#TODO remove SimpleAPDU when replaced with ECtester,java
+excludes=**/SimpleAPDU.java
+includes=**
+jar.compress=false
+javac.classpath=\
+    lib/jcardsim-2.2.2-all.jar:\
+    lib/commons-cli-1.3.1.jar
+>>>>>>> 14b5b42... major changes, ECTester rewrite, moved to valid package
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -56,7 +69,11 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
+<<<<<<< HEAD
 main.class=simpleapdu.SimpleAPDU
+=======
+main.class=cz.crcs.ectester.reader.ECTester
+>>>>>>> 14b5b42... major changes, ECTester rewrite, moved to valid package
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false