meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Bulletin-Board-Batch

Bulletin-Board-Batch
Arbel Deutsch Peled 2015-12-17 19:21:04 +02:00
parent b17954adc2 e8e511d9ce
commit c4b0d8f23c
7 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file
View File

Binary file not shown.

7
gradle/wrapper/gradle-wrapper.properties vendored Normal file
View File

@ -0,0 +1,7 @@
#Tue Aug 05 03:26:05 IDT 2014
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

10
gradlew vendored
View File

@ -42,6 +42,11 @@ case "`uname`" in
;; ;;
esac esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# Attempt to set APP_HOME # Attempt to set APP_HOME
# Resolve links: $0 may be a link # Resolve links: $0 may be a link
PRG="$0" PRG="$0"
@ -56,9 +61,9 @@ while [ -h "$PRG" ] ; do
fi fi
done done
SAVED="`pwd`" SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`" APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null cd "$SAVED" >&-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -109,7 +114,6 @@ fi
if $cygwin ; then if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

3
meerkat-common/build.gradle
View File

@ -49,9 +49,8 @@ dependencies {
compile 'com.google.guava:guava:11.0.+' compile 'com.google.guava:guava:11.0.+'
// Crypto // 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:bcprov-jdk15on:1.53'
compile 'org.bouncycastle:bcpkix-jdk15on:1.53'
testCompile 'junit:junit:4.+' testCompile 'junit:junit:4.+'

8
meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java
View File

@ -17,10 +17,10 @@ import org.bouncycastle.math.ec.ECPoint;
import org.bouncycastle.util.BigIntegers; import org.bouncycastle.util.BigIntegers;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import qilin.primitives.concrete.ECElGamal; import org.factcenter.qilin.primitives.concrete.ECElGamal;
import qilin.primitives.concrete.ECGroup; import org.factcenter.qilin.primitives.concrete.ECGroup;
import qilin.util.PRGRandom; import org.factcenter.qilin.util.PRGRandom;
import qilin.util.Pair; import org.factcenter.qilin.util.Pair;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;

6
meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalEncryptionTest.java
View File

@ -8,9 +8,9 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import qilin.primitives.concrete.ECElGamal; import org.factcenter.qilin.primitives.concrete.ECElGamal;
import qilin.primitives.concrete.ECGroup; import org.factcenter.qilin.primitives.concrete.ECGroup;
import qilin.util.Pair; import org.factcenter.qilin.util.Pair;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Random; import java.util.Random;

8
meerkat-common/src/test/java/meerkat/crypto/concrete/ECElGamalUtils.java
View File

@ -11,10 +11,10 @@ import org.bouncycastle.jce.spec.ECPublicKeySpec;
import org.bouncycastle.math.ec.ECPoint; import org.bouncycastle.math.ec.ECPoint;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import qilin.primitives.concrete.ECElGamal; import org.factcenter.qilin.primitives.concrete.ECElGamal;
import qilin.primitives.concrete.ECGroup; import org.factcenter.qilin.primitives.concrete.ECGroup;
import qilin.primitives.generic.ElGamal; import org.factcenter.qilin.primitives.generic.ElGamal;
import qilin.util.Pair; import org.factcenter.qilin.util.Pair;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.security.KeyFactory; import java.security.KeyFactory;