Merge pull request #20 from halu5071/develop

Update to v0.2.1-alpha
halu5071 · Nov 21, 2018 · 3da099e · 3da099e
2 parents 6fce723 + 61a196b
commit 3da099e
Show file tree

Hide file tree

Showing 41 changed files with 155 additions and 92 deletions.
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ buildscript {
 }
 
 dependencies {
-    compile "io.moatwel.crypto:eddsa:0.2.0-alpha"
+    compile "io.moatwel.crypto:eddsa:0.2.1-alpha"
 }
 ```
 
@@ -94,7 +94,7 @@ dependencies {
 <dependency> 
     <groupId>io.moatwel.crypto</groupId> 
     <artifactId>eddsa</artifactId> 
-    <version>0.2.0-alpha</version>
+    <version>0.2.1-alpha</version>
     <type>pom</type> 
 </dependency>
 ```

diff --git a/eddsa/build.gradle b/eddsa/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.bintray'
 
 group = 'io.moatwel.crypto'
 archivesBaseName = 'eddsa'
-version = '0.2.0-alpha'
+version = '0.2.1-alpha'
 description = 'Edwards is a crypto library for Edwards-curve Digital Signature Algorithm (EdDSA) written in pure Java. '
 
 def powermock_version = '1.7.4'
@@ -94,7 +94,7 @@ publishing {
             artifact javadocJar
             groupId 'io.moatwel.crypto'
             artifactId 'eddsa'
-            version '0.2.0-alpha'
+            version '0.2.1-alpha'
             pom.withXml {
                 def root = asNode()
                 root.appendNode('description', project.description)

diff --git a/eddsa/src/main/java/io/moatwel/crypto/PublicKey.java b/eddsa/src/main/java/io/moatwel/crypto/PublicKey.java
@@ -1,9 +1,9 @@
 package io.moatwel.crypto;
 
-import io.moatwel.util.HexEncoder;
-
 import java.math.BigInteger;
 
+import io.moatwel.util.HexEncoder;
+
 /**
  * @author halu5071 (Yasunori Horii) at 2018/5/29
  */

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/SchemeProvider.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/SchemeProvider.java
@@ -1,8 +1,6 @@
 package io.moatwel.crypto.eddsa;
 
 import io.moatwel.crypto.EdDsaSigner;
-import io.moatwel.crypto.KeyGenerator;
-import io.moatwel.crypto.KeyPair;
 import io.moatwel.crypto.PrivateKey;
 
 /**

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/CoordinateEd25519.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/CoordinateEd25519.java
@@ -1,13 +1,13 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.Curve;
 import io.moatwel.crypto.eddsa.EncodedCoordinate;
 import io.moatwel.util.ArrayUtils;
 import io.moatwel.util.ByteUtils;
 
-import java.math.BigInteger;
-
 /**
  * @author halu5071 (Yasunori Horii) at 2018/06/28
  */

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/Curve25519.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/Curve25519.java
@@ -1,11 +1,11 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.Curve;
 import io.moatwel.crypto.eddsa.Point;
 
-import java.math.BigInteger;
-
 /**
  * Represent Ed25519 curve of twisted Edwards-curve.
  *

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/Ed25519PublicKeyDelegate.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/Ed25519PublicKeyDelegate.java
@@ -1,14 +1,14 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.HashAlgorithm;
 import io.moatwel.crypto.Hashes;
 import io.moatwel.crypto.PrivateKey;
 import io.moatwel.crypto.eddsa.Point;
 import io.moatwel.crypto.eddsa.PublicKeyDelegate;
 import io.moatwel.util.ByteUtils;
 
-import java.math.BigInteger;
-
 /**
  * Delegate class from {@link io.moatwel.crypto.eddsa.EdDsaKeyGenerator}.
  * This will be provide from {@link Ed25519SchemeProvider}

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/Ed25519SchemeProvider.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/Ed25519SchemeProvider.java
@@ -4,12 +4,9 @@
 
 import io.moatwel.crypto.EdDsaSigner;
 import io.moatwel.crypto.HashAlgorithm;
-import io.moatwel.crypto.KeyGenerator;
-import io.moatwel.crypto.KeyPair;
 import io.moatwel.crypto.PrivateKey;
-import io.moatwel.crypto.eddsa.SchemeProvider;
-import io.moatwel.crypto.eddsa.EdKeyAnalyzer;
 import io.moatwel.crypto.eddsa.PublicKeyDelegate;
+import io.moatwel.crypto.eddsa.SchemeProvider;
 
 /**
  * @author halu5071 (Yasunori Horii) at 2018/6/26

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/Ed25519Signer.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/Ed25519Signer.java
@@ -1,5 +1,7 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.EdDsaSigner;
 import io.moatwel.crypto.HashAlgorithm;
 import io.moatwel.crypto.Hashes;
@@ -12,8 +14,6 @@
 import io.moatwel.crypto.eddsa.Point;
 import io.moatwel.util.ByteUtils;
 
-import java.math.BigInteger;
-
 /**
  * A Signer on Edwards-curve DSA specified on Ed25519 curve.
  *

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/EncodedCoordinateEd25519.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/EncodedCoordinateEd25519.java
@@ -1,11 +1,11 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.EncodedCoordinate;
 import io.moatwel.util.ByteUtils;
 
-import java.math.BigInteger;
-
 class EncodedCoordinateEd25519 extends EncodedCoordinate {
 
     EncodedCoordinateEd25519(byte[] value) {

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/EncodedPointEd25519.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/EncodedPointEd25519.java
@@ -1,14 +1,14 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.Curve;
 import io.moatwel.crypto.eddsa.DecodeException;
 import io.moatwel.crypto.eddsa.EncodedPoint;
 import io.moatwel.crypto.eddsa.Point;
 import io.moatwel.util.ByteUtils;
 
-import java.math.BigInteger;
-
 /**
  * Encoded Point implementation of the Curve25519. Implements {@link EncodedPoint#decode()}
  * operation. This object has byte array whose length is 32, which represents encoded point.
@@ -48,10 +48,14 @@ public Point decode() {
         Coordinate x = xx.powerMod(curve.getPrimePowerP().add(new BigInteger("3")).divide(new BigInteger("8")));
 
         if (x.multiply(x).subtract(xx).mod().getInteger().compareTo(BigInteger.ZERO) != 0) {
-            x = x.multiply(new CoordinateEd25519(
-                    BigInteger.ONE.shiftLeft(1).modPow(
-                            curve.getPrimePowerP().subtract(BigInteger.ONE).divide(BigInteger.ONE.shiftLeft(2)),
-                            curve.getPrimePowerP()))).mod();
+            if (x.multiply(x).add(xx).mod().getInteger().compareTo(BigInteger.ZERO) == 0) {
+                x = x.multiply(new CoordinateEd25519(
+                        BigInteger.ONE.shiftLeft(1).modPow(
+                                curve.getPrimePowerP().subtract(BigInteger.ONE).divide(BigInteger.ONE.shiftLeft(2)),
+                                curve.getPrimePowerP()))).mod();
+            } else {
+                throw new DecodeException("EdDsa decoding failed.");
+            }
         }
 
         BigInteger result = x.getInteger().mod(BigInteger.ONE.shiftLeft(1));

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/PointEd25519.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/PointEd25519.java
@@ -1,13 +1,13 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.EncodedPoint;
 import io.moatwel.crypto.eddsa.Point;
 import io.moatwel.util.ArrayUtils;
 import io.moatwel.util.ByteUtils;
 
-import java.math.BigInteger;
-
 class PointEd25519 extends Point {
 
     private static final Coordinate Z1 = new CoordinateEd25519(new BigInteger("1"));

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/PrivateKeyEd25519.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/PrivateKeyEd25519.java
@@ -1,10 +1,10 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.security.SecureRandom;
+
 import io.moatwel.crypto.PrivateKey;
 import io.moatwel.util.HexEncoder;
 
-import java.security.SecureRandom;
-
 public class PrivateKeyEd25519 extends PrivateKey {
 
     private PrivateKeyEd25519(byte[] value) {

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/SignatureEd25519.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed25519/SignatureEd25519.java
@@ -1,10 +1,10 @@
 package io.moatwel.crypto.eddsa.ed25519;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.Signature;
 import io.moatwel.util.ArrayUtils;
 
-import java.math.BigInteger;
-
 /**
  * @author halu5071 (Yasunori Horii) at 2018/6/21
  */

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/CoordinateEd448.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/CoordinateEd448.java
@@ -1,11 +1,11 @@
 package io.moatwel.crypto.eddsa.ed448;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.Curve;
 import io.moatwel.crypto.eddsa.EncodedCoordinate;
 
-import java.math.BigInteger;
-
 /**
  * @author halu5071 (Yasunori Horii) at 2018/06/28
  */

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/Curve448.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/Curve448.java
@@ -1,11 +1,11 @@
 package io.moatwel.crypto.eddsa.ed448;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.Curve;
 import io.moatwel.crypto.eddsa.Point;
 
-import java.math.BigInteger;
-
 /**
  * Represent Ed448 curve of twisted Edwards-curve.
  *

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/Ed448SchemeProvider.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/Ed448SchemeProvider.java
@@ -4,12 +4,9 @@
 
 import io.moatwel.crypto.EdDsaSigner;
 import io.moatwel.crypto.HashAlgorithm;
-import io.moatwel.crypto.KeyGenerator;
-import io.moatwel.crypto.KeyPair;
 import io.moatwel.crypto.PrivateKey;
-import io.moatwel.crypto.eddsa.SchemeProvider;
-import io.moatwel.crypto.eddsa.EdKeyAnalyzer;
 import io.moatwel.crypto.eddsa.PublicKeyDelegate;
+import io.moatwel.crypto.eddsa.SchemeProvider;
 
 /**
  * @author halu5071 (Yasunori Horii) at 2018/6/26

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/EncodedCoordinateEd448.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/EncodedCoordinateEd448.java
@@ -1,11 +1,11 @@
 package io.moatwel.crypto.eddsa.ed448;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.EncodedCoordinate;
 import io.moatwel.util.ByteUtils;
 
-import java.math.BigInteger;
-
 class EncodedCoordinateEd448 extends EncodedCoordinate {
 
     EncodedCoordinateEd448(byte[] value) {

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/PointEd448.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/PointEd448.java
@@ -1,11 +1,11 @@
 package io.moatwel.crypto.eddsa.ed448;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.eddsa.Coordinate;
 import io.moatwel.crypto.eddsa.EncodedPoint;
 import io.moatwel.crypto.eddsa.Point;
 
-import java.math.BigInteger;
-
 class PointEd448 extends Point {
 
     private static final Point ZERO =

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/PrivateKeyEd448.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/PrivateKeyEd448.java
@@ -1,9 +1,9 @@
 package io.moatwel.crypto.eddsa.ed448;
 
-import io.moatwel.crypto.PrivateKey;
-
 import java.security.SecureRandom;
 
+import io.moatwel.crypto.PrivateKey;
+
 public class PrivateKeyEd448 extends PrivateKey {
 
     private PrivateKeyEd448(byte[] value) {

diff --git a/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/SignatureEd448.java b/eddsa/src/main/java/io/moatwel/crypto/eddsa/ed448/SignatureEd448.java
@@ -1,10 +1,10 @@
 package io.moatwel.crypto.eddsa.ed448;
 
+import java.math.BigInteger;
+
 import io.moatwel.crypto.Signature;
 import io.moatwel.util.ArrayUtils;
 
-import java.math.BigInteger;
-
 /**
  * @author halu5071 (Yasunori Horii) at 2018/6/26
  */

diff --git a/eddsa/src/test/java/io/moatwel/crypto/HashesTest.java b/eddsa/src/test/java/io/moatwel/crypto/HashesTest.java
@@ -1,8 +1,9 @@
 package io.moatwel.crypto;
 
-import io.moatwel.util.HexEncoder;
 import org.junit.Test;
 
+import io.moatwel.util.HexEncoder;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 

diff --git a/eddsa/src/test/java/io/moatwel/crypto/KeyPairTest.java b/eddsa/src/test/java/io/moatwel/crypto/KeyPairTest.java
@@ -1,13 +1,14 @@
 package io.moatwel.crypto;
 
-import io.moatwel.crypto.eddsa.EdKeyAnalyzer;
-import io.moatwel.crypto.eddsa.Edwards;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import io.moatwel.crypto.eddsa.EdKeyAnalyzer;
+import io.moatwel.crypto.eddsa.Edwards;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.powermock.api.mockito.PowerMockito.mock;

diff --git a/eddsa/src/test/java/io/moatwel/crypto/PrivateKeyTest.java b/eddsa/src/test/java/io/moatwel/crypto/PrivateKeyTest.java
@@ -11,9 +11,7 @@
 import io.moatwel.util.HexEncoder;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 public class PrivateKeyTest {

diff --git a/eddsa/src/test/java/io/moatwel/crypto/PublicKeyTest.java b/eddsa/src/test/java/io/moatwel/crypto/PublicKeyTest.java
@@ -1,10 +1,11 @@
 package io.moatwel.crypto;
 
-import io.moatwel.util.HexEncoder;
 import org.junit.Test;
 
 import java.math.BigInteger;
 
+import io.moatwel.util.HexEncoder;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 

diff --git a/eddsa/src/test/java/io/moatwel/crypto/eddsa/EdDsaKeyGeneratorTest.java b/eddsa/src/test/java/io/moatwel/crypto/eddsa/EdDsaKeyGeneratorTest.java
@@ -1,10 +1,14 @@
 package io.moatwel.crypto.eddsa;
 
-import io.moatwel.crypto.*;
-import io.moatwel.crypto.eddsa.ed25519.PrivateKeyEd25519;
 import org.junit.Before;
 import org.junit.Test;
 
+import io.moatwel.crypto.HashAlgorithm;
+import io.moatwel.crypto.KeyGenerator;
+import io.moatwel.crypto.PrivateKey;
+import io.moatwel.crypto.PublicKey;
+import io.moatwel.crypto.eddsa.ed25519.PrivateKeyEd25519;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;