Repository: mina-sshd
Updated Branches:
  refs/heads/master 2b3beeedb -> 8f2fb4453


[SSHD-710] Added Ed25519 vectors tests


Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/8f2fb445
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/8f2fb445
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/8f2fb445

Branch: refs/heads/master
Commit: 8f2fb44536d6f81b67a5db902a467859a64aba2e
Parents: 2b3beee
Author: Lyor Goldstein <lyor.goldst...@gmail.com>
Authored: Sun Nov 13 20:52:27 2016 +0200
Committer: Lyor Goldstein <lyor.goldst...@gmail.com>
Committed: Sun Nov 13 20:52:27 2016 +0200

----------------------------------------------------------------------
 .../security/eddsa/EdDSASecurityProvider.java   |  12 ++
 .../common/signature/SignaturesDevelopment.java |  79 +++++++
 .../sshd/common/util/EDDSAProviderTest.java     | 123 -----------
 .../util/security/eddsa/EDDSAProviderTest.java  | 123 +++++++++++
 .../util/security/eddsa/Ed25519VectorsTest.java | 214 +++++++++++++++++++
 5 files changed, 428 insertions(+), 123 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/8f2fb445/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProvider.java
----------------------------------------------------------------------
diff --git 
a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProvider.java
 
b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProvider.java
index ba73878..36abac0 100644
--- 
a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProvider.java
+++ 
b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProvider.java
@@ -33,6 +33,7 @@ import net.i2p.crypto.eddsa.EdDSAPrivateKey;
 import net.i2p.crypto.eddsa.EdDSAPublicKey;
 import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
 import net.i2p.crypto.eddsa.spec.EdDSAParameterSpec;
+import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec;
 import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
 
 import org.apache.sshd.common.config.keys.PrivateKeyEntryDecoder;
@@ -161,6 +162,17 @@ public class EdDSASecurityProvider extends Provider {
         return factory.generatePublic(keySpec);
     }
 
