Add utility methods for converting EC_Params to JCE EC objects.

3 files changed, 5 insertions, 3 deletions

diff --git a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
index 639e416..364fde4 100644
--- a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -524,6 +524,8 @@ public class ECTesterStandalone {
                 break;
         }
 
+        String suiteName = cli.getArg(0);
+
         StandaloneTestSuite suite = new StandaloneDefaultSuite(writer, cfg, cli);
         suite.run();
     }
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
index 12bc354..4858ccd 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
+++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java
@@ -76,7 +76,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
             if (publicKey instanceof NativeECPublicKey) {
                 return ((NativeECPublicKey) publicKey).getData();
             } else {
-                return ECUtil.toX962Uncompressed(publicKey.getW(), ((ECParameterSpec) params).getCurve());
+                return ECUtil.toX962Uncompressed(publicKey.getW(), ((ECParameterSpec) params));
             }
         }
 
@@ -84,7 +84,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi {
             if (privateKey instanceof NativeECPrivateKey) {
                 return ((NativeECPrivateKey) privateKey).getData();
             } else {
-                return ECUtil.toByteArray(privateKey.getS(), ((ECParameterSpec) params).getCurve().getField().getFieldSize());
+                return ECUtil.toByteArray(privateKey.getS(), ((ECParameterSpec) params).getOrder().bitLength());
             }
         }
 
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java
index b60f2c6..602b1c4 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java
+++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java
@@ -71,7 +71,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi {
             if (signKey instanceof NativeECPrivateKey) {
                 privkey = ((NativeECPrivateKey) signKey).getData();
             } else {
-                privkey = ECUtil.toByteArray(signKey.getS(), params.getCurve().getField().getFieldSize());
+                privkey = ECUtil.toByteArray(signKey.getS(), params.getOrder().bitLength());
             }
             return sign(buffer.toByteArray(), privkey, params);
         }