feat: make curve definitions extend ECCurve

Author: dufkan

applet/src/main/java/opencrypto/jcmathlib/ECCurve.java

@@ -1,7 +1,6 @@
 package opencrypto.jcmathlib;
 
 import javacard.framework.JCSystem;
-import javacard.framework.Util;
 import javacard.security.ECPrivateKey;
 import javacard.security.ECPublicKey;
 import javacard.security.KeyBuilder;
@@ -56,8 +55,8 @@ public ECCurve(byte[] p, byte[] a, byte[] b, byte[] G, byte[] r, ResourceManager
  disposablePair = newKeyPair(null);
  disposablePriv = (ECPrivateKey) disposablePair.getPrivate();
  disposablePub = (ECPublicKey) disposablePair.getPublic();
- } 
- 
+ }
+
  /**
  * Refresh critical information stored in RAM for performance reasons after a card reset (RAM was cleared).
  */

applet/src/main/java/opencrypto/jcmathlib/Example.java

@@ -59,7 +59,7 @@ public void initialize() {
  // Allocate resources for a required elliptic curve size (in bits)
  rm = new ResourceManager((short) 256);
  // Allocate SecP256r1 curve and two EC points on this curve
- curve = new ECCurve(SecP256r1.p, SecP256r1.a, SecP256r1.b, SecP256r1.G, SecP256r1.r, rm);
+ curve = new SecP256k1(rm);
  point1 = new ECPoint(curve);
  point2 = new ECPoint(curve);
  // Allocate two BigNats large enough to hold scalars of the elliptic curve

applet/src/main/java/opencrypto/jcmathlib/UnitTests.java

@@ -120,7 +120,7 @@ public void initialize() {
 
 
  // Pre-allocate test objects (no new allocation for every tested operation)
- curve = new ECCurve(SecP256r1.p, SecP256r1.a, SecP256r1.b, SecP256r1.G, SecP256r1.r, rm);
+ curve = new SecP256r1(rm);
  memoryInfoOffset = snapshotAvailableMemory((short) 3, memoryInfo, memoryInfoOffset);
  customG = new byte[(short) SecP256r1.G.length];
  Util.arrayCopyNonAtomic(SecP256r1.G, (short) 0, customG, (short) 0, (short) SecP256r1.G.length);

applet/src/main/java/opencrypto/jcmathlib/curves/SecP256k1.java

@@ -1,6 +1,10 @@
 package opencrypto.jcmathlib;
 
-public class SecP256k1 {
+public class SecP256k1 extends ECCurve {
+ public SecP256k1(ResourceManager rm) {
+ super(p, a, b, G, r, rm);
+ }
+
  public final static byte[] p = {
  (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
  (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,

applet/src/main/java/opencrypto/jcmathlib/curves/SecP256r1.java

@@ -1,6 +1,10 @@
 package opencrypto.jcmathlib;
 
-public class SecP256r1 {
+public class SecP256r1 extends ECCurve {
+ public SecP256r1(ResourceManager rm) {
+ super(p, a, b, G, r, rm);
+ }
+
  public final static byte[] p = {
  (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff,
  (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01,

applet/src/main/java/opencrypto/jcmathlib/curves/SecP512r1.java

@@ -1,6 +1,10 @@
 package opencrypto.jcmathlib;
 
-public class SecP512r1 {
+public class SecP512r1 extends ECCurve {
+ public SecP512r1(ResourceManager rm) {
+ super(p, a, b, G, r, rm);
+ }
+
  public final static byte[] p = {
  (byte) 0xaa, (byte) 0xdd, (byte) 0x9d, (byte) 0xb8,
  (byte) 0xdb, (byte) 0xe9, (byte) 0xc4, (byte) 0x8b,