- started implementing new crypto

- $-expansion and XDG in config

7 files changed, 8 insertions, 84 deletions

diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java
index ecce92d..8986970 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterFailureMessage.java
@@ -20,10 +20,8 @@
 
 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;
 
 
diff --git a/src/main/java/org/gnunet/voting/messages/BallotRegisterSuccessMessage.java b/src/main/java/org/gnunet/voting/messages/BallotRegisterSuccessMessage.java
index 8ce007b..040c9b3 100644
--- a/src/main/java/org/gnunet/voting/messages/BallotRegisterSuccessMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/BallotRegisterSuccessMessage.java
@@ -2,8 +2,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;
+import org.gnunet.util.crypto.EddsaSignature;
 
 
 /**
@@ -12,5 +12,5 @@ import org.gnunet.util.GnunetMessage;
 @UnionCase(42012)
 public class BallotRegisterSuccessMessage implements GnunetMessage.Body {
     @NestedMessage
-    public CryptoECC.Signature registrationSignature;
+    public EddsaSignature registrationSignature;
 }
diff --git a/src/main/java/org/gnunet/voting/messages/CertificateDenyMessage.java b/src/main/java/org/gnunet/voting/messages/CertificateDenyMessage.java
deleted file mode 100644
index aefd6ab..0000000
--- a/src/main/java/org/gnunet/voting/messages/CertificateDenyMessage.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- 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
deleted file mode 100644
index f209b7a..0000000
--- a/src/main/java/org/gnunet/voting/messages/CertificateGrantMessage.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 1b4514e..0000000
--- a/src/main/java/org/gnunet/voting/messages/CertificateRequestMessage.java
+++ /dev/null
@@ -1,23 +0,0 @@
-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;
-
-/**
- * Request a certificate that allows a voter to submit a ballot.
- * Sent by the voter to the certificate authority.
- */
-@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/SubmitMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
index 1b71d3e..a47abfa 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitMessage.java
@@ -4,6 +4,8 @@ import org.gnunet.construct.NestedMessage;
 import org.gnunet.construct.UInt32;
 import org.gnunet.construct.UnionCase;
 import org.gnunet.util.*;
+import org.gnunet.util.crypto.EcdsaPublicKey;
+import org.gnunet.util.crypto.EddsaSignature;
 
 /**
  * Message send by the voter to the election authority to submit a vote.
@@ -19,12 +21,12 @@ public class SubmitMessage implements GnunetMessage.Body {
      * Public key of the voter.
      */
     @NestedMessage
-    public CryptoECC.PublicSignKey voterPub;
+    public EcdsaPublicKey voterPub;
     /**
      * Group certificate of the voter.
      */
     @NestedMessage
-    public CryptoECC.Signature groupCert;
+    public EddsaSignature groupCert;
     /**
      * Expiration time of the group certificate, checked by the authority.
      */
diff --git a/src/main/java/org/gnunet/voting/messages/SubmitSuccessMessage.java b/src/main/java/org/gnunet/voting/messages/SubmitSuccessMessage.java
index 0c0e9e1..9e28b96 100644
--- a/src/main/java/org/gnunet/voting/messages/SubmitSuccessMessage.java
+++ b/src/main/java/org/gnunet/voting/messages/SubmitSuccessMessage.java
@@ -3,11 +3,11 @@ 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;
+import org.gnunet.util.crypto.EddsaSignature;
 
 @UnionCase(42008)
 public class SubmitSuccessMessage implements GnunetMessage.Body {
     @NestedMessage
-    public CryptoECC.Signature voucherSig;
+    public EddsaSignature confirmationSig;
 }