Add invalid curves test(partly) and some parameters (brainpool) for it

 - curves.xml, keys.xml and results.xml's entries can now instead of
   file path to point to csv file, contain the csv data inline.
 - Moved EC_Category to reader package from data
 - Fixed printing of named objects
 - Added ECDH/C test for KA_BOTH which does ECDH and ECDHC on the applet
   side, compares the results and reports success/failure etc.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java b/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
index af4038a..bf87e9e 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_Keypair.java
@@ -30,6 +30,6 @@ public class EC_Keypair extends EC_Params {
 
     @Override
     public String toString() {
-        return "EC Keypair, over " + curve + ": " + desc;
+        return "EC Keypair, over " + curve + (desc == null ? "" : ": " + desc);
     }
 }