- automatic test for voting

- signed messages

5 files changed, 156 insertions, 2 deletions

diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java b/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
index dca60b2..43bd55a 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
@@ -23,7 +23,17 @@ public class EcdsaPrivateKey implements Message {
     }
 
     public EcdsaPublicKey getPublicKey() {
-        return EcdsaPublicKey.random();
+        // FIXME: this is not the real implementation,
+        // beware that this dummy implementation leaks the key!
+        EcdsaPublicKey publicKey = new EcdsaPublicKey();
+        byte[] v = new byte[32];
+        System.arraycopy(d, 0, v, 0, 8);
+        System.arraycopy(d, 0, v, 8, 8);
+        System.arraycopy(d, 0, v, 16, 8);
+        System.arraycopy(d, 0, v, 24, 8);
+        System.arraycopy(v, 0, publicKey.x, 0, 32);
+        System.arraycopy(v, 0, publicKey.y, 0, 32);
+        return publicKey;
     }
 
     public static EcdsaPrivateKey createRandom() {
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java b/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
index 1589b67..b668a3f 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
@@ -48,7 +48,7 @@ public class EcdsaSignature implements Message {
         this.s = new byte[32];
     }
 
-    public boolean verify(byte[] m, int purpose, EddsaPublicKey publicKey) {
+    public boolean verify(byte[] m, int purpose, EcdsaPublicKey publicKey) {
         return false;
     }
 
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java b/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
new file mode 100644
index 0000000..0cb293a
--- /dev/null
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
@@ -0,0 +1,60 @@
+/*
+ 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.crypto;
+
+import org.gnunet.construct.Construct;
+import org.gnunet.construct.Message;
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+
+/**
+ * A message together with a signature on the message and it's purpose.
+ */
+public class EcdsaSignedMessage<M extends Message> implements Message {
+    @NestedMessage
+    public EcdsaSignature signature;
+    @UInt32
+    public int purpose;
+    @NestedMessage
+    public M innerMessage;
+
+    public EcdsaSignedMessage() {
+        // empty constructor required by org.gnunet.construct
+    }
+
+    public boolean verify(EcdsaPublicKey signerPublicKey) {
+        return signature.verify(Construct.toBinary(innerMessage), purpose, signerPublicKey);
+    }
+
+    public static <T extends Message> EcdsaSignedMessage<T> signMessage(T innerMessage, int purpose,
+                                             EcdsaPrivateKey privateKey, EcdsaPublicKey publicKey) {
+        EcdsaSignedMessage<T> esm = new EcdsaSignedMessage<T>();
+        esm.purpose = purpose;
+        esm.innerMessage = innerMessage;
+        esm.signature = privateKey.sign(purpose, Construct.toBinary(innerMessage));
+        return esm;
+    }
+
+    public static <T extends Message> EcdsaSignedMessage<T> signMessage(T innerMessage, int purpose,
+                                             EcdsaPrivateKey privateKey) {
+        return signMessage(innerMessage, purpose, privateKey, privateKey.getPublicKey());
+    }
+}
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java b/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
index 973706f..21aa647 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
@@ -13,6 +13,10 @@ public class EddsaPrivateKey implements Message {
     @FixedSizeIntegerArray(bitSize = 8, signed = false, length = 32)
     public byte[] d;
 
+    public EddsaSignature sign(int purpose, byte[] m) {
+        return sign(getPublicKey(), purpose, m);
+    }
+
     public EddsaSignature sign(EddsaPublicKey publicKey, int purpose, byte[] m) {
         MessageDigest sha512;
         try {
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java b/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
new file mode 100644
index 0000000..27f969a
--- /dev/null
+++ b/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
@@ -0,0 +1,80 @@
+/*
+ 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.
+ */
+
+/*
+ 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.crypto;
+
+import org.gnunet.construct.Construct;
+import org.gnunet.construct.Message;
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+
+/**
+ * A message together with a signature on the message and it's purpose.
+ */
+public class EddsaSignedMessage<M extends Message> implements Message {
+    @NestedMessage
+    public EddsaSignature signature;
+    @UInt32
+    public int purpose;
+    @NestedMessage
+    public M innerMessage;
+
+    public EddsaSignedMessage() {
+        // empty constructor required by org.gnunet.construct
+    }
+
+    public boolean verify(EddsaPublicKey signerPublicKey) {
+        return signature.verify(Construct.toBinary(innerMessage), purpose, signerPublicKey);
+    }
+
+    public static <T extends Message> EddsaSignedMessage<T> signMessage(T innerMessage, int purpose,
+                                             EddsaPrivateKey privateKey, EddsaPublicKey publicKey) {
+        EddsaSignedMessage<T> esm = new EddsaSignedMessage<T>();
+        esm.purpose = purpose;
+        esm.innerMessage = innerMessage;
+        esm.signature = privateKey.sign(publicKey, purpose, Construct.toBinary(innerMessage));
+        return esm;
+    }
+
+    public static <T extends Message> EddsaSignedMessage<T> signMessage(T innerMessage, int purpose,
+                                             EddsaPrivateKey privateKey) {
+        return signMessage(innerMessage, purpose, privateKey, privateKey.getPublicKey());
+    }
+}