Merged move to public qilin version

gradle/wrapper/gradle-wrapper.properties.orig

@@ -0,0 +1,11 @@
+<<<<<<< HEAD
+#Sun Mar 20 15:13:00 IST 2016
+=======
+#Tue Aug 05 03:26:05 IDT 2014
+>>>>>>> e8e511d9ce636a127bb33d70ebfd9b2f230c6e1d
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
+distributionSha256Sum=4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9

meerkat-common/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     compile 'com.google.guava:guava:11.0.+'
 
     // Crypto
-    compile 'org.factcenter.qilin:qilin:1.2+'
+    compile 'org.factcenter.qilin:qilin:1.2.+'
     compile 'org.bouncycastle:bcprov-jdk15on:1.53'
 
     testCompile 'junit:junit:4.+'

meerkat-common/src/main/java/meerkat/crypto/mixnet/Mixer.java

@@ -1,9 +1,7 @@
 package meerkat.crypto.mixnet;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import qilin.util.Pair;
 import meerkat.protobuf.Crypto;
-import meerkat.protobuf.Mixing;
 
 import java.util.List;
 

mixer/build.gradle

@@ -49,6 +49,9 @@ dependencies {
     // Google protobufs
     compile 'com.google.protobuf:protobuf-java:3.+'
 
+    // Crypto
+    compile 'org.factcenter.qilin:qilin:1.2.+'
+
     testCompile 'junit:junit:4.+'
 
     runtime 'org.codehaus.groovy:groovy:2.4.+'

mixer/src/main/java/mixer/Mixer.java

@@ -1,24 +1,17 @@
 package mixer;
 
-import java.math.*;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import meerkat.crypto.mixnet.Mix2ZeroKnowledgeVerifier;
-import meerkat.crypto.mixnet.MixerOutput;
-import qilin.primitives.concrete.ECGroup;
-import qilin.util.Pair;
-import java.util.Random;
-
 import com.google.protobuf.InvalidProtocolBufferException;
-
-import meerkat.protobuf.Crypto.*;
-import meerkat.protobuf.Mixing.*;
-
 import meerkat.crypto.Encryption;
 import meerkat.crypto.mixnet.Mix2ZeroKnowledgeProver;
-import verifier.Verifier;
+import meerkat.crypto.mixnet.Mix2ZeroKnowledgeVerifier;
+import meerkat.crypto.mixnet.MixerOutput;
+import meerkat.protobuf.Crypto.EncryptionRandomness;
+import meerkat.protobuf.Crypto.RerandomizableEncryptedMessage;
+import meerkat.protobuf.Mixing.ZeroKnowledgeProof;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Random;
 
 public class Mixer implements meerkat.crypto.mixnet.Mixer {
 

mixer/src/main/java/prover/ElGamalProofOrganizer.java

@@ -6,7 +6,7 @@ import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.protobuf.ConcreteCrypto;
 import meerkat.protobuf.Crypto;
 import org.bouncycastle.math.ec.ECPoint;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 /**
  * use for organize the input for each ZKP

mixer/src/main/java/prover/Prover.java

@@ -7,8 +7,8 @@ import meerkat.crypto.mixnet.Mix2ZeroKnowledgeProver;
 import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Mixing;
 import org.bouncycastle.math.ec.ECPoint;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.RandomOracle;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/main/java/verifier/Verifier.java

@@ -7,8 +7,8 @@ import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Mixing;
 import org.bouncycastle.math.ec.ECPoint;
 import prover.ElGamalProofOrganizer;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.RandomOracle;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

mixer/src/main/java/verifier/ZeroKnowledgeOrProofParser.java

@@ -3,7 +3,7 @@ package verifier;
 import com.google.protobuf.ByteString;
 import meerkat.protobuf.Mixing;
 import org.bouncycastle.math.ec.ECPoint;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 

mixer/src/test/java/mixer/CreateTestVector.java

@@ -1,18 +1,16 @@
 package mixer;
 
-import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.crypto.mixnet.Mix2ZeroKnowledgeProver;
 import meerkat.crypto.mixnet.Mix2ZeroKnowledgeVerifier;
 import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Voting;
+import org.factcenter.qilin.primitives.RandomOracle;
+import org.factcenter.qilin.primitives.concrete.DigestOracle;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 import org.junit.Before;
-import org.junit.Test;
 import prover.Prover;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.DigestOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
 import verifier.Verifier;
 import verifier.VerifyTable;
 

mixer/src/test/java/mixer/MixingText.java

@@ -6,20 +6,19 @@ package mixer;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
-import meerkat.crypto.mixnet.*;
+import meerkat.crypto.mixnet.Mix2ZeroKnowledgeVerifier;
 import meerkat.protobuf.Crypto;
-import meerkat.protobuf.Mixing;
 import meerkat.protobuf.Voting;
+import org.factcenter.qilin.primitives.RandomOracle;
+import org.factcenter.qilin.primitives.concrete.DigestOracle;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 import org.junit.Before;
 import org.junit.Test;
 import prover.Prover;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.DigestOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
-import qilin.util.Pair;
 import verifier.Verifier;
 import verifier.VerifyTable;
+
 import java.security.spec.InvalidKeySpecException;
 import java.util.ArrayList;
 import java.util.List;

mixer/src/test/java/mixer/RerandomizeTest.java

@@ -7,13 +7,12 @@ import meerkat.protobuf.ConcreteCrypto;
 import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Voting;
 import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.BigIntegers;
+import org.factcenter.qilin.primitives.RandomOracle;
+import org.factcenter.qilin.primitives.concrete.DigestOracle;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 import org.junit.Before;
 import org.junit.Test;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.DigestOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/mixer/SimpleRerandomizeTest.java

@@ -1,8 +1,8 @@
 package mixer;
 
 import org.bouncycastle.math.ec.ECPoint;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 import org.junit.Before;
-import qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/mixer/Utiles.java

@@ -12,10 +12,10 @@ import meerkat.protobuf.Voting;
 import org.bouncycastle.jce.spec.ECParameterSpec;
 import org.bouncycastle.jce.spec.ECPublicKeySpec;
 import org.bouncycastle.math.ec.ECPoint;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
-import qilin.primitives.generic.ElGamal;
-import qilin.util.Pair;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.generic.ElGamal;
+import org.factcenter.qilin.util.Pair;
 
 import java.io.ByteArrayInputStream;
 import java.math.BigInteger;

mixer/src/test/java/mixer/ZeroKnowledgeProofTest.java

@@ -9,14 +9,15 @@ import meerkat.protobuf.ConcreteCrypto;
 import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Voting;
 import org.bouncycastle.math.ec.ECPoint;
+import org.factcenter.qilin.primitives.RandomOracle;
+import org.factcenter.qilin.primitives.concrete.DigestOracle;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 import org.junit.Before;
 import org.junit.Test;
 import prover.Prover;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.DigestOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
 import verifier.Verifier;
+
 import java.math.BigInteger;
 import java.util.Random;
 

mixer/src/test/java/profiling/BigInteger/AddSub.java

@@ -3,13 +3,9 @@ package profiling.BigInteger;
 import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.protobuf.ConcreteCrypto;
-import meerkat.protobuf.Voting;
 import mixer.Utiles;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/profiling/BigInteger/GenerateRandomness.java

@@ -4,10 +4,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.protobuf.ConcreteCrypto;
 import mixer.Utiles;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/profiling/BigInteger/Modulo.java

@@ -3,14 +3,9 @@ package profiling.BigInteger;
 import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.protobuf.ConcreteCrypto;
-import meerkat.protobuf.Voting;
 import mixer.Utiles;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.DigestOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/profiling/BigInteger/Mul.java

@@ -4,10 +4,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.protobuf.ConcreteCrypto;
 import mixer.Utiles;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/profiling/BigInteger/SHA256.java

@@ -1,18 +1,9 @@
 package profiling.BigInteger;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import meerkat.crypto.concrete.ECElGamalEncryption;
-import meerkat.protobuf.ConcreteCrypto;
-import meerkat.protobuf.Crypto;
-import meerkat.protobuf.Mixing;
 import meerkat.protobuf.Voting;
-import mixer.Utiles;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.DigestOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.RandomOracle;
+import org.factcenter.qilin.primitives.concrete.DigestOracle;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/profiling/Convert/ByteString2ECPoint.java

@@ -4,14 +4,11 @@ import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.protobuf.ConcreteCrypto;
-import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Voting;
 import mixer.Utiles;
 import org.bouncycastle.math.ec.ECPoint;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/profiling/Convert/RerandomizableEncryptedMessage2ElGamalCiphertext.java

@@ -1,17 +1,13 @@
 package profiling.Convert;
 
-import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.protobuf.ConcreteCrypto;
 import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Voting;
 import mixer.Utiles;
-import org.bouncycastle.math.ec.ECPoint;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/profiling/ECGroup/Add.java

@@ -4,10 +4,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import mixer.Utiles;
 import org.bouncycastle.math.ec.ECPoint;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.security.spec.InvalidKeySpecException;
 import java.util.ArrayList;

mixer/src/test/java/profiling/ECGroup/Encode.java

@@ -4,10 +4,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import mixer.Utiles;
 import org.bouncycastle.math.ec.ECPoint;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.security.spec.InvalidKeySpecException;
 import java.util.ArrayList;

mixer/src/test/java/profiling/ECGroup/Mul.java

@@ -4,10 +4,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import mixer.Utiles;
 import org.bouncycastle.math.ec.ECPoint;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.security.spec.InvalidKeySpecException;

mixer/src/test/java/profiling/ECGroup/Negate.java

@@ -4,10 +4,8 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import mixer.Utiles;
 import org.bouncycastle.math.ec.ECPoint;
-import org.junit.Before;
-import org.junit.Test;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.security.spec.InvalidKeySpecException;
 import java.util.ArrayList;

mixer/src/test/java/profiling/Rerandomize.java

@@ -1,21 +1,13 @@
 package profiling;
 
-import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
-import meerkat.crypto.mixnet.Mix2ZeroKnowledgeProver;
 import meerkat.protobuf.ConcreteCrypto;
 import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Voting;
 import mixer.Utiles;
-import org.bouncycastle.math.ec.ECPoint;
-import org.junit.Before;
-import org.junit.Test;
-import prover.Prover;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.DigestOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 
 import java.math.BigInteger;
 import java.util.Random;

mixer/src/test/java/profiling/ZeroKnowledgeProof.java

@@ -4,20 +4,16 @@ import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import meerkat.crypto.concrete.ECElGamalEncryption;
 import meerkat.crypto.mixnet.Mix2ZeroKnowledgeProver;
-import meerkat.crypto.mixnet.Mix2ZeroKnowledgeVerifier;
 import meerkat.protobuf.ConcreteCrypto;
 import meerkat.protobuf.Crypto;
 import meerkat.protobuf.Voting;
 import mixer.Utiles;
 import org.bouncycastle.math.ec.ECPoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.factcenter.qilin.primitives.RandomOracle;
+import org.factcenter.qilin.primitives.concrete.DigestOracle;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
 import prover.Prover;
-import qilin.primitives.RandomOracle;
-import qilin.primitives.concrete.DigestOracle;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
-
 
 import java.math.BigInteger;
 import java.util.Random;

settings.gradle.orig

@@ -0,0 +1,11 @@
+include 'meerkat-common'
+include 'voting-booth'
+include 'bulletin-board-server'
+include 'polling-station'
+include 'restful-api-common'
+<<<<<<< HEAD
+include 'mixer'
+=======
+include 'bulletin-board-client'
+
+>>>>>>> e8e511d9ce636a127bb33d70ebfd9b2f230c6e1d