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_KAResult.java b/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
index f1be49a..1385f12 100644
--- a/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
+++ b/src/cz/crcs/ectester/reader/ec/EC_KAResult.java
@@ -50,7 +50,7 @@ public class EC_KAResult extends EC_Data {
     @Override
     public String toString() {
         String agreement = ka == EC_Consts.KA_ECDH ? "ECDH" : "ECDHC";
-        return agreement + " over " + curve + ", " + oneKey + " + " + otherKey + ": " + desc;
+        return agreement + " result over " + curve + ", " + oneKey + " + " + otherKey + (desc == null ? "" : ": " + desc);
     }
 
 }