From e8e511d9ce636a127bb33d70ebfd9b2f230c6e1d Mon Sep 17 00:00:00 2001
From: Tal Moran <talm@idc.ac.il>
Date: Wed, 16 Dec 2015 18:16:12 +0200
Subject: [PATCH] Move to public version of qilin

---
 meerkat-common/build.gradle                               | 3 +--
 .../java/meerkat/crypto/concrete/ECElGamalEncryption.java | 8 ++++----
 .../meerkat/crypto/concrete/ECElGamalEncryptionTest.java  | 6 +++---
 .../test/java/meerkat/crypto/concrete/ECElGamalUtils.java | 8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/meerkat-common/build.gradle b/meerkat-common/build.gradle
index 6aa93cb..c510e0a 100644
--- a/meerkat-common/build.gradle
+++ b/meerkat-common/build.gradle
@@ -49,9 +49,8 @@ dependencies {
     compile 'com.google.guava:guava:11.0.+'
 
     // Crypto
-    compile 'org.factcenter.qilin:qilin:1.1+'
+    compile 'org.factcenter.qilin:qilin:1.2+'
     compile 'org.bouncycastle:bcprov-jdk15on:1.53'
-    compile 'org.bouncycastle:bcpkix-jdk15on:1.53'
 
     testCompile 'junit:junit:4.+'
 
diff --git a/meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java b/meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
index 1e075bf..f9936c7 100644
--- a/meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
+++ b/meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
@@ -17,10 +17,10 @@ import org.bouncycastle.math.ec.ECPoint;
 import org.bouncycastle.util.BigIntegers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
-import qilin.util.PRGRandom;
-import qilin.util.Pair;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.util.PRGRandom;
+import org.factcenter.qilin.util.Pair;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java b/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java
index bb52df9..81375e0 100644
--- a/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java
+++ b/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java
@@ -8,9 +8,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import qilin.primitives.concrete.ECElGamal;
-import qilin.primitives.concrete.ECGroup;
-import qilin.util.Pair;
+import org.factcenter.qilin.primitives.concrete.ECElGamal;
+import org.factcenter.qilin.primitives.concrete.ECGroup;
+import org.factcenter.qilin.util.Pair;
 
 import java.math.BigInteger;
 import java.util.Random;
diff --git a/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java b/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java
index 44efe69..66e1647 100644
--- a/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java
+++ b/meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java
@@ -11,10 +11,10 @@ import org.bouncycastle.jce.spec.ECPublicKeySpec;
 import org.bouncycastle.math.ec.ECPoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-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.security.KeyFactory;