- support mesh's new NACK message

- remove 
- python test skeleton for voting
- encrypted votes
- establish threshold key during ballot registration
- ballot tool can request threshold public keys from authorities

8 files changed, 149 insertions, 7 deletions

diff --git a/src/main/java/org/gnunet/voting/messages/KeyQueryFailureMessage.java b/src/main/java/org/gnunet/voting/messages/KeyQueryFailureMessage.java
new file mode 100644
index 0000000..ae48bad
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/KeyQueryFailureMessage.java
@@ -0,0 +1,11 @@
+package org.gnunet.voting.messages;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42015)
+public class KeyQueryFailureMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String reason;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/KeyQueryMessage.java b/src/main/java/org/gnunet/voting/messages/KeyQueryMessage.java
new file mode 100644
index 0000000..37da763
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/KeyQueryMessage.java
@@ -0,0 +1,12 @@
+package org.gnunet.voting.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+@UnionCase(42013)
+public class KeyQueryMessage implements GnunetMessage.Body {
+    @NestedMessage
+    public HashCode ballotGuid;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/KeyQueryResponseMessage.java b/src/main/java/org/gnunet/voting/messages/KeyQueryResponseMessage.java
new file mode 100644
index 0000000..c94332a
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/KeyQueryResponseMessage.java
@@ -0,0 +1,51 @@
+/*
+ This file is part of GNUnet.
+ (C) 2014 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.voting.messages;
+
+import org.gnunet.construct.Message;
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.secretsharing.ThresholdPublicKey;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+import org.gnunet.util.crypto.EddsaSignature;
+
+@UnionCase(42014)
+public class KeyQueryResponseMessage implements GnunetMessage.Body {
+
+    public static class BallotPublicKey implements Message {
+        @NestedMessage
+        public HashCode ballotGuid;
+
+        @NestedMessage
+        public ThresholdPublicKey publicKey;
+    }
+
+    @NestedMessage
+    public EddsaSignature signature;
+
+    @UInt32
+    public int purpose;
+
+    @NestedMessage
+    public BallotPublicKey signedGuidKey;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/ResultQueryFailureMessage.java b/src/main/java/org/gnunet/voting/messages/ResultQueryFailureMessage.java
new file mode 100644
index 0000000..9b9ef49
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/ResultQueryFailureMessage.java
@@ -0,0 +1,31 @@
+/*
+ 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.voting.messages;
+
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42009)
+public class ResultQueryFailureMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String reason;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/ResultQueryMessage.java b/src/main/java/org/gnunet/voting/messages/ResultQueryMessage.java
new file mode 100644
index 0000000..13f0b04
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/ResultQueryMessage.java
@@ -0,0 +1,12 @@
+package org.gnunet.voting.messages;
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+@UnionCase(42005)
+public class ResultQueryMessage implements GnunetMessage.Body {
+    @NestedMessage
+    public HashCode ballotGuid;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/ResultQueryResponseMessage.java b/src/main/java/org/gnunet/voting/messages/ResultQueryResponseMessage.java
new file mode 100644
index 0000000..96ad4b5
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/ResultQueryResponseMessage.java
@@ -0,0 +1,12 @@
+package org.gnunet.voting.messages;
+
+
+import org.gnunet.construct.*;
+import org.gnunet.util.GnunetMessage;
+import org.gnunet.util.HashCode;
+
+@UnionCase(42006)
+public class ResultQueryResponseMessage implements GnunetMessage.Body {
+    @IntegerFill(signed = false, bitSize = 32)
+    public long[] results;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
index 50751fb..9aec8b2 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
@@ -22,17 +22,27 @@ package org.gnunet.voting.messages;
 
 
 import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.construct.ZeroTerminatedString;
 import org.gnunet.util.AbsoluteTimeMessage;
 import org.gnunet.util.GnunetMessage;
-import org.gnunet.util.crypto.EcdsaSignedMessage;
-import org.gnunet.util.crypto.EddsaSignedMessage;
+import org.gnunet.util.crypto.EddsaSignature;
 
 @UnionCase(42010)
 public class SubmitFailureMessage implements GnunetMessage.Body {
+    public static class SignedAuthorityTime {
+        @NestedMessage
+        public EddsaSignature signature;
+        @UInt32
+        public int purpose;
+        @NestedMessage
+        public AbsoluteTimeMessage time;
+    }
+
     @ZeroTerminatedString
     public String reason;
+
     @NestedMessage(optional = true)
-    public EddsaSignedMessage<AbsoluteTimeMessage> authorityTime;
+    public SignedAuthorityTime signedAuthorityTime;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
index 52bf894..342aa0b 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
@@ -7,6 +7,7 @@ import org.gnunet.util.*;
 import org.gnunet.util.crypto.EcdsaPublicKey;
 import org.gnunet.util.crypto.EcdsaSignature;
 import org.gnunet.util.crypto.EddsaSignature;
+import org.gnunet.voting.EncryptedVote;
 
 /**
  * Message send by the voter to the election authority to submit a vote.
@@ -33,10 +34,12 @@ public class SubmitMessage implements GnunetMessage.Body {
      */
     @NestedMessage
     public AbsoluteTimeMessage groupCertExpiration;
+
     /**
-     * The actual vote.
-     * FIXME: this will be encrypted!
+     * The encrypted vote, including zero knowledge proofs
+     * for correctness.
+     * FIXME: wrap in a signature container
      */
-    @UInt32
-    public int choiceId;
+    @NestedMessage
+    public EncryptedVote encryptedVote;
 }