[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32836 - in gnunet-java: . src/main/java/org/gnunet/arm src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r32836 - in gnunet-java: . src/main/java/org/gnunet/arm src/main/java/org/gnunet/consensus src/main/java/org/gnunet/core src/main/java/org/gnunet/dht src/main/java/org/gnunet/gns src/main/java/org/gnunet/gns/records src/main/java/org/gnunet/identity src/main/java/org/gnunet/mq src/main/java/org/gnunet/peerinfo src/main/java/org/gnunet/secretsharing src/main/java/org/gnunet/statistics src/main/java/org/gnunet/testbed src/main/java/org/gnunet/transport src/main/java/org/gnunet/util/crypto src/main/java/org/gnunet/voting src/test/java/org/gnunet/consensus src/test/java/org/gnunet/secretsharing src/test/java/org/gnunet/transport src/test/java/org/gnunet/util src/test/java/org/gnunet/voting |
|
Date: |
Mon, 31 Mar 2014 02:16:22 +0200 |
Author: dold
Date: 2014-03-31 02:16:22 +0200 (Mon, 31 Mar 2014)
New Revision: 32836
Added:
gnunet-java/src/main/java/org/gnunet/arm/package-info.java
gnunet-java/src/main/java/org/gnunet/consensus/package-info.java
gnunet-java/src/main/java/org/gnunet/gns/package-info.java
gnunet-java/src/main/java/org/gnunet/gns/records/package-info.java
gnunet-java/src/main/java/org/gnunet/identity/package-info.java
gnunet-java/src/main/java/org/gnunet/mq/package-info.java
gnunet-java/src/main/java/org/gnunet/secretsharing/DecryptCallback.java
gnunet-java/src/main/java/org/gnunet/secretsharing/SecretReadyCallback.java
gnunet-java/src/main/java/org/gnunet/secretsharing/package-info.java
gnunet-java/src/main/java/org/gnunet/testbed/ControllerStatusCallback.java
gnunet-java/src/main/java/org/gnunet/testbed/HostRegistrationCompletion.java
gnunet-java/src/main/java/org/gnunet/testbed/OperationCompletionCallback.java
gnunet-java/src/main/java/org/gnunet/testbed/PeerChurnCallback.java
gnunet-java/src/main/java/org/gnunet/testbed/PeerCreateCallback.java
gnunet-java/src/main/java/org/gnunet/testbed/PeerInformationCallback.java
gnunet-java/src/main/java/org/gnunet/testbed/ServiceAdapter.java
gnunet-java/src/main/java/org/gnunet/testbed/package-info.java
gnunet-java/src/main/java/org/gnunet/transport/BlacklistCallback.java
gnunet-java/src/main/java/org/gnunet/transport/HelloUpdateCallback.java
gnunet-java/src/main/java/org/gnunet/transport/OfferHelloContinuation.java
gnunet-java/src/main/java/org/gnunet/transport/PeerAddressListCallback.java
gnunet-java/src/main/java/org/gnunet/transport/PeerAddressMonitorCallback.java
gnunet-java/src/main/java/org/gnunet/transport/PeerIterateCallback.java
gnunet-java/src/main/java/org/gnunet/transport/TryConnectCallback.java
gnunet-java/src/main/java/org/gnunet/transport/package-info.java
gnunet-java/src/main/java/org/gnunet/util/crypto/package-info.java
gnunet-java/src/main/java/org/gnunet/voting/CryptoUtil.java
gnunet-java/src/main/java/org/gnunet/voting/VotingParameters.java
gnunet-java/src/main/java/org/gnunet/voting/package-info.java
Removed:
gnunet-java/src/main/java/org/gnunet/gns/callbacks/
gnunet-java/src/main/java/org/gnunet/secretsharing/callbacks/
gnunet-java/src/main/java/org/gnunet/testbed/SimpleTestbed.java
gnunet-java/src/main/java/org/gnunet/testbed/callbacks/
gnunet-java/src/main/java/org/gnunet/transport/callbacks/
gnunet-java/src/main/java/org/gnunet/voting/simulation/
Modified:
gnunet-java/build.gradle
gnunet-java/src/main/java/org/gnunet/core/package-info.java
gnunet-java/src/main/java/org/gnunet/dht/package-info.java
gnunet-java/src/main/java/org/gnunet/gns/Gns.java
gnunet-java/src/main/java/org/gnunet/gns/GnsTool.java
gnunet-java/src/main/java/org/gnunet/peerinfo/PeerInfo.java
gnunet-java/src/main/java/org/gnunet/secretsharing/Decryption.java
gnunet-java/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
gnunet-java/src/main/java/org/gnunet/secretsharing/Parameters.java
gnunet-java/src/main/java/org/gnunet/statistics/StatisticsTool.java
gnunet-java/src/main/java/org/gnunet/statistics/package-info.java
gnunet-java/src/main/java/org/gnunet/testbed/Controller.java
gnunet-java/src/main/java/org/gnunet/testbed/ControllerProc.java
gnunet-java/src/main/java/org/gnunet/transport/AddressQuery.java
gnunet-java/src/main/java/org/gnunet/transport/Blacklist.java
gnunet-java/src/main/java/org/gnunet/transport/Transport.java
gnunet-java/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
gnunet-java/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
gnunet-java/src/main/java/org/gnunet/voting/Ballot.java
gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java
gnunet-java/src/main/java/org/gnunet/voting/DisjunctionZkp.java
gnunet-java/src/main/java/org/gnunet/voting/EncryptedVote.java
gnunet-java/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
gnunet-java/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
gnunet-java/src/test/java/org/gnunet/secretsharing/SecretsharingTest.java
gnunet-java/src/test/java/org/gnunet/transport/TransportTest.java
gnunet-java/src/test/java/org/gnunet/util/HighLevelCryptoTest.java
gnunet-java/src/test/java/org/gnunet/util/StringsTest.java
gnunet-java/src/test/java/org/gnunet/voting/TestVotingCrypto.java
Log:
doc fixes
Modified: gnunet-java/build.gradle
===================================================================
--- gnunet-java/build.gradle 2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/build.gradle 2014-03-31 00:16:22 UTC (rev 32836)
@@ -126,3 +126,6 @@
}
}
}
+
+
+javadoc.exclude '**/messages/**'
Copied: gnunet-java/src/main/java/org/gnunet/arm/package-info.java (from rev
32833, gnunet-java/src/main/java/org/gnunet/mesh/package-info.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/arm/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/arm/package-info.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 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.
+ */
+
+
+/**
+ * Start, stop and monitor services (unfinished).
+ */
+package org.gnunet.arm;
Copied: gnunet-java/src/main/java/org/gnunet/consensus/package-info.java (from
rev 32831, gnunet-java/src/main/java/org/gnunet/testing/package-info.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/consensus/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/consensus/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ 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.
+ */
+
+
+/**
+ * Multi-peer set reconciliation.
+ */
+package org.gnunet.consensus;
Modified: gnunet-java/src/main/java/org/gnunet/core/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/core/package-info.java 2014-03-30
23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/core/package-info.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -19,6 +19,6 @@
*/
/**
- * API for the gnunet core service.
+ * API for the GNUnet CORE service.
*/
package org.gnunet.core;
Modified: gnunet-java/src/main/java/org/gnunet/dht/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/dht/package-info.java 2014-03-30
23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/dht/package-info.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -19,6 +19,6 @@
*/
/**
- * API for the gnunet dht service.
+ * Distributed hash table.
*/
package org.gnunet.dht;
Modified: gnunet-java/src/main/java/org/gnunet/gns/Gns.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/gns/Gns.java 2014-03-30 23:25:27 UTC
(rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/gns/Gns.java 2014-03-31 00:16:22 UTC
(rev 32836)
@@ -20,7 +20,6 @@
package org.gnunet.gns;
-import org.gnunet.gns.callbacks.LookupResultProcessor;
import org.gnunet.gns.messages.ClientLookupMessage;
import org.gnunet.gns.messages.ClientLookupResultMessage;
import org.gnunet.requests.FixedMessageRequest;
Modified: gnunet-java/src/main/java/org/gnunet/gns/GnsTool.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/gns/GnsTool.java 2014-03-30
23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/gns/GnsTool.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -1,7 +1,6 @@
package org.gnunet.gns;
-import org.gnunet.gns.callbacks.LookupResultProcessor;
import org.gnunet.identity.Identity;
import org.gnunet.identity.IdentityCallback;
import org.gnunet.util.Program;
Added: gnunet-java/src/main/java/org/gnunet/gns/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/gns/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/gns/package-info.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ 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.
+ */
+
+
+/**
+ * GNU Name Service.
+ */
+package org.gnunet.gns;
Copied: gnunet-java/src/main/java/org/gnunet/gns/records/package-info.java
(from rev 32831, gnunet-java/src/main/java/org/gnunet/hello/package-info.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/gns/records/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/gns/records/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 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.
+ */
+
+
+/**
+ * Record types for GNS.
+ */
+package org.gnunet.gns.records;
Added: gnunet-java/src/main/java/org/gnunet/identity/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/identity/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/identity/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ 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.
+ */
+
+
+/**
+ * Manage a peer's egos.
+ */
+package org.gnunet.identity;
Added: gnunet-java/src/main/java/org/gnunet/mq/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/mq/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/mq/package-info.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ 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.
+ */
+
+
+/**
+ * Helpers for managing message queueing.
+ */
+package org.gnunet.mq;
Modified: gnunet-java/src/main/java/org/gnunet/peerinfo/PeerInfo.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/peerinfo/PeerInfo.java 2014-03-30
23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/peerinfo/PeerInfo.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -108,7 +108,7 @@
*
* @param timeout
* @param processor
- * @return
+ * @return a handle to cancel the request
*/
public Cancelable iterate(RelativeTime timeout, boolean friendOnly,
PeerProcessor processor) {
return iterate(timeout, null, friendOnly, processor);
@@ -120,7 +120,7 @@
* @param timeout
* @param peer
* @param processor
- * @return
+ * @return a handle to cancel the request
*/
public Cancelable iterate(RelativeTime timeout, PeerIdentity peer, boolean
friendOnly, PeerProcessor processor) {
PeerIterateRequest r = new PeerIterateRequest(peer, friendOnly,
processor);
Copied: gnunet-java/src/main/java/org/gnunet/secretsharing/DecryptCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/secretsharing/callbacks/DecryptCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/secretsharing/DecryptCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/secretsharing/DecryptCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,33 @@
+/*
+ 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.secretsharing;
+
+/**
+ * Callback for when the secretsharing service has decrypted a ciphertext.
+ */
+public interface DecryptCallback {
+ /**
+ * Called when the secretsharing service has decrypted a ciphertext.
+ *
+ * @param plaintext the plaintext, or null on error
+ */
+ void onResult(Plaintext plaintext);
+}
Modified: gnunet-java/src/main/java/org/gnunet/secretsharing/Decryption.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/secretsharing/Decryption.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/secretsharing/Decryption.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -20,7 +20,6 @@
package org.gnunet.secretsharing;
-import org.gnunet.secretsharing.callbacks.DecryptCallback;
import org.gnunet.secretsharing.messages.ClientDecryptMessage;
import org.gnunet.secretsharing.messages.DecryptDoneMessage;
import org.gnunet.util.AbsoluteTime;
Modified: gnunet-java/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/secretsharing/KeyGeneration.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -20,7 +20,6 @@
package org.gnunet.secretsharing;
-import org.gnunet.secretsharing.callbacks.SecretReadyCallback;
import org.gnunet.secretsharing.messages.GenerateMessage;
import org.gnunet.secretsharing.messages.SecretReadyMessage;
import org.gnunet.util.*;
Modified: gnunet-java/src/main/java/org/gnunet/secretsharing/Parameters.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/secretsharing/Parameters.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/secretsharing/Parameters.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -20,7 +20,7 @@
package org.gnunet.secretsharing;
-import org.gnunet.voting.simulation.VotingParameters;
+import org.gnunet.voting.VotingParameters;
import java.math.BigInteger;
import java.security.SecureRandom;
Copied:
gnunet-java/src/main/java/org/gnunet/secretsharing/SecretReadyCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/secretsharing/callbacks/SecretReadyCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/secretsharing/SecretReadyCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/secretsharing/SecretReadyCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,33 @@
+/*
+ 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.secretsharing;
+
+/**
+ * Callback for when shared secret key has been established.
+ */
+public interface SecretReadyCallback {
+ /**
+ * Called when the shared secret key has been established.
+ * @param share the share for the local peer, including the public key,
+ * or null on error
+ */
+ public void onSecretReady(Share share);
+}
Copied: gnunet-java/src/main/java/org/gnunet/secretsharing/package-info.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/requests/package-info.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/secretsharing/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/secretsharing/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,24 @@
+/*
+ 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.
+ */
+
+/**
+ * Distributed key generation and cooperative decryption.
+ */
+package org.gnunet.secretsharing;
Modified: gnunet-java/src/main/java/org/gnunet/statistics/StatisticsTool.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/StatisticsTool.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/statistics/StatisticsTool.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -2,7 +2,6 @@
import org.gnunet.util.Program;
import org.gnunet.util.RelativeTime;
-import org.gnunet.util.Scheduler;
import org.gnunet.util.getopt.Argument;
import org.gnunet.util.getopt.ArgumentAction;
Modified: gnunet-java/src/main/java/org/gnunet/statistics/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/statistics/package-info.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/statistics/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -19,6 +19,6 @@
*/
/**
- * API for the GNUnet statistics service.
+ * Request and update statistics.
*/
package org.gnunet.statistics;
Modified: gnunet-java/src/main/java/org/gnunet/testbed/Controller.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/Controller.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/testbed/Controller.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -23,7 +23,6 @@
import org.gnunet.requests.MatchingRequestContainer;
import org.gnunet.requests.Request;
import org.gnunet.requests.RequestIdentifier;
-import org.gnunet.testbed.callbacks.*;
import org.gnunet.testbed.messages.*;
import org.gnunet.util.*;
import org.slf4j.Logger;
Modified: gnunet-java/src/main/java/org/gnunet/testbed/ControllerProc.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/ControllerProc.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/testbed/ControllerProc.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -1,7 +1,7 @@
package org.gnunet.testbed;
import com.google.common.base.Charsets;
-import org.gnunet.testbed.callbacks.ControllerStatusCallback;
+import org.gnunet.testbed.ControllerStatusCallback;
import org.gnunet.testbed.messages.HelperInitMessage;
import org.gnunet.testbed.messages.HelperReplyMessage;
import org.gnunet.util.Helper;
Copied:
gnunet-java/src/main/java/org/gnunet/testbed/ControllerStatusCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/testbed/callbacks/ControllerStatusCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/ControllerStatusCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/testbed/ControllerStatusCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,9 @@
+package org.gnunet.testbed;
+
+
+import org.gnunet.util.Configuration;
+
+public interface ControllerStatusCallback {
+ void onStartupSuccess(Configuration cfg);
+ void onStartupFailure();
+}
Copied:
gnunet-java/src/main/java/org/gnunet/testbed/HostRegistrationCompletion.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/testbed/callbacks/HostRegistrationCompletion.java)
===================================================================
---
gnunet-java/src/main/java/org/gnunet/testbed/HostRegistrationCompletion.java
(rev 0)
+++
gnunet-java/src/main/java/org/gnunet/testbed/HostRegistrationCompletion.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,4 @@
+package org.gnunet.testbed;
+
+public class HostRegistrationCompletion {
+}
Copied:
gnunet-java/src/main/java/org/gnunet/testbed/OperationCompletionCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/testbed/callbacks/OperationCompletionCallback.java)
===================================================================
---
gnunet-java/src/main/java/org/gnunet/testbed/OperationCompletionCallback.java
(rev 0)
+++
gnunet-java/src/main/java/org/gnunet/testbed/OperationCompletionCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,7 @@
+package org.gnunet.testbed;
+
+
+public interface OperationCompletionCallback {
+ void onCompletion();
+ void onError(String emsg);
+}
Copied: gnunet-java/src/main/java/org/gnunet/testbed/PeerChurnCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/testbed/callbacks/PeerChurnCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/PeerChurnCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/testbed/PeerChurnCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,7 @@
+package org.gnunet.testbed;
+
+
+public interface PeerChurnCallback {
+ void onChurnSuccess();
+ void onChurnError(String emsg);
+}
Copied: gnunet-java/src/main/java/org/gnunet/testbed/PeerCreateCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/testbed/callbacks/PeerCreateCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/PeerCreateCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/testbed/PeerCreateCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,8 @@
+package org.gnunet.testbed;
+
+import org.gnunet.testbed.Controller;
+
+public interface PeerCreateCallback {
+ void onPeerCreated(Controller.Peer peer);
+ void onError(String errorMessage);
+}
Copied:
gnunet-java/src/main/java/org/gnunet/testbed/PeerInformationCallback.java (from
rev 32831,
gnunet-java/src/main/java/org/gnunet/testbed/callbacks/PeerInformationCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/PeerInformationCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/testbed/PeerInformationCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,29 @@
+/*
+ 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.testbed;
+
+
+import org.gnunet.util.Configuration;
+import org.gnunet.util.PeerIdentity;
+
+public interface PeerInformationCallback {
+ void onSuccess(PeerIdentity peerIdentity, Configuration configuration);
+}
Copied: gnunet-java/src/main/java/org/gnunet/testbed/ServiceAdapter.java (from
rev 32831,
gnunet-java/src/main/java/org/gnunet/testbed/callbacks/ServiceAdapter.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/ServiceAdapter.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/testbed/ServiceAdapter.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,28 @@
+/*
+ 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.testbed;
+
+import org.gnunet.util.Configuration;
+
+public interface ServiceAdapter {
+ void onConnect(Configuration cfg);
+ void onDisconnect();
+}
Deleted: gnunet-java/src/main/java/org/gnunet/testbed/SimpleTestbed.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/SimpleTestbed.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/testbed/SimpleTestbed.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -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.testbed;
-
-/**
- * Helper class for running a "simple" testbed.
- *
- */
-public abstract class SimpleTestbed {
- public SimpleTestbed(String configFilename, int numPeers) {
-
- }
-
- protected abstract void onRun(Controller.Peer[] peers);
-
-}
Copied: gnunet-java/src/main/java/org/gnunet/testbed/package-info.java (from
rev 32831, gnunet-java/src/main/java/org/gnunet/statistics/package-info.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/testbed/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/testbed/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,24 @@
+/*
+ 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.
+ */
+
+/**
+ * Run tests with multiple peers.
+ */
+package org.gnunet.testbed;
Modified: gnunet-java/src/main/java/org/gnunet/transport/AddressQuery.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/AddressQuery.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/transport/AddressQuery.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -20,8 +20,6 @@
package org.gnunet.transport;
-import org.gnunet.transport.callbacks.PeerAddressListCallback;
-import org.gnunet.transport.callbacks.PeerAddressMonitorCallback;
import org.gnunet.transport.messages.AddressIterateMessage;
import org.gnunet.transport.messages.AddressIterateResponseMessage;
import org.gnunet.transport.messages.BlacklistInitMessage;
Modified: gnunet-java/src/main/java/org/gnunet/transport/Blacklist.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/Blacklist.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/transport/Blacklist.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -1,6 +1,5 @@
package org.gnunet.transport;
-import org.gnunet.transport.callbacks.BlacklistCallback;
import org.gnunet.transport.messages.BlacklistInitMessage;
import org.gnunet.transport.messages.BlacklistQueryMessage;
import org.gnunet.transport.messages.BlacklistReplyMessage;
Copied: gnunet-java/src/main/java/org/gnunet/transport/BlacklistCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/transport/callbacks/BlacklistCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/BlacklistCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/transport/BlacklistCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,28 @@
+/*
+ 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.transport;
+
+
+import org.gnunet.util.PeerIdentity;
+
+public interface BlacklistCallback {
+ boolean checkAllowed(PeerIdentity peer);
+}
Copied: gnunet-java/src/main/java/org/gnunet/transport/HelloUpdateCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/transport/callbacks/HelloUpdateCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/HelloUpdateCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/transport/HelloUpdateCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,12 @@
+package org.gnunet.transport;
+
+import org.gnunet.hello.HelloMessage;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public interface HelloUpdateCallback {
+ void onHello(HelloMessage helloMessage);
+}
Copied:
gnunet-java/src/main/java/org/gnunet/transport/OfferHelloContinuation.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/transport/callbacks/OfferHelloContinuation.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/OfferHelloContinuation.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/transport/OfferHelloContinuation.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ 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.transport;
+
+public interface OfferHelloContinuation {
+ void onDone();
+}
Copied:
gnunet-java/src/main/java/org/gnunet/transport/PeerAddressListCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/transport/callbacks/PeerAddressListCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/PeerAddressListCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/transport/PeerAddressListCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,47 @@
+/*
+ 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.transport;
+
+
+public interface PeerAddressListCallback {
+ void onPeerAddress(HelloAddress helloAddress);
+ void onDone();
+}
Copied:
gnunet-java/src/main/java/org/gnunet/transport/PeerAddressMonitorCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/transport/callbacks/PeerAddressMonitorCallback.java)
===================================================================
---
gnunet-java/src/main/java/org/gnunet/transport/PeerAddressMonitorCallback.java
(rev 0)
+++
gnunet-java/src/main/java/org/gnunet/transport/PeerAddressMonitorCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,29 @@
+/*
+ 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.transport;
+
+
+import org.gnunet.util.PeerIdentity;
+
+public interface PeerAddressMonitorCallback {
+ void onPeerAddress(HelloAddress helloAddress);
+ void onPeerDisconnect(PeerIdentity peerIdentity);
+}
Copied: gnunet-java/src/main/java/org/gnunet/transport/PeerIterateCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/transport/callbacks/PeerIterateCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/PeerIterateCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/transport/PeerIterateCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,12 @@
+package org.gnunet.transport;
+
+import org.gnunet.util.PeerIdentity;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public interface PeerIterateCallback {
+ void processPeerAddress(PeerIdentity peer, Object hello);
+}
Modified: gnunet-java/src/main/java/org/gnunet/transport/Transport.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/Transport.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/transport/Transport.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -3,9 +3,6 @@
import org.gnunet.hello.HelloMessage;
import org.gnunet.mq.Envelope;
import org.gnunet.mq.NotifySentHandler;
-import org.gnunet.transport.callbacks.HelloUpdateCallback;
-import org.gnunet.transport.callbacks.OfferHelloContinuation;
-import org.gnunet.transport.callbacks.TryConnectCallback;
import org.gnunet.transport.messages.RequestConnectMessage;
import org.gnunet.transport.messages.StartMessage;
import org.gnunet.util.*;
Copied: gnunet-java/src/main/java/org/gnunet/transport/TryConnectCallback.java
(from rev 32831,
gnunet-java/src/main/java/org/gnunet/transport/callbacks/TryConnectCallback.java)
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/TryConnectCallback.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/transport/TryConnectCallback.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,10 @@
+package org.gnunet.transport;
+
+/**
+ * ...
+ *
+ * @author Florian Dold
+ */
+public interface TryConnectCallback {
+ void onDone();
+}
Added: gnunet-java/src/main/java/org/gnunet/transport/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/transport/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/transport/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,24 @@
+/*
+ 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.
+ */
+
+/**
+ * Run tests with multiple peers.
+ */
+package org.gnunet.transport;
Modified:
gnunet-java/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -20,7 +20,9 @@
package org.gnunet.util.crypto;
-import org.gnunet.construct.*;
+import org.gnunet.construct.Construct;
+import org.gnunet.construct.Message;
+import org.gnunet.construct.NestedMessage;
/**
* A message together with a signature on the message and its purpose.
Modified: gnunet-java/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -24,10 +24,6 @@
import org.gnunet.construct.Message;
import org.gnunet.util.Strings;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOError;
-import java.io.IOException;
import java.security.SecureRandom;
import java.util.Arrays;
Added: gnunet-java/src/main/java/org/gnunet/util/crypto/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/util/crypto/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/util/crypto/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ 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.
+ */
+
+
+/**
+ * Cryptographic primitives for.
+ */
+package org.gnunet.util.crypto;
Modified: gnunet-java/src/main/java/org/gnunet/voting/Ballot.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/Ballot.java 2014-03-30
23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/voting/Ballot.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -38,8 +38,6 @@
import org.gnunet.util.crypto.EcdsaSignature;
import org.gnunet.util.crypto.EddsaSignature;
import org.gnunet.voting.messages.KeyQueryResponseMessage;
-import org.gnunet.voting.simulation.VotingParameters;
-import org.omg.CORBA.DynAnyPackage.Invalid;
import java.math.BigInteger;
import java.security.MessageDigest;
Modified: gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java 2014-03-30
23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/voting/BallotTool.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -22,9 +22,8 @@
import com.google.common.base.Charsets;
-import com.google.common.io.ByteStreams;
+import com.google.common.io.ByteSink;
import com.google.common.io.Files;
-import com.google.common.io.OutputSupplier;
import org.gnunet.identity.Identity;
import org.gnunet.identity.IdentityCallback;
import org.gnunet.mesh.Mesh;
@@ -40,7 +39,6 @@
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -282,9 +280,9 @@
return;
}
InputStream is =
getClass().getResourceAsStream("ballot-template.espec");
- OutputSupplier<FileOutputStream> oss =
Files.newOutputStreamSupplier(f);
+ ByteSink out = Files.asByteSink(f);
try {
- ByteStreams.copy(is, oss);
+ out.writeFrom(is);
} catch (IOException e) {
System.err.println("could not copy template file: " +
e.getMessage());
}
Added: gnunet-java/src/main/java/org/gnunet/voting/CryptoUtil.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/CryptoUtil.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/voting/CryptoUtil.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -0,0 +1,85 @@
+package org.gnunet.voting;
+
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Random;
+
+/**
+ * Miscellaneous helper functions.
+ *
+ * @author Florian Dold
+ */
+public class CryptoUtil {
+ public static final Random random = new Random();
+
+
+ /**
+ * Return a random BigInteger not less than 'min' and not greater than
'max' with uniform distribution.
+ *
+ * @param min the least value that may be generated
+ * @param max the greatest value that may be generated
+ * @return a random BigInteger value in the range [min,max]
+ */
+ public static BigInteger createRandomInRange(BigInteger min,
+ BigInteger max) {
+ int cmp = min.compareTo(max);
+ if (cmp >= 0) {
+ if (cmp > 0) {
+ throw new IllegalArgumentException("'min' may not be greater
than 'max'");
+ }
+
+ return min;
+ }
+
+ if (min.bitLength() > max.bitLength() / 2) {
+ return createRandomInRange(BigInteger.ZERO,
max.subtract(min)).add(min);
+ }
+
+ for (int i = 0; i < 1000; ++i) {
+ BigInteger x = new BigInteger(max.bitLength(), random);
+ if (x.compareTo(min) >= 0 && x.compareTo(max) <= 0) {
+ return x;
+ }
+ }
+
+ // fall back to a faster (restricted) method
+ // (using only this distribution would lead to a non-uniform
distribution, see the BigInteger constructor)
+ return new BigInteger(max.subtract(min).bitLength() - 1,
random).add(min);
+ }
+
+
+
+ /**
+ * Evaluate a polynomial over Zp*. Uses Horner's scheme.
+ *
+ * @param coeffs coefficients of the polynomial, where coeffs[i] is the
coefficient of x^i
+ * @param x the polynomial is evaluated at this value
+ * @param p what group are we operating in?
+ * @return the result of evaluating the polynomial at x
+ */
+ public static BigInteger evaluatePolynomial(BigInteger[] coeffs,
BigInteger x, BigInteger p) {
+ BigInteger z = BigInteger.ZERO;
+ for (int i = 0; i < coeffs.length; ++i) {
+ // z <- zx + c
+ z = z.multiply(x).add(coeffs[coeffs.length - i - 1]);
+ }
+ return z;
+ }
+
+ public static BigInteger hash(BigInteger... x) {
+ MessageDigest md;
+ try {
+ md = MessageDigest.getInstance("SHA-512");
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException("no SHA-512 available");
+ }
+
+ for (BigInteger v : x) {
+ md.update(v.toByteArray());
+ }
+
+ return new BigInteger(md.digest());
+ }
+
+}
Modified: gnunet-java/src/main/java/org/gnunet/voting/DisjunctionZkp.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/DisjunctionZkp.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/voting/DisjunctionZkp.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -20,7 +20,10 @@
package org.gnunet.voting;
-import org.gnunet.construct.*;
+import org.gnunet.construct.FixedSizeIntegerArray;
+import org.gnunet.construct.Message;
+import org.gnunet.construct.UInt64;
+import org.gnunet.construct.VariableSizeArray;
import org.gnunet.secretsharing.Parameters;
import java.math.BigInteger;
Modified: gnunet-java/src/main/java/org/gnunet/voting/EncryptedVote.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/EncryptedVote.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/voting/EncryptedVote.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -31,10 +31,8 @@
import org.gnunet.util.BigIntegers;
import org.gnunet.util.Configuration;
import org.gnunet.util.Strings;
-import org.gnunet.util.crypto.EcdsaPrivateKey;
import org.gnunet.util.crypto.EcdsaPublicKey;
import org.gnunet.util.crypto.SignedContentMessage;
-import org.gnunet.voting.simulation.CryptoUtil;
import java.math.BigInteger;
import java.util.Arrays;
Modified: gnunet-java/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/main/java/org/gnunet/voting/TallyAuthorityDaemon.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -29,8 +29,6 @@
import org.gnunet.mesh.MeshRunabout;
import org.gnunet.mesh.TunnelEndHandler;
import org.gnunet.secretsharing.*;
-import org.gnunet.secretsharing.callbacks.DecryptCallback;
-import org.gnunet.secretsharing.callbacks.SecretReadyCallback;
import org.gnunet.testbed.CompressedConfig;
import org.gnunet.util.*;
import org.gnunet.util.crypto.EcdsaPublicKey;
Added: gnunet-java/src/main/java/org/gnunet/voting/VotingParameters.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/VotingParameters.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/voting/VotingParameters.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,177 @@
+package org.gnunet.voting;
+
+import org.gnunet.util.Program;
+import org.gnunet.util.getopt.Argument;
+import org.gnunet.util.getopt.ArgumentAction;
+
+import java.math.BigInteger;
+
+/**
+ * Utilities for the modified ElGamal algorithm.
+ * <p/>
+ * p is a large prime, and g is a high-order element (or even a generator) of
Zp*
+ *
+ * @author Florian Dold
+ */
+public class VotingParameters {
+ // large prime, p = 2q + 1
+ public final BigInteger p;
+ // large prime, so that q divides (p-1)
+ public final BigInteger q;
+ // generator of Gq
+ public final BigInteger g;
+
+ public final int authorityCount;
+ public final int authorityThreshold;
+
+ public VotingParameters(BigInteger p, BigInteger q, BigInteger g, int
authorityCount, int authorityThreshold) {
+ this.p = p;
+ this.q = q;
+ this.g = g;
+ this.authorityCount = authorityCount;
+ this.authorityThreshold = authorityThreshold;
+ }
+
+ /**
+ * which generates the p and g values from the given parameters,
+ * returning the ElGamalScheme object.
+ * <p/>
+ * Note: can take a while...
+ *
+ * @param p_bitlen bit length of p, the modulus of our group
+ * @param certainty
+ */
+ public static VotingParameters generateRandomParameters(int p_bitlen, int
certainty, int authorityCount, int authorityThreshold) {
+ BigInteger[] safePrimes = generateSafePrimes(p_bitlen, certainty);
+ BigInteger p = safePrimes[0];
+ BigInteger q = safePrimes[1];
+ BigInteger g = selectSubgroupGenerator(p, q);
+ if (!g.modPow(q, p).equals(BigInteger.ONE)) {
+ throw new AssertionError();
+ }
+ if (!(g.compareTo(p) < 0)) {
+ throw new AssertionError();
+ }
+ return new VotingParameters(p, q, g, authorityCount,
authorityThreshold);
+ }
+
+ /**
+ * Finds a pair of prime BigIntegers {p, q : p = 2q + 1}, where p is
+ * called a safe prime and q a sophie germain prime.
+ * <p/>
+ * (see: Handbook of Applied Cryptography 4.86)
+ *
+ * @param pBitlength bitlength of the safe prime
+ * @param certainty certainty that we will really generate a pair of
primes,
+ * the probability that we fail is smaller than
2^(-certainty)
+ * @return a 2-element array {p,q} of primes, where p is a safe prime
+ */
+ private static BigInteger[] generateSafePrimes(int pBitlength, int
certainty) {
+ BigInteger p, q;
+ int qBitlength = pBitlength - 1;
+
+ do {
+ // generate a probably prime BigInteger
+ q = new BigInteger(qBitlength, certainty, CryptoUtil.random);
+ // p <- 2q + 1
+ p = q.shiftLeft(1).add(BigInteger.ONE);
+ } while (!p.isProbablePrime(certainty));
+
+ return new BigInteger[]{p, q};
+ }
+
+
+ /**
+ * Returns a higher-order-element of Gq, the subgroup of Zp*,
+ * with order q where alpha is a generator of Zp*
+ *
+ * (see Handbook of Applied Cryptography 4.81)
+ */
+ private static BigInteger selectSubgroupHigherOrderElement(BigInteger
alpha, BigInteger p, BigInteger q) {
+ return alpha.modPow(p.subtract(BigInteger.ONE).divide(q), p);
+ }
+
+ /**
+ * Get the size of the cyclic group Gp used for ElGamal
+ *
+ * @return the size of the cyclic group Gp used for ElGamal
+ */
+ public BigInteger getP() {
+ return p;
+ }
+
+ /**
+ * Get the generator of Gq
+ *
+ * @return the generator of Gq
+ */
+ public BigInteger getG() {
+ return g;
+ }
+
+ /**
+ * Get the generator of Zp*
+ *
+ * @return the generator of Zp*
+ */
+ public BigInteger getQ() {
+ return q;
+ }
+
+ public static BigInteger selectSubgroupGenerator(BigInteger p, BigInteger
q) {
+ BigInteger alpha = selectGenerator(p, q);
+ return selectSubgroupHigherOrderElement(alpha, p, q);
+ }
+
+ /**
+ * Find a generator of Z_p^*, where ord(Z_p^*) = 2q.
+ *
+ * @param p modulus of our group
+ * @param q prime factor of the order of the group Z_p^*, the other factor
being 2.
+ * @return generator of Z_q^*
+ */
+ public static BigInteger selectGenerator(BigInteger p, BigInteger q) {
+ BigInteger pMinusTwo = p.subtract(BigInteger.valueOf(2));
+ BigInteger g;
+ /*
+ * (see: Handbook of Applied Cryptography 4.80)
+ */
+ do {
+ g = CryptoUtil.createRandomInRange(BigInteger.valueOf(2),
pMinusTwo);
+ }
+ while (g.modPow(BigInteger.valueOf(2), p).equals(BigInteger.ONE) ||
g.modPow(q, p).equals(BigInteger.ONE));
+ return g;
+ }
+
+ public BigInteger generateZq() {
+ return CryptoUtil.createRandomInRange(BigInteger.ZERO,
this.q.subtract(BigInteger.ONE));
+ }
+
+ public static void main(String... args) {
+ new Program() {
+ @Argument(
+ shortname = "b",
+ longname = "bits",
+ action = ArgumentAction.STORE_NUMBER,
+ description = "bit length of q")
+ int bitlength = 512;
+ @Argument(
+ shortname = "C",
+ longname = "certainty",
+ action = ArgumentAction.STORE_NUMBER,
+ description = "certainty")
+ int certainty = 2;
+ @Override
+ protected void run() {
+ System.out.println(String.format("Generating parameters with
bitlength %s and certainty %s",
+ bitlength, certainty));
+ // authority count / threshold don't matter here, just fill in
a valid value ...
+ VotingParameters vp =
VotingParameters.generateRandomParameters(bitlength, certainty, 3, 2);
+ System.out.println("p: 0x0" + vp.getP().toString(16));
+ System.out.println("q: 0x0" + vp.getQ().toString(16));
+ System.out.println("g: 0x0" + vp.getG().toString(16));
+ }
+ }.startWithoutScheduler(args);
+ }
+
+}
Added: gnunet-java/src/main/java/org/gnunet/voting/package-info.java
===================================================================
--- gnunet-java/src/main/java/org/gnunet/voting/package-info.java
(rev 0)
+++ gnunet-java/src/main/java/org/gnunet/voting/package-info.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -0,0 +1,25 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 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.
+ */
+
+
+/**
+ * Electronic voting.
+ */
+package org.gnunet.voting;
Modified:
gnunet-java/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/test/java/org/gnunet/consensus/ConsensusTestbedTest.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -1,8 +1,6 @@
package org.gnunet.consensus;
-import org.gnunet.testbed.Controller;
-import org.gnunet.testbed.ControllerProc;
-import org.gnunet.testbed.Host;
+import org.gnunet.testbed.*;
import org.gnunet.testbed.callbacks.*;
import org.gnunet.testing.TestingFixture;
import org.gnunet.util.*;
Modified:
gnunet-java/src/test/java/org/gnunet/secretsharing/SecretsharingTest.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/secretsharing/SecretsharingTest.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/test/java/org/gnunet/secretsharing/SecretsharingTest.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -21,8 +21,6 @@
package org.gnunet.secretsharing;
-import org.gnunet.secretsharing.callbacks.DecryptCallback;
-import org.gnunet.secretsharing.callbacks.SecretReadyCallback;
import org.gnunet.testing.TestingSubsystem;
import org.gnunet.util.*;
import org.junit.Assert;
Modified: gnunet-java/src/test/java/org/gnunet/transport/TransportTest.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/transport/TransportTest.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/test/java/org/gnunet/transport/TransportTest.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -23,7 +23,6 @@
import org.gnunet.hello.HelloMessage;
import org.gnunet.testing.TestingFixture;
import org.gnunet.testing.TestingSubsystem;
-import org.gnunet.transport.callbacks.HelloUpdateCallback;
import org.gnunet.util.Program;
import org.gnunet.util.Scheduler;
import org.gnunet.util.Wrapper;
Modified: gnunet-java/src/test/java/org/gnunet/util/HighLevelCryptoTest.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/util/HighLevelCryptoTest.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/test/java/org/gnunet/util/HighLevelCryptoTest.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -3,7 +3,6 @@
import org.gnunet.construct.MessageLoader;
import org.gnunet.construct.UInt32;
-import org.gnunet.construct.UnionCase;
import org.gnunet.construct.ZeroTerminatedString;
import org.gnunet.util.crypto.*;
import org.junit.Assert;
@@ -35,7 +34,7 @@
c.foo = "quux";
EcdsaPrivateKey privateKey = EcdsaPrivateKey.createRandom();
EcdsaPublicKey publicKey = privateKey.getPublicKey();
- EcdsaSignedMessage m = new EcdsaSignedMessage(c, privateKey,
publicKey);
+ EcdsaSignedMessage m = new EcdsaSignedMessage<MySecretContent>(c,
privateKey, publicKey);
Assert.assertTrue(m.verify(publicKey, MySecretContent.class));
}
@@ -48,8 +47,9 @@
c.foo = "quux";
EcdsaPrivateKey privateKey = EcdsaPrivateKey.createRandom();
EcdsaPublicKey publicKey = privateKey.getPublicKey();
- EcdsaSignedMessage m = new EcdsaSignedMessage(c, privateKey,
publicKey);
+ EcdsaSignedMessage m = new EcdsaSignedMessage<MySecretContent>(c,
privateKey, publicKey);
+
Assert.assertFalse(m.verify(publicKey, MyFakeContent.class));
}
Modified: gnunet-java/src/test/java/org/gnunet/util/StringsTest.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/util/StringsTest.java 2014-03-30
23:25:27 UTC (rev 32835)
+++ gnunet-java/src/test/java/org/gnunet/util/StringsTest.java 2014-03-31
00:16:22 UTC (rev 32836)
@@ -3,8 +3,6 @@
import org.junit.Assert;
import org.junit.Test;
-import java.util.Random;
-
/**
* ...
*
Modified: gnunet-java/src/test/java/org/gnunet/voting/TestVotingCrypto.java
===================================================================
--- gnunet-java/src/test/java/org/gnunet/voting/TestVotingCrypto.java
2014-03-30 23:25:27 UTC (rev 32835)
+++ gnunet-java/src/test/java/org/gnunet/voting/TestVotingCrypto.java
2014-03-31 00:16:22 UTC (rev 32836)
@@ -22,12 +22,9 @@
import org.gnunet.construct.Construct;
import org.gnunet.secretsharing.*;
-import org.gnunet.secretsharing.callbacks.DecryptCallback;
-import org.gnunet.secretsharing.callbacks.SecretReadyCallback;
import org.gnunet.testing.TestingFixture;
import org.gnunet.testing.TestingSubsystem;
import org.gnunet.util.*;
-import org.gnunet.util.crypto.EcdhePrivateKey;
import org.gnunet.util.crypto.EcdsaPrivateKey;
import org.gnunet.util.crypto.EcdsaPublicKey;
import org.junit.Assert;
@@ -99,9 +96,9 @@
@Override
public void onSecretReady(Share share) {
Assert.assertNotNull(share);
- EncryptedVote encryptedVote1 = EncryptedVote.fromChoice(1,
share.publicKey, privateKey, publicKey, generators2);
- EncryptedVote encryptedVote2 = EncryptedVote.fromChoice(0,
share.publicKey, privateKey, publicKey, generators2);
- EncryptedVote encryptedVote3 = EncryptedVote.fromChoice(0,
share.publicKey, privateKey, publicKey, generators2);
+ EncryptedVote encryptedVote1 = EncryptedVote.fromChoice(1,
share.publicKey, publicKey, generators2);
+ EncryptedVote encryptedVote2 = EncryptedVote.fromChoice(0,
share.publicKey, publicKey, generators2);
+ EncryptedVote encryptedVote3 = EncryptedVote.fromChoice(0,
share.publicKey, publicKey, generators2);
Ciphertext sum =
Ciphertext.identity().multiply(encryptedVote1.v.multiply(encryptedVote2.v).multiply(encryptedVote3.v));
@@ -140,7 +137,7 @@
@Override
public void onSecretReady(Share share) {
Assert.assertNotNull(share);
- EncryptedVote encryptedVote1 = EncryptedVote.fromChoice(1,
share.publicKey, privateKey, publicKey, generators2);
+ EncryptedVote encryptedVote1 = EncryptedVote.fromChoice(1,
share.publicKey, publicKey, generators2);
Assert.assertTrue(encryptedVote1.disjunctionZkp.verifyChallenge());
Configuration c = new Configuration();
encryptedVote1.writeToConfiguration(c);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32836 - in gnunet-java: . src/main/java/org/gnunet/arm src/main/java/org/gnunet/consensus src/main/java/org/gnunet/core src/main/java/org/gnunet/dht src/main/java/org/gnunet/gns src/main/java/org/gnunet/gns/records src/main/java/org/gnunet/identity src/main/java/org/gnunet/mq src/main/java/org/gnunet/peerinfo src/main/java/org/gnunet/secretsharing src/main/java/org/gnunet/statistics src/main/java/org/gnunet/testbed src/main/java/org/gnunet/transport src/main/java/org/gnunet/util/crypto src/main/java/org/gnunet/voting src/test/java/org/gnunet/consensus src/test/java/org/gnunet/secretsharing src/test/java/org/gnunet/transport src/test/java/org/gnunet/util src/test/java/org/gnunet/voting,
gnunet <=