Merge pull request #5 from pmarches/master

Added maven support and small test cleanup

Author: str4d

pom.xml

@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>net.i2p.crypto</groupId>
+	<artifactId>eddsa</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>ed25519-java</name>
+	<description>Implementation of EdDSA in Java</description>
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>test</testSourceDirectory>
+		<testResources>
+			<testResource>
+				<directory>test</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+		</testResources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+					<encoding>${project.build.sourceEncoding}</encoding>
+				</configuration>
+				<version>3.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.17</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<type>maven-plugin</type>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>

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

@@ -63,4 +63,22 @@ public static byte[] hexToBytes(String s) {
         }
         return data;
     }
+    
+    /**
+     * Converts bytes to a hex string.
+     * @param raw the byte[] to be converted.
+     * @return the hex representation as a string.
+     */
+    public static String bytesToHex(byte[] raw) {
+        if ( raw == null ) {
+            return null;
+        }
+        final StringBuilder hex = new StringBuilder(2 * raw.length);
+        for (final byte b : raw) {
+            hex.append(Character.forDigit((b & 0xF0) >> 4, 16))
+            .append(Character.forDigit((b & 0x0F), 16));
+        }
+        return hex.toString();
+    }
+
 }

src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java

@@ -1,6 +1,5 @@
 package net.i2p.crypto.eddsa.math.ed25519;
 
-import net.i2p.crypto.eddsa.TestUtils;
 import net.i2p.crypto.eddsa.Utils;
 import net.i2p.crypto.eddsa.math.Field;
 import net.i2p.crypto.eddsa.math.FieldElement;
@@ -956,13 +955,11 @@ public boolean equals(Object obj) {
         if (!(obj instanceof Ed25519FieldElement))
             return false;
         Ed25519FieldElement fe = (Ed25519FieldElement) obj;
-        // XXX why does direct byte[] comparison fail?
-        // TODO should this be constant time?
-        return TestUtils.getHex(toByteArray()).equals(TestUtils.getHex(fe.toByteArray()));
+        return 1==Utils.equal(toByteArray(), fe.toByteArray());
     }
 
     @Override
     public String toString() {
-        return "[Ed25519FieldElement val="+TestUtils.getHex(toByteArray())+"]";
+        return "[Ed25519FieldElement val="+Utils.bytesToHex(toByteArray())+"]";
     }
 }