Merge pull request #35 from str4d/33-jca-naming

Correct algorithm and curve names

Author: str4d

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

@@ -64,6 +64,8 @@
  *
  */
 public final class EdDSAEngine extends Signature {
+    public static final String SIGNATURE_ALGORITHM = "NONEwithEdDSA";
+
     private MessageDigest digest;
     private ByteArrayOutputStream baos;
     private EdDSAKey key;

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

@@ -16,8 +16,6 @@
 import java.security.Provider;
 import java.security.Security;
 
-import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
-
 /**
  * A security {@link Provider} that can be registered via {@link Security#addProvider(Provider)}
  *
@@ -43,6 +41,6 @@ protected void setup() {
         // see https://docs.oracle.com/javase/8/docs/technotes/guides/security/crypto/HowToImplAProvider.html
         put("KeyPairGenerator." + EdDSAKey.KEY_ALGORITHM, "net.i2p.crypto.eddsa.KeyPairGenerator");
         put("KeyFactory." + EdDSAKey.KEY_ALGORITHM, "net.i2p.crypto.eddsa.KeyFactory");
-        put("Signature." + EdDSANamedCurveTable.CURVE_ED25519_SHA512, "net.i2p.crypto.eddsa.EdDSAEngine");
+        put("Signature." + EdDSAEngine.SIGNATURE_ALGORITHM, "net.i2p.crypto.eddsa.EdDSAEngine");
     }
 }

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

@@ -12,6 +12,7 @@
 package net.i2p.crypto.eddsa.spec;
 
 import java.util.Hashtable;
+import java.util.Locale;
 
 import net.i2p.crypto.eddsa.Utils;
 import net.i2p.crypto.eddsa.math.Curve;
@@ -25,7 +26,7 @@
  *
  */
 public class EdDSANamedCurveTable {
-    public static final String CURVE_ED25519_SHA512 = "SHA512withEd25519";
+    public static final String CURVE_ED25519_SHA512 = "ed25519-sha-512";
 
     private static final Field ed25519field = new Field(
                     256, // b
@@ -48,14 +49,25 @@ public class EdDSANamedCurveTable {
     private static final Hashtable<String, EdDSANamedCurveSpec> curves = new Hashtable<String, EdDSANamedCurveSpec>();
 
     public static void defineCurve(String name, EdDSANamedCurveSpec curve) {
-        curves.put(name, curve);
+        curves.put(name.toLowerCase(Locale.ENGLISH), curve);
+    }
+
+    static void defineCurveAlias(String name, String alias) {
+        EdDSANamedCurveSpec curve = curves.get(name.toLowerCase(Locale.ENGLISH));
+        if (curve == null) {
+            throw new IllegalStateException();
+        }
+        curves.put(alias.toLowerCase(Locale.ENGLISH), curve);
     }
 
     static {
         defineCurve(CURVE_ED25519_SHA512, ed25519sha512);
+
+        // RFC 8032
+        defineCurveAlias(CURVE_ED25519_SHA512, "Ed25519");
     }
 
     public static EdDSANamedCurveSpec getByName(String name) {
-        return curves.get(name);
+        return curves.get(name.toLowerCase(Locale.ENGLISH));
     }
 }

test/net/i2p/crypto/eddsa/EdDSASecurityProviderTest.java

@@ -38,7 +38,7 @@ public void canGetInstancesWhenProviderIsPresent() throws Exception {
 
         KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EdDSA", "EdDSA");
         KeyFactory keyFac = KeyFactory.getInstance("EdDSA", "EdDSA");
-        Signature sgr = Signature.getInstance("SHA512withEd25519", "EdDSA");
+        Signature sgr = Signature.getInstance("NONEwithEdDSA", "EdDSA");
 
         Security.removeProvider("EdDSA");
     }

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

@@ -0,0 +1,36 @@
+/**
+ * EdDSA-Java by str4d
+ *
+ * To the extent possible under law, the person who associated CC0 with
+ * EdDSA-Java has waived all copyright and related or neighboring rights
+ * to EdDSA-Java.
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
+ *
+ */
+package net.i2p.crypto.eddsa.spec;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * @author str4d
+ *
+ */
+public class EdDSANamedCurveTableTest {
+    /**
+     * Ensure curve names are case-inspecific
+     */
+    @Test
+    public void curveNamesAreCaseInspecific() {
+        EdDSANamedCurveSpec mixed = EdDSANamedCurveTable.getByName("Ed25519");
+        EdDSANamedCurveSpec lower = EdDSANamedCurveTable.getByName("ed25519");
+        EdDSANamedCurveSpec upper = EdDSANamedCurveTable.getByName("ED25519");
+
+        assertThat(lower, is(equalTo(mixed)));
+        assertThat(upper, is(equalTo(mixed)));
+    }
+}