From 19e52344f56a0d5e6eca4c2ddaa66cc78f2be444 Mon Sep 17 00:00:00 2001 From: Tal Moran Date: Tue, 5 Apr 2016 11:49:34 +0300 Subject: [PATCH] Merged move to public qilin version --- gradle/wrapper/gradle-wrapper.properties.orig | 11 ++++++++ meerkat-common/build.gradle | 2 +- .../java/meerkat/crypto/mixnet/Mixer.java | 2 -- mixer/build.gradle | 3 +++ mixer/src/main/java/mixer/Mixer.java | 25 +++++++------------ .../java/prover/ElGamalProofOrganizer.java | 2 +- mixer/src/main/java/prover/Prover.java | 4 +-- mixer/src/main/java/verifier/Verifier.java | 4 +-- .../verifier/ZeroKnowledgeOrProofParser.java | 2 +- .../src/test/java/mixer/CreateTestVector.java | 10 +++----- mixer/src/test/java/mixer/MixingText.java | 13 +++++----- .../src/test/java/mixer/RerandomizeTest.java | 9 +++---- .../java/mixer/SimpleRerandomizeTest.java | 2 +- mixer/src/test/java/mixer/Utiles.java | 8 +++--- .../java/mixer/ZeroKnowledgeProofTest.java | 9 ++++--- .../java/profiling/BigInteger/AddSub.java | 8 ++---- .../BigInteger/GenerateRandomness.java | 6 ++--- .../java/profiling/BigInteger/Modulo.java | 9 ++----- .../test/java/profiling/BigInteger/Mul.java | 6 ++--- .../java/profiling/BigInteger/SHA256.java | 13 ++-------- .../profiling/Convert/ByteString2ECPoint.java | 7 ++---- ...bleEncryptedMessage2ElGamalCiphertext.java | 8 ++---- .../src/test/java/profiling/ECGroup/Add.java | 6 ++--- .../test/java/profiling/ECGroup/Encode.java | 6 ++--- .../src/test/java/profiling/ECGroup/Mul.java | 6 ++--- .../test/java/profiling/ECGroup/Negate.java | 6 ++--- .../src/test/java/profiling/Rerandomize.java | 12 ++------- .../java/profiling/ZeroKnowledgeProof.java | 12 +++------ settings.gradle.orig | 11 ++++++++ 29 files changed, 93 insertions(+), 129 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.properties.orig create mode 100644 settings.gradle.orig diff --git a/gradle/wrapper/gradle-wrapper.properties.orig b/gradle/wrapper/gradle-wrapper.properties.orig new file mode 100644 index 0000000..1384b44 --- /dev/null +++ b/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 diff --git a/meerkat-common/build.gradle b/meerkat-common/build.gradle index c510e0a..b44b1fe 100644 --- a/meerkat-common/build.gradle +++ b/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.+' diff --git a/meerkat-common/src/main/java/meerkat/crypto/mixnet/Mixer.java b/meerkat-common/src/main/java/meerkat/crypto/mixnet/Mixer.java index 5a0834f..4262012 100644 --- a/meerkat-common/src/main/java/meerkat/crypto/mixnet/Mixer.java +++ b/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; diff --git a/mixer/build.gradle b/mixer/build.gradle index 14cb9dd..ba26598 100644 --- a/mixer/build.gradle +++ b/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.+' diff --git a/mixer/src/main/java/mixer/Mixer.java b/mixer/src/main/java/mixer/Mixer.java index c2c52c0..ddee9f9 100644 --- a/mixer/src/main/java/mixer/Mixer.java +++ b/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 { diff --git a/mixer/src/main/java/prover/ElGamalProofOrganizer.java b/mixer/src/main/java/prover/ElGamalProofOrganizer.java index 540e944..d37713b 100644 --- a/mixer/src/main/java/prover/ElGamalProofOrganizer.java +++ b/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 diff --git a/mixer/src/main/java/prover/Prover.java b/mixer/src/main/java/prover/Prover.java index 0ff8494..90fdb75 100644 --- a/mixer/src/main/java/prover/Prover.java +++ b/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; diff --git a/mixer/src/main/java/verifier/Verifier.java b/mixer/src/main/java/verifier/Verifier.java index 308521f..21c9520 100644 --- a/mixer/src/main/java/verifier/Verifier.java +++ b/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; diff --git a/mixer/src/main/java/verifier/ZeroKnowledgeOrProofParser.java b/mixer/src/main/java/verifier/ZeroKnowledgeOrProofParser.java index d3f82a5..e0695bc 100644 --- a/mixer/src/main/java/verifier/ZeroKnowledgeOrProofParser.java +++ b/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; diff --git a/mixer/src/test/java/mixer/CreateTestVector.java b/mixer/src/test/java/mixer/CreateTestVector.java index 52f07fa..591b397 100644 --- a/mixer/src/test/java/mixer/CreateTestVector.java +++ b/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; diff --git a/mixer/src/test/java/mixer/MixingText.java b/mixer/src/test/java/mixer/MixingText.java index e2d0b6f..dc003be 100644 --- a/mixer/src/test/java/mixer/MixingText.java +++ b/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; diff --git a/mixer/src/test/java/mixer/RerandomizeTest.java b/mixer/src/test/java/mixer/RerandomizeTest.java index b7d9082..66b0343 100644 --- a/mixer/src/test/java/mixer/RerandomizeTest.java +++ b/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; diff --git a/mixer/src/test/java/mixer/SimpleRerandomizeTest.java b/mixer/src/test/java/mixer/SimpleRerandomizeTest.java index b907e86..34df02b 100644 --- a/mixer/src/test/java/mixer/SimpleRerandomizeTest.java +++ b/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; diff --git a/mixer/src/test/java/mixer/Utiles.java b/mixer/src/test/java/mixer/Utiles.java index 15483f3..0bb0e36 100644 --- a/mixer/src/test/java/mixer/Utiles.java +++ b/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; diff --git a/mixer/src/test/java/mixer/ZeroKnowledgeProofTest.java b/mixer/src/test/java/mixer/ZeroKnowledgeProofTest.java index 6b75b1a..4e9b404 100644 --- a/mixer/src/test/java/mixer/ZeroKnowledgeProofTest.java +++ b/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; diff --git a/mixer/src/test/java/profiling/BigInteger/AddSub.java b/mixer/src/test/java/profiling/BigInteger/AddSub.java index 86ef2a7..b7cca3f 100644 --- a/mixer/src/test/java/profiling/BigInteger/AddSub.java +++ b/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; diff --git a/mixer/src/test/java/profiling/BigInteger/GenerateRandomness.java b/mixer/src/test/java/profiling/BigInteger/GenerateRandomness.java index 870d331..8711ab4 100644 --- a/mixer/src/test/java/profiling/BigInteger/GenerateRandomness.java +++ b/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; diff --git a/mixer/src/test/java/profiling/BigInteger/Modulo.java b/mixer/src/test/java/profiling/BigInteger/Modulo.java index a97cf6c..8d2a6b9 100644 --- a/mixer/src/test/java/profiling/BigInteger/Modulo.java +++ b/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; diff --git a/mixer/src/test/java/profiling/BigInteger/Mul.java b/mixer/src/test/java/profiling/BigInteger/Mul.java index c25a1d8..b7d8730 100644 --- a/mixer/src/test/java/profiling/BigInteger/Mul.java +++ b/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; diff --git a/mixer/src/test/java/profiling/BigInteger/SHA256.java b/mixer/src/test/java/profiling/BigInteger/SHA256.java index c2f4cbc..0db8279 100644 --- a/mixer/src/test/java/profiling/BigInteger/SHA256.java +++ b/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; diff --git a/mixer/src/test/java/profiling/Convert/ByteString2ECPoint.java b/mixer/src/test/java/profiling/Convert/ByteString2ECPoint.java index c11d718..931e0e3 100644 --- a/mixer/src/test/java/profiling/Convert/ByteString2ECPoint.java +++ b/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; diff --git a/mixer/src/test/java/profiling/Convert/RerandomizableEncryptedMessage2ElGamalCiphertext.java b/mixer/src/test/java/profiling/Convert/RerandomizableEncryptedMessage2ElGamalCiphertext.java index 316070d..18625d0 100644 --- a/mixer/src/test/java/profiling/Convert/RerandomizableEncryptedMessage2ElGamalCiphertext.java +++ b/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; diff --git a/mixer/src/test/java/profiling/ECGroup/Add.java b/mixer/src/test/java/profiling/ECGroup/Add.java index c45457e..ceadc43 100644 --- a/mixer/src/test/java/profiling/ECGroup/Add.java +++ b/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; diff --git a/mixer/src/test/java/profiling/ECGroup/Encode.java b/mixer/src/test/java/profiling/ECGroup/Encode.java index ccdf3cb..57db853 100644 --- a/mixer/src/test/java/profiling/ECGroup/Encode.java +++ b/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; diff --git a/mixer/src/test/java/profiling/ECGroup/Mul.java b/mixer/src/test/java/profiling/ECGroup/Mul.java index bb7ecaf..f59bf68 100644 --- a/mixer/src/test/java/profiling/ECGroup/Mul.java +++ b/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; diff --git a/mixer/src/test/java/profiling/ECGroup/Negate.java b/mixer/src/test/java/profiling/ECGroup/Negate.java index 0c2d9d7..91ee6e4 100644 --- a/mixer/src/test/java/profiling/ECGroup/Negate.java +++ b/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; diff --git a/mixer/src/test/java/profiling/Rerandomize.java b/mixer/src/test/java/profiling/Rerandomize.java index 495c7ca..8e9ddb4 100644 --- a/mixer/src/test/java/profiling/Rerandomize.java +++ b/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; diff --git a/mixer/src/test/java/profiling/ZeroKnowledgeProof.java b/mixer/src/test/java/profiling/ZeroKnowledgeProof.java index 356e69a..dcacd0d 100644 --- a/mixer/src/test/java/profiling/ZeroKnowledgeProof.java +++ b/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; diff --git a/settings.gradle.orig b/settings.gradle.orig new file mode 100644 index 0000000..a5cec3b --- /dev/null +++ b/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