- started implementing new crypto

- $-expansion and XDG in config

4 files changed, 84 insertions, 82 deletions

diff --git a/src/test/java/org/gnunet/mesh/MeshTest.java b/src/test/java/org/gnunet/mesh/MeshTest.java
index f8694de..a89bd63 100644
--- a/src/test/java/org/gnunet/mesh/MeshTest.java
+++ b/src/test/java/org/gnunet/mesh/MeshTest.java
@@ -31,7 +31,7 @@ public class MeshTest extends TestingFixture {
         final Configuration cfg = ts.getConfiguration();
 
         final MessageHandler1 mh = new MessageHandler1();
-        // FIXME: use CryptoECC instead of Core once available and compatible
+        // FIXME: use CryptoEcc instead of Core once available and compatible
         Core.withPeerIdentity(cfg, new PeerIdentityContinuation() {
             @Override
             public void cont(PeerIdentity peerIdentity) {
diff --git a/src/test/java/org/gnunet/util/ConfigDollarTest.java b/src/test/java/org/gnunet/util/ConfigDollarTest.java
new file mode 100644
index 0000000..31a30fa
--- /dev/null
+++ b/src/test/java/org/gnunet/util/ConfigDollarTest.java
@@ -0,0 +1,44 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util;
+
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ConfigDollarTest {
+
+    @Test
+    public void test_dollar() {
+        Configuration cfg = new Configuration();
+        cfg.setValueString("PATHS", "FOO", "/bin/true");
+        Assert.assertEquals("hello, world!", cfg.expandDollar("hello, world!"));
+        Assert.assertEquals("", cfg.expandDollar("${}"));
+        Assert.assertEquals("/bin/true", cfg.expandDollar("${FOO}"));
+        Assert.assertEquals("/bin/true/gnu", cfg.expandDollar("${FOO}/gnu"));
+        Assert.assertEquals("/bin/true/gnu", cfg.expandDollar("$FOO/gnu"));
+        Assert.assertEquals("/bin/true", cfg.expandDollar("${BLUB:-/bin}/true"));
+        Assert.assertEquals("/bin/true/gnu", cfg.expandDollar("${BLUB:-${FOO}}/gnu"));
+        Assert.assertEquals("", cfg.expandDollar("${{{}}"));
+        Assert.assertEquals("/bin/true", cfg.expandDollar("${XXX:-${XXX:-${XXX:-/bin}}}/true"));
+        Assert.assertEquals("/bincd/true", cfg.expandDollar("${XXX:-${XXX:-${XXX:-/bin}c}d}/true"));
+    }
+}
diff --git a/src/test/java/org/gnunet/util/CryptoECCTest.java b/src/test/java/org/gnunet/util/CryptoECCTest.java
deleted file mode 100644
index 1dda545..0000000
--- a/src/test/java/org/gnunet/util/CryptoECCTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.gnunet.util;
-
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Random;
-
-public class CryptoECCTest {
-    /**
-     * Check that signed messages can be verified correctly.
-     */
-    @Test
-    public void test_sign_success() {
-        Random r = new Random();
-        // the test uses random data, repeat it multiple times!
-        for (int i = 0; i < 5; i++) {
-            byte[] msg = new byte[16];
-            r.nextBytes(msg);
-
-            CryptoECC.PrivateKey privateKey = new CryptoECC.PrivateKey();
-            privateKey.d = new byte[32];
-            r.nextBytes(privateKey.d);
-            CryptoECC.PublicSignKey publicKey = CryptoECC.computePublicKey(privateKey);
-            System.out.println("gen");
-            CryptoECC.Signature sig = CryptoECC.sign(msg, privateKey, publicKey);
-            System.out.println("sign");
-            boolean valid = CryptoECC.verify(sig, msg, publicKey);
-            System.out.println("verify");
-            Assert.assertTrue(valid);
-        }
-    }
-
-    /**
-     * Check that signature verification fails for manipulated data.
-     */
-    @Test
-    public void test_sign_failure() {
-        Random r = new Random();
-        // the test uses random data, repeat it multiple times!
-        for (int i = 0; i < 5; i++) {
-            byte[] msg = new byte[16];
-            r.nextBytes(msg);
-            CryptoECC.PrivateKey privateKey = new CryptoECC.PrivateKey();
-            privateKey.d = new byte[32];
-            r.nextBytes(privateKey.d);
-            CryptoECC.PublicSignKey publicKey = CryptoECC.computePublicKey(privateKey);
-            System.out.println("gen");
-            CryptoECC.Signature sig = CryptoECC.sign(msg, privateKey, publicKey);
-            System.out.println("sign");
-            // corrupt the message
-            msg[0] = (byte) (msg[0] + 1);
-            boolean valid = CryptoECC.verify(sig, msg, publicKey);
-            System.out.println("verify");
-            Assert.assertFalse(valid);
-        }
-    }
-
-    /**
-     * Check whether ecdh key coincide
-     */
-    @Test
-    public void test_ecdh() {
-        Random r = new Random();
-
-        CryptoECC.PrivateKey privateAlice = new CryptoECC.PrivateKey();
-        privateAlice.d = new byte[32];
-        r.nextBytes(privateAlice.d);
-        CryptoECC.PublicSignKey publicAlice = CryptoECC.computePublicKey(privateAlice);
-
-        CryptoECC.PrivateKey privateBob = new CryptoECC.PrivateKey();
-        privateBob.d = new byte[32];
-        r.nextBytes(privateBob.d);
-        CryptoECC.PublicSignKey publicBob = CryptoECC.computePublicKey(privateBob);
-
-        HashCode ssAlice = CryptoECC.ecdh(privateAlice, publicBob);
-        HashCode ssBob = CryptoECC.ecdh(privateBob, publicAlice);
-
-        Assert.assertArrayEquals(ssAlice.data, ssBob.data);
-    }
-}
diff --git a/src/test/java/org/gnunet/util/EddsaTest.java b/src/test/java/org/gnunet/util/EddsaTest.java
new file mode 100644
index 0000000..302751b
--- /dev/null
+++ b/src/test/java/org/gnunet/util/EddsaTest.java
@@ -0,0 +1,39 @@
+/*
+ This file is part of GNUnet.
+  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published
+  by the Free Software Foundation; either version 3, or (at your
+  option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNUnet; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  Boston, MA 02111-1307, USA.
+ */
+
+package org.gnunet.util;
+
+
+import org.gnunet.util.crypto.EddsaPrivateKey;
+import org.gnunet.util.crypto.EddsaPublicKey;
+import org.gnunet.util.crypto.EddsaSignature;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class EddsaTest {
+    @Test
+    public void test_eddsa_sign_success() {
+        byte[] data = "foo".getBytes();
+        EddsaPrivateKey privateKey = EddsaPrivateKey.createRandom();
+        EddsaPublicKey publicKey = privateKey.getPublicKey();
+        EddsaSignature signature = privateKey.sign(publicKey, 0, data);
+        Assert.assertTrue(signature.verify(data, 0, publicKey));
+    }
+}