diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cz/crcs/ectester/common/ec/EC_Curve.java | 9 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/standalone/ECTesterStandalone.java | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/cz/crcs/ectester/common/ec/EC_Curve.java b/src/cz/crcs/ectester/common/ec/EC_Curve.java index 19228dc..173fd29 100644 --- a/src/cz/crcs/ectester/common/ec/EC_Curve.java +++ b/src/cz/crcs/ectester/common/ec/EC_Curve.java @@ -95,12 +95,12 @@ public class EC_Curve extends EC_Params { byte fieldType; if (field instanceof ECFieldFp) { ECFieldFp primeField = (ECFieldFp) field; - params = new byte[5][]; + params = new byte[7][]; params[paramIndex++] = primeField.getP().toByteArray(); fieldType = KeyPair.ALG_EC_FP; } else if (field instanceof ECFieldF2m) { ECFieldF2m binaryField = (ECFieldF2m) field; - params = new byte[8][]; + params = new byte[10][]; params[paramIndex] = new byte[2]; ByteUtil.setShort(params[paramIndex++], 0, (short) binaryField.getM()); int[] powers = binaryField.getMidTermsOfReductionPolynomial(); @@ -110,11 +110,14 @@ public class EC_Curve extends EC_Params { } fieldType = KeyPair.ALG_EC_F2M; } else { - throw new IllegalArgumentException("ECParameterSpec with an unknnown field."); + throw new IllegalArgumentException("ECParameterSpec with an unknown field."); } ECPoint generator = spec.getGenerator(); + params[paramIndex++] = curve.getA().toByteArray(); + params[paramIndex++] = curve.getB().toByteArray(); + params[paramIndex++] = generator.getAffineX().toByteArray(); params[paramIndex++] = generator.getAffineY().toByteArray(); diff --git a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java index af01a46..76b98ce 100644 --- a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java +++ b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java @@ -240,7 +240,7 @@ public class ECTesterStandalone { /** * */ - private void export() throws NoSuchAlgorithmException { + private void export() throws NoSuchAlgorithmException, IOException { if (cfg.selected instanceof JavaECLibrary) { JavaECLibrary jlib = (JavaECLibrary) cfg.selected; KeyPairGeneratorIdent ident = null; @@ -264,7 +264,7 @@ public class ECTesterStandalone { ECParameterSpec params = privateKey.getParams(); System.out.println(params); EC_Curve curve = EC_Curve.fromSpec(params); - System.out.println(curve); + curve.writeCSV(System.out); } } } |