- identity service implemented

- started with arm implementation
- removed locking from scheduler
- separated TaskConfiguration and TaskIdentifier
- implemented proper message stream tokenizer
- work on voting

12 files changed, 181 insertions, 23 deletions

diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java
new file mode 100644
index 0000000..ecce92d
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java
@@ -0,0 +1,37 @@
+/*
+ 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.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.CryptoECC;
+import org.gnunet.util.GnunetMessage;
+
+
+/**
+ * Response from the authorities to the issuer.
+ */
+@UnionCase(42002)
+public class BallotRegisterFailureMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String reason;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
index 95a7c2f..6dc731f 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterRequestMessage.java
@@ -4,6 +4,9 @@ import org.gnunet.construct.IntegerFill;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.util.GnunetMessage;
 
+/**
+ * Sent by an issuer to the authorities to register a ballot with them.
+ */
 @UnionCase(42001)
 public class BallotRegisterRequestMessage implements GnunetMessage.Body {
     @IntegerFill(signed = false, bitSize = 8)
diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterSuccessMessage.java
index f30f624..8ce007b 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterRespondMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterSuccessMessage.java
@@ -5,8 +5,12 @@ import org.gnunet.construct.UnionCase;
 import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
 
-@UnionCase(42002)
-public class BallotRegisterRespondMessage implements GnunetMessage.Body {
+
+/**
+ * Response from the authorities to the issuer.
+ */
+@UnionCase(42012)
+public class BallotRegisterSuccessMessage implements GnunetMessage.Body {
     @NestedMessage
     public CryptoECC.Signature registrationSignature;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateDenyMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateDenyMessage.java
new file mode 100644
index 0000000..aefd6ab
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/CertificateDenyMessage.java
@@ -0,0 +1,34 @@
+/*
+ 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.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
+import org.gnunet.util.CryptoECC;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42011)
+public class CertificateDenyMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String reason;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateGrantMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateGrantMessage.java
new file mode 100644
index 0000000..f209b7a
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/CertificateGrantMessage.java
@@ -0,0 +1,19 @@
+package org.gnunet.voting.messages;
+
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UInt32;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.AbsoluteTime;
+import org.gnunet.util.AbsoluteTimeMessage;
+import org.gnunet.util.CryptoECC;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42004)
+public class CertificateGrantMessage implements GnunetMessage.Body {
+    @NestedMessage
+    public CryptoECC.Signature groupCertificate;
+    @NestedMessage
+    public AbsoluteTimeMessage expiration;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
index e57b215..1b4514e 100644
--- a/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
@@ -1,6 +1,8 @@
 package org.gnunet.voting.messages;
 
+import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UnionCase;
+import org.gnunet.util.CryptoECC;
 import org.gnunet.util.GnunetMessage;
 
 /**
@@ -9,4 +11,13 @@ import org.gnunet.util.GnunetMessage;
  */
 @UnionCase(42003)
 public class CertificateRequestMessage implements GnunetMessage.Body {
+    /**
+     * Public Key of the voter that requests group certification.
+     */
+    @NestedMessage
+    public CryptoECC.PublicSignKey publicKey;
+    /**
+     * Group that the voter wants to be certified for.
+     */
+    public String group;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java
deleted file mode 100644
index 4a1bcd6..0000000
--- a/src/main/java/org/gnunet/voting/messages/CertificateResponseMessage.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.gnunet.voting.messages;
-
-
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-
-@UnionCase(42004)
-public class CertificateResponseMessage implements GnunetMessage.Body {
-}
diff --git a/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java b/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java
index 73f8fc8..8f525e0 100644
--- a/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/QueryFailureMessage.java
@@ -21,8 +21,11 @@
 package org.gnunet.voting.messages;
 
 import org.gnunet.construct.UnionCase;
+import org.gnunet.construct.ZeroTerminatedString;
 import org.gnunet.util.GnunetMessage;
 
 @UnionCase(42009)
 public class QueryFailureMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String reason;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
new file mode 100644
index 0000000..6e5a345
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/SubmitFailureMessage.java
@@ -0,0 +1,32 @@
+/*
+ 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(42010)
+public class SubmitFailureMessage implements GnunetMessage.Body {
+    @ZeroTerminatedString
+    public String reason;
+}
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
index afd54b9..1b71d3e 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
@@ -3,17 +3,37 @@ 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.GnunetMessage;
-import org.gnunet.util.HashCode;
+import org.gnunet.util.*;
 
 /**
  * Message send by the voter to the election authority to submit a vote.
  */
 @UnionCase(42007)
 public class SubmitMessage implements GnunetMessage.Body {
+    /**
+     * Identifier of the ballot we want to vote in.
+     */
     @NestedMessage
     public HashCode ballotGuid;
+    /**
+     * Public key of the voter.
+     */
+    @NestedMessage
+    public CryptoECC.PublicSignKey voterPub;
+    /**
+     * Group certificate of the voter.
+     */
+    @NestedMessage
+    public CryptoECC.Signature groupCert;
+    /**
+     * Expiration time of the group certificate, checked by the authority.
+     */
+    @NestedMessage
+    public AbsoluteTimeMessage groupCertExpiration;
+    /**
+     * The actual vote.
+     * FIXME: this will be encrypted!
+     */
     @UInt32
     public int choiceId;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java
deleted file mode 100644
index 956ecf2..0000000
--- a/src/main/java/org/gnunet/voting/messages/SubmitResponseMessage.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.gnunet.voting.messages;
-
-
-import org.gnunet.construct.UnionCase;
-import org.gnunet.util.GnunetMessage;
-
-@UnionCase(42008)
-public class SubmitResponseMessage implements GnunetMessage.Body {
-}
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitSuccessMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitSuccessMessage.java
new file mode 100644
index 0000000..0c0e9e1
--- /dev/null
+++ b/src/main/java/org/gnunet/voting/messages/SubmitSuccessMessage.java
@@ -0,0 +1,13 @@
+package org.gnunet.voting.messages;
+
+
+import org.gnunet.construct.NestedMessage;
+import org.gnunet.construct.UnionCase;
+import org.gnunet.util.CryptoECC;
+import org.gnunet.util.GnunetMessage;
+
+@UnionCase(42008)
+public class SubmitSuccessMessage implements GnunetMessage.Body {
+    @NestedMessage
+    public CryptoECC.Signature voucherSig;
+}