Post-rebase clean up

Author: rick-r3

src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java

@@ -63,7 +63,7 @@ public EdDSAPrivateKey(EdDSAPrivateKeySpec spec) {
 
     public EdDSAPrivateKey(PKCS8EncodedKeySpec spec) throws InvalidKeySpecException {
         this(new EdDSAPrivateKeySpec(decode(spec.getEncoded()),
-                                     EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.ED_25519)));
+                                     EdDSANamedCurveTable.ED_25519_CURVE_SPEC));
     }
 
     @Override
@@ -136,7 +136,7 @@ public String getFormat() {
      */
     @Override
     public byte[] getEncoded() {
-        if (!edDsaSpec.equals(EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.ED_25519)))
+        if (!edDsaSpec.equals(EdDSANamedCurveTable.ED_25519_CURVE_SPEC))
             return null;
         if (seed == null)
             return null;

src/net/i2p/crypto/eddsa/EdDSAPublicKey.java

@@ -58,7 +58,7 @@ public EdDSAPublicKey(EdDSAPublicKeySpec spec) {
 
     public EdDSAPublicKey(X509EncodedKeySpec spec) throws InvalidKeySpecException {
         this(new EdDSAPublicKeySpec(decode(spec.getEncoded()),
-                                    EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.ED_25519)));
+                                    EdDSANamedCurveTable.ED_25519_CURVE_SPEC));
     }
 
     @Override
@@ -112,7 +112,7 @@ public String getFormat() {
      */
     @Override
     public byte[] getEncoded() {
-        if (!edDsaSpec.equals(EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.ED_25519)))
+        if (!edDsaSpec.equals(EdDSANamedCurveTable.ED_25519_CURVE_SPEC))
             return null;
         int totlen = 12 + Abyte.length;
         byte[] rv = new byte[totlen];

src/net/i2p/crypto/eddsa/spec/EdDSANamedCurveTable.java

@@ -37,7 +37,7 @@ public class EdDSANamedCurveTable {
             Utils.hexToBytes("a3785913ca4deb75abd841414d0a700098e879777940c78c73fe6f2bee6c0352"), // d
             ed25519field.fromByteArray(Utils.hexToBytes("b0a00e4a271beec478e42fad0618432fa7d7fb3d99004d2b0bdfc14f8024832b"))); // I
 
-    private static final EdDSANamedCurveSpec ed25519 = new EdDSANamedCurveSpec(
+    public static final EdDSANamedCurveSpec ED_25519_CURVE_SPEC = new EdDSANamedCurveSpec(
             ED_25519,
             ed25519curve,
             "SHA-512", // H
@@ -68,7 +68,7 @@ static void defineCurveAlias(String name, String alias) {
 
     static {
         // RFC 8032
-        defineCurve(ed25519);
+        defineCurve(ED_25519_CURVE_SPEC);
     }
 
     public static EdDSANamedCurveSpec getByName(String name) {

test/net/i2p/crypto/eddsa/spec/EdDSANamedCurveTableTest.java

@@ -12,6 +12,7 @@
 package net.i2p.crypto.eddsa.spec;
 
 import static net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable.ED_25519;
+import static net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable.ED_25519_CURVE_SPEC;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
@@ -36,8 +37,8 @@ public void curveNamesAreCaseInspecific() {
     }
 
     @Test
-    public void testConstant() {
-        EdDSANamedCurveSpec spec = EdDSANamedCurveTable.getByName("Ed25519");
-        assertThat("Named curve and constant should match", spec, is(equalTo(ED_25519)));
+    public void testConstants() {
+        EdDSANamedCurveSpec spec = EdDSANamedCurveTable.getByName(ED_25519);
+        assertThat("Named curve and constant should match", spec, is(equalTo(ED_25519_CURVE_SPEC)));
     }
 }