+    public static PrivateKey generateEDDSAPrivateKey(byte[] seed) throws 
GeneralSecurityException {
+        if (!SecurityUtils.isEDDSACurveSupported()) {
+            throw new NoSuchAlgorithmException(SecurityUtils.EDDSA + " not 
supported");
+        }
+
+        EdDSAParameterSpec params = 
EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
+        EdDSAPrivateKeySpec keySpec = new EdDSAPrivateKeySpec(seed, params);
+        KeyFactory factory = SecurityUtils.getKeyFactory(SecurityUtils.EDDSA);
+        return factory.generatePrivate(keySpec);
+    }
+
     public static <B extends Buffer> B putRawEDDSAPublicKey(B buffer, 
PublicKey key) {
         ValidateUtils.checkTrue(SecurityUtils.isEDDSACurveSupported(), 
SecurityUtils.EDDSA + " not supported");
         EdDSAPublicKey edKey = ValidateUtils.checkInstanceOf(key, 
EdDSAPublicKey.class, "Not an EDDSA public key: %s", key);

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/8f2fb445/sshd-core/src/test/java/org/apache/sshd/common/signature/SignaturesDevelopment.java
----------------------------------------------------------------------
diff --git 
a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignaturesDevelopment.java
 
b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignaturesDevelopment.java
new file mode 100644
index 0000000..6c4929a
--- /dev/null
+++ 
b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignaturesDevelopment.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sshd.common.signature;
+
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+
+import org.apache.sshd.common.util.GenericUtils;
+import org.apache.sshd.common.util.buffer.BufferUtils;
+import org.apache.sshd.common.util.security.eddsa.EdDSASecurityProvider;
+import org.apache.sshd.util.test.BaseTestSupport;
+
+/**
+ * A &quot;scratch-pad&quot; class for testing signatures related code during 
development
+ * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
+ */
+public class SignaturesDevelopment extends BaseTestSupport {
+    public SignaturesDevelopment() {
+        super();
+    }
+
+    public static void testSignatureFactory(
+            SignatureFactory factory, KeyPair kp, byte[] data, boolean 
generateSignature, byte[] signature)
+                throws Exception {
+        Signature signer = factory.create();
+        if (generateSignature) {
+            signer.initSigner(kp.getPrivate());
+            signer.update(data);
+            signature = signer.sign();
+            System.out.append('\t').append("Signature: 
").println(BufferUtils.toHex(':', signature));
+        } else {
+            signer.initVerifier(kp.getPublic());
+            signer.update(data);
+            if (signer.verify(signature)) {
+                System.out.append('\t').println("Valid signature");
+            } else {
+                System.err.append('\t').println("Invalid signature");
+            }
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////
+
+    // args[0]=signatureName, args[1]=publicKey, args[2]=privateKey, 
args[3]=sign/verify, args[4]=data, args[5]=signature(if verify required)
+    public static void main(String[] args) throws Exception {
+        SignatureFactory factory = BuiltinSignatures.resolveFactory(args[0]);
+        // TODO recover public/private keys according to factory name
+        byte[] publicKey = BufferUtils.decodeHex(':', args[1]);
+        PublicKey pubKey = 
EdDSASecurityProvider.generateEDDSAPublicKey(publicKey);
+        byte[] privateKey = BufferUtils.decodeHex(':', args[2]);
+        PrivateKey prvKey = 
EdDSASecurityProvider.generateEDDSAPrivateKey(privateKey);
+        String op = args[3];
+        byte[] data = BufferUtils.decodeHex(':', args[4]);
+        byte[] signature = GenericUtils.EMPTY_BYTE_ARRAY;
+        if ("verify".equalsIgnoreCase(op)) {
+            signature = BufferUtils.decodeHex(':', args[5]);
+        }
+
+        testSignatureFactory(factory, new KeyPair(pubKey, prvKey), data, 
"sign".equalsIgnoreCase(op), signature);
+    }
+}

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/8f2fb445/sshd-core/src/test/java/org/apache/sshd/common/util/EDDSAProviderTest.java
----------------------------------------------------------------------
diff --git 
a/sshd-core/src/test/java/org/apache/sshd/common/util/EDDSAProviderTest.java 
b/sshd-core/src/test/java/org/apache/sshd/common/util/EDDSAProviderTest.java
deleted file mode 100644
index ab25821..0000000
--- a/sshd-core/src/test/java/org/apache/sshd/common/util/EDDSAProviderTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sshd.common.util;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Signature;
-
-import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
-
-import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
-import org.apache.sshd.common.config.keys.KeyUtils;
-import org.apache.sshd.common.keyprovider.KeyPairProvider;
-import org.apache.sshd.common.util.buffer.Buffer;
-import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
-import org.apache.sshd.common.util.security.SecurityUtils;
-import org.apache.sshd.util.test.BaseTestSupport;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
-
-/**
- * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
- */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class EDDSAProviderTest extends BaseTestSupport {
-    private static KeyPair keyPair;
-
-    public EDDSAProviderTest() {
-        super();
-    }
-
-    @BeforeClass
-    public static void checkProviderSupported() throws 
GeneralSecurityException {
-        Assume.assumeTrue(SecurityUtils.EDDSA + " not supported", 
SecurityUtils.isEDDSACurveSupported());
-        KeyPairGenerator g = 
SecurityUtils.getKeyPairGenerator(SecurityUtils.EDDSA);
-        assertNotNull("No generator instance", g);
-
-        keyPair = g.generateKeyPair();
-        assertNotNull("No key pair generated", keyPair);
-
-        PublicKey pubKey = keyPair.getPublic();
-        assertNotNull("No public key", pubKey);
-        assertEquals("Mismatched public key algorithm", SecurityUtils.EDDSA, 
pubKey.getAlgorithm());
-        assertEquals("Mismatched public key type", 
KeyPairProvider.SSH_ED25519, KeyUtils.getKeyType(pubKey));
-
-        PrivateKey prvKey = keyPair.getPrivate();
-        assertNotNull("No private key", prvKey);
-        assertEquals("Mismatched key-pair algorithm", pubKey.getAlgorithm(), 
prvKey.getAlgorithm());
-        assertEquals("Mismatched private key type", 
KeyPairProvider.SSH_ED25519, KeyUtils.getKeyType(prvKey));
-    }
-
-    @Test
-    public void testSignature() throws GeneralSecurityException {
-        Signature s = 
SecurityUtils.getSignature(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
-        assertNotNull("No signature instance", s);
-        s.initSign(keyPair.getPrivate());
-
-        byte[] data = (getClass().getName() + "#" + 
getCurrentTestName()).getBytes(StandardCharsets.UTF_8);
-        s.update(data);
-        byte[] signed = s.sign();
-
-        s = 
SecurityUtils.getSignature(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
-        s.initVerify(keyPair.getPublic());
-        s.update(data);
-        assertTrue("Failed to verify", s.verify(signed));
-    }
-
-    @Test
-    public void testPublicKeyEntryDecoder() throws IOException, 
GeneralSecurityException {
-        String comment = getCurrentTestName() + "@" + 
getClass().getSimpleName();
-        String expected = "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGPKSUTyz1HwHReFVvD5obVsALAgJRNarH4TRpNePnAS " + 
comment;
-        AuthorizedKeyEntry keyEntry = 
AuthorizedKeyEntry.parseAuthorizedKeyEntry(expected);
-        assertNotNull("No extracted key entry", keyEntry);
-
-        assertEquals("Mismatched key type", KeyPairProvider.SSH_ED25519, 
keyEntry.getKeyType());
-        assertEquals("Mismatched comment", comment, keyEntry.getComment());
-
-        StringBuilder sb = new StringBuilder(expected.length());
-        PublicKey pubKey = keyEntry.appendPublicKey(sb, null);
-        assertEquals("Mismatched encoded result", expected, sb.toString());
-
-        testPublicKeyRecovery(pubKey);
-    }
-
-    @Test
-    public void testGeneratedPublicKeyRecovery() throws IOException, 
GeneralSecurityException {
-        testPublicKeyRecovery(keyPair.getPublic());
-    }
-
-    private void testPublicKeyRecovery(PublicKey pubKey) throws IOException, 
GeneralSecurityException {
-        assertNotNull("No public key generated", pubKey);
-        assertEquals("Mismatched public key algorithm", SecurityUtils.EDDSA, 
pubKey.getAlgorithm());
-
-        Buffer buf = SecurityUtils.putRawEDDSAPublicKey(new ByteArrayBuffer(), 
pubKey);
-        PublicKey actual = buf.getRawPublicKey();
-        assertEquals("Mismatched key algorithm", pubKey.getAlgorithm(), 
actual.getAlgorithm());
-        assertEquals("Mismatched recovered key", pubKey, actual);
-    }
-}

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/8f2fb445/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java
----------------------------------------------------------------------
diff --git 
a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java
 
b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java
new file mode 100644
index 0000000..f7461a3
--- /dev/null
+++ 
b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sshd.common.util.security.eddsa;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+
+import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
+
+import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
+import org.apache.sshd.common.config.keys.KeyUtils;
+import org.apache.sshd.common.keyprovider.KeyPairProvider;
+import org.apache.sshd.common.util.buffer.Buffer;
+import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
+import org.apache.sshd.common.util.security.SecurityUtils;
+import org.apache.sshd.util.test.BaseTestSupport;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+/**
+ * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class EDDSAProviderTest extends BaseTestSupport {
+    private static KeyPair keyPair;
+
+    public EDDSAProviderTest() {
+        super();
+    }
+
+    @BeforeClass
+    public static void checkProviderSupported() throws 
GeneralSecurityException {
+        Assume.assumeTrue(SecurityUtils.EDDSA + " not supported", 
SecurityUtils.isEDDSACurveSupported());
+        KeyPairGenerator g = 
SecurityUtils.getKeyPairGenerator(SecurityUtils.EDDSA);
+        assertNotNull("No generator instance", g);
+
+        keyPair = g.generateKeyPair();
+        assertNotNull("No key pair generated", keyPair);
+
+        PublicKey pubKey = keyPair.getPublic();
+        assertNotNull("No public key", pubKey);
+        assertEquals("Mismatched public key algorithm", SecurityUtils.EDDSA, 
pubKey.getAlgorithm());
+        assertEquals("Mismatched public key type", 
KeyPairProvider.SSH_ED25519, KeyUtils.getKeyType(pubKey));
+
+        PrivateKey prvKey = keyPair.getPrivate();
+        assertNotNull("No private key", prvKey);
+        assertEquals("Mismatched key-pair algorithm", pubKey.getAlgorithm(), 
prvKey.getAlgorithm());
+        assertEquals("Mismatched private key type", 
KeyPairProvider.SSH_ED25519, KeyUtils.getKeyType(prvKey));
+    }
+
+    @Test
+    public void testSignature() throws GeneralSecurityException {
+        Signature s = 
SecurityUtils.getSignature(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
+        assertNotNull("No signature instance", s);
+        s.initSign(keyPair.getPrivate());
+
+        byte[] data = (getClass().getName() + "#" + 
getCurrentTestName()).getBytes(StandardCharsets.UTF_8);
+        s.update(data);
+        byte[] signed = s.sign();
+
+        s = 
SecurityUtils.getSignature(EdDSANamedCurveTable.CURVE_ED25519_SHA512);
+        s.initVerify(keyPair.getPublic());
+        s.update(data);
+        assertTrue("Failed to verify", s.verify(signed));
+    }
+
+    @Test
+    public void testPublicKeyEntryDecoder() throws IOException, 
GeneralSecurityException {
+        String comment = getCurrentTestName() + "@" + 
getClass().getSimpleName();
+        String expected = "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIGPKSUTyz1HwHReFVvD5obVsALAgJRNarH4TRpNePnAS " + 
comment;
+        AuthorizedKeyEntry keyEntry = 
AuthorizedKeyEntry.parseAuthorizedKeyEntry(expected);
+        assertNotNull("No extracted key entry", keyEntry);
+
+        assertEquals("Mismatched key type", KeyPairProvider.SSH_ED25519, 
keyEntry.getKeyType());
+        assertEquals("Mismatched comment", comment, keyEntry.getComment());
+
+        StringBuilder sb = new StringBuilder(expected.length());
+        PublicKey pubKey = keyEntry.appendPublicKey(sb, null);
+        assertEquals("Mismatched encoded result", expected, sb.toString());
+
+        testPublicKeyRecovery(pubKey);
+    }
+
+    @Test
+    public void testGeneratedPublicKeyRecovery() throws IOException, 
GeneralSecurityException {
+        testPublicKeyRecovery(keyPair.getPublic());
+    }
+
+    private void testPublicKeyRecovery(PublicKey pubKey) throws IOException, 
GeneralSecurityException {
+        assertNotNull("No public key generated", pubKey);
+        assertEquals("Mismatched public key algorithm", SecurityUtils.EDDSA, 
pubKey.getAlgorithm());
+
+        Buffer buf = SecurityUtils.putRawEDDSAPublicKey(new ByteArrayBuffer(), 
pubKey);
+        PublicKey actual = buf.getRawPublicKey();
+        assertEquals("Mismatched key algorithm", pubKey.getAlgorithm(), 
actual.getAlgorithm());
+        assertEquals("Mismatched recovered key", pubKey, actual);
+    }
+}

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/8f2fb445/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java
----------------------------------------------------------------------
diff --git 
a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java
 
b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java
new file mode 100644
index 0000000..637032d
--- /dev/null
+++ 
b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java
@@ -0,0 +1,214 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sshd.common.util.security.eddsa;
+
+import java.security.GeneralSecurityException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.i2p.crypto.eddsa.EdDSAPrivateKey;
+import net.i2p.crypto.eddsa.EdDSAPublicKey;
+
+import org.apache.sshd.common.signature.Signature;
+import org.apache.sshd.common.util.buffer.BufferUtils;
+import org.apache.sshd.common.util.security.SecurityUtils;
+import org.apache.sshd.util.test.BaseTestSupport;
+import org.junit.Assume;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
+ * @see <A 
HREF="https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-02#section-6";>
+ * EdDSA and Ed25519 draft-josefsson-eddsa-ed25519-02 - section 6 - Test 
Vectors for Ed25519</A>
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@RunWith(Parameterized.class)   // see 
https://github.com/junit-team/junit/wiki/Parameterized-tests
+public class Ed25519VectorsTest extends BaseTestSupport {
+    private final byte[] prvBytes;
+    private final PrivateKey privateKey;
+    private final byte[] pubBytes;
+    private final PublicKey publicKey;
+    private final byte[] msgBytes;
+    private final byte[] expSignature;
+
+    public Ed25519VectorsTest(String name, String prvKey, String pubKey, 
String msg, String signature)
+            throws GeneralSecurityException {
+        prvBytes = BufferUtils.decodeHex(BufferUtils.EMPTY_HEX_SEPARATOR, 
prvKey);
+        privateKey = 
EdDSASecurityProvider.generateEDDSAPrivateKey(prvBytes.clone());
+        pubBytes = BufferUtils.decodeHex(BufferUtils.EMPTY_HEX_SEPARATOR, 
pubKey);
+        publicKey = 
EdDSASecurityProvider.generateEDDSAPublicKey(pubBytes.clone());
+        msgBytes = BufferUtils.decodeHex(BufferUtils.EMPTY_HEX_SEPARATOR, msg);
+        expSignature = BufferUtils.decodeHex(BufferUtils.EMPTY_HEX_SEPARATOR, 
signature);
+    }
+
+    @Parameters(name = "{0}")
+    @SuppressWarnings("checkstyle:anoninnerlength")
+    public static List<Object[]> parameters() {
+        return new ArrayList<Object[]>() {
+            // Not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                add(new Object[]{
+                    "TEST1 - empty message",
+                    
"9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60",
+                    
"d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a",
+                    "",
+                    "e5564300c360ac729086e2cc806e828a"
+                      + "84877f1eb8e5d974d873e06522490155"
+                      + "5fb8821590a33bacc61e39701cf9b46b"
+                      + "d25bf5f0595bbe24655141438e7a100b"
+                });
+                add(new Object[]{
+                    "TEST2 - one byte",
+                    
"4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb",
+                    
"3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c",
+                    "72",
+                    "92a009a9f0d4cab8720e820b5f642540"
+                      + "a2b27b5416503f8fb3762223ebdb69da"
+                      + "085ac1e43e15996e458f3613d0f11d8c"
+                      + "387b2eaeb4302aeeb00d291612bb0c00"
+                });
+                add(new Object[]{
+                    "TEST3 - 2 bytes",
+                    
"c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7",
+                    
"fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025",
+                    "af82",
+                    "6291d657deec24024827e69c3abe01a3"
+                      + "0ce548a284743a445e3680d7db5ac3ac"
+                      + "18ff9b538d16f290ae67f760984dc659"
+                      + "4a7c15e9716ed28dc027beceea1ec40a"
+                });
+                add(new Object[]{
+                    "TEST1024 - large message",
+                    
"f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5",
+                    
"278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e",
+                    "08b8b2b733424243760fe426a4b54908"
+                      + "632110a66c2f6591eabd3345e3e4eb98"
+                      + "fa6e264bf09efe12ee50f8f54e9f77b1"
+                      + "e355f6c50544e23fb1433ddf73be84d8"
+                      + "79de7c0046dc4996d9e773f4bc9efe57"
+                      + "38829adb26c81b37c93a1b270b20329d"
+                      + "658675fc6ea534e0810a4432826bf58c"
+                      + "941efb65d57a338bbd2e26640f89ffbc"
+                      + "1a858efcb8550ee3a5e1998bd177e93a"
+                      + "7363c344fe6b199ee5d02e82d522c4fe"
+                      + "ba15452f80288a821a579116ec6dad2b"
+                      + "3b310da903401aa62100ab5d1a36553e"
+                      + "06203b33890cc9b832f79ef80560ccb9"
+                      + "a39ce767967ed628c6ad573cb116dbef"
+                      + "efd75499da96bd68a8a97b928a8bbc10"
+                      + "3b6621fcde2beca1231d206be6cd9ec7"
+                      + "aff6f6c94fcd7204ed3455c68c83f4a4"
+                      + "1da4af2b74ef5c53f1d8ac70bdcb7ed1"
+                      + "85ce81bd84359d44254d95629e9855a9"
+                      + "4a7c1958d1f8ada5d0532ed8a5aa3fb2"
+                      + "d17ba70eb6248e594e1a2297acbbb39d"
+                      + "502f1a8c6eb6f1ce22b3de1a1f40cc24"
+                      + "554119a831a9aad6079cad88425de6bd"
+                      + "e1a9187ebb6092cf67bf2b13fd65f270"
+                      + "88d78b7e883c8759d2c4f5c65adb7553"
+                      + "878ad575f9fad878e80a0c9ba63bcbcc"
+                      + "2732e69485bbc9c90bfbd62481d9089b"
+                      + "eccf80cfe2df16a2cf65bd92dd597b07"
+                      + "07e0917af48bbb75fed413d238f5555a"
+                      + "7a569d80c3414a8d0859dc65a46128ba"
+                      + "b27af87a71314f318c782b23ebfe808b"
+                      + "82b0ce26401d2e22f04d83d1255dc51a"
+                      + "ddd3b75a2b1ae0784504df543af8969b"
+                      + "e3ea7082ff7fc9888c144da2af58429e"
+                      + "c96031dbcad3dad9af0dcbaaaf268cb8"
+                      + "fcffead94f3c7ca495e056a9b47acdb7"
+                      + "51fb73e666c6c655ade8297297d07ad1"
+                      + "ba5e43f1bca32301651339e22904cc8c"
+                      + "42f58c30c04aafdb038dda0847dd988d"
+                      + "cda6f3bfd15c4b4c4525004aa06eeff8"
+                      + "ca61783aacec57fb3d1f92b0fe2fd1a8"
+                      + "5f6724517b65e614ad6808d6f6ee34df"
+                      + "f7310fdc82aebfd904b01e1dc54b2927"
+                      + "094b2db68d6f903b68401adebf5a7e08"
+                      + "d78ff4ef5d63653a65040cf9bfd4aca7"
+                      + "984a74d37145986780fc0b16ac451649"
+                      + "de6188a7dbdf191f64b5fc5e2ab47b57"
+                      + "f7f7276cd419c17a3ca8e1b939ae49e4"
+                      + "88acba6b965610b5480109c8b17b80e1"
+                      + "b7b750dfc7598d5d5011fd2dcc5600a3"
+                      + "2ef5b52a1ecc820e308aa342721aac09"
+                      + "43bf6686b64b2579376504ccc493d97e"
+                      + "6aed3fb0f9cd71a43dd497f01f17c0e2"
+                      + "cb3797aa2a2f256656168e6c496afc5f"
+                      + "b93246f6b1116398a346f1a641f3b041"
+                      + "e989f7914f90cc2c7fff357876e506b5"
+                      + "0d334ba77c225bc307ba537152f3f161"
+                      + "0e4eafe595f6d9d90d11faa933a15ef1"
+                      + "369546868a7f3a45a96768d40fd9d034"
+                      + "12c091c6315cf4fde7cb68606937380d"
+                      + "b2eaaa707b4c4185c32eddcdd306705e"
+                      + "4dc1ffc872eeee475a64dfac86aba41c"
+                      + "0618983f8741c5ef68d3a101e8a3b8ca"
+                      + "c60c905c15fc910840b94c00a0b9d0",
+                    "0aab4c900501b3e24d7cdf4663326a3a"
+                      + "87df5e4843b2cbdb67cbf6e460fec350"
+                      + "aa5371b1508f9f4528ecea23c436d94b"
+                      + "5e8fcd4f681e30a6ac00a9704a188a03"
+                });
+            }
+        };
+    }
+
+    @BeforeClass
+    public static void checkEDDSASupported() {
+        Assume.assumeTrue("EDDSA N/A", SecurityUtils.isEDDSACurveSupported());
+    }
+
+    @Test
+    public void testPublicKeyBytes() {
+        byte[] publicSeed = 
Ed25519PublicKeyDecoder.getSeedValue((EdDSAPublicKey) publicKey);
+        assertArrayEquals("Mismatched public seed value", pubBytes, 
publicSeed);
+    }
+
+    @Test
+    public void testPrivateKeyBytes() {
+        assertArrayEquals("Mismatched private seed value", prvBytes, 
((EdDSAPrivateKey) privateKey).getSeed());
+    }
+
+    @Test
+    public void testSignature() throws Exception {
+        Signature signer = EdDSASecurityProvider.getEDDSASignature();
+        signer.initSigner(privateKey);
+        signer.update(msgBytes);
+
+        byte[] actSignature = signer.sign();
+        assertArrayEquals("Mismatched signature", expSignature, actSignature);
+
+        Signature verifier = EdDSASecurityProvider.getEDDSASignature();
+        verifier.initVerifier(publicKey);
+        verifier.update(msgBytes);
+        assertTrue("Verification failed", verifier.verify(expSignature));
+    }
+}

Reply via email to