diff options
| author | J08nY | 2018-07-23 19:04:45 +0200 |
|---|---|---|
| committer | J08nY | 2018-07-23 19:04:45 +0200 |
| commit | 4d71c1f245afda7a1d2e235bc9d0fd6d4fcfb324 (patch) | |
| tree | 9d6a649c24ae2a8fcba4763fd271e25ded797e9e | |
| parent | 80ec2bcb69d62267e97f1801f21aed5fe46f109f (diff) | |
| download | ECTester-4d71c1f245afda7a1d2e235bc9d0fd6d4fcfb324.tar.gz ECTester-4d71c1f245afda7a1d2e235bc9d0fd6d4fcfb324.tar.zst ECTester-4d71c1f245afda7a1d2e235bc9d0fd6d4fcfb324.zip | |
| -rw-r--r-- | src/cz/crcs/ectester/standalone/consts/KeyPairGeneratorIdent.java | 4 | ||||
| -rw-r--r-- | src/cz/crcs/ectester/standalone/libs/jni/Makefile | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/cz/crcs/ectester/standalone/consts/KeyPairGeneratorIdent.java b/src/cz/crcs/ectester/standalone/consts/KeyPairGeneratorIdent.java index 8e67967..332b78e 100644 --- a/src/cz/crcs/ectester/standalone/consts/KeyPairGeneratorIdent.java +++ b/src/cz/crcs/ectester/standalone/consts/KeyPairGeneratorIdent.java @@ -15,8 +15,8 @@ public class KeyPairGeneratorIdent extends Ident { ALL.add(new KeyPairGeneratorIdent("ECDSA")); ALL.add(new KeyPairGeneratorIdent("ECDHC")); ALL.add(new KeyPairGeneratorIdent("ECMQV")); - ALL.add(new KeyPairGeneratorIdent("ECGOST3410")); - ALL.add(new KeyPairGeneratorIdent("ECGOST3410-2012")); + //ALL.add(new KeyPairGeneratorIdent("ECGOST3410")); + //ALL.add(new KeyPairGeneratorIdent("ECGOST3410-2012")); // ECKCDSA? Botan provides. ALL.add(new KeyPairGeneratorIdent("ECKCDSA")); // ECGDSA? Botan provides. diff --git a/src/cz/crcs/ectester/standalone/libs/jni/Makefile b/src/cz/crcs/ectester/standalone/libs/jni/Makefile index 9c3557c..14491bb 100644 --- a/src/cz/crcs/ectester/standalone/libs/jni/Makefile +++ b/src/cz/crcs/ectester/standalone/libs/jni/Makefile @@ -38,6 +38,7 @@ CC?=gcc CXX?=g++ STRIP?=strip +LFLAGS+="-fPIC -g -shared" CFLAGS+=-fPIC -g -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I. CXXFLAGS+=-fPIC -g -I"$(JNI_INCLUDEDIR)" -I"$(JNI_PLATFORMINCLUDEDIR)" -I. @@ -54,15 +55,15 @@ cpp_utils.o: cpp_utils.cpp # OpenSSL shim openssl_provider.so: openssl.o c_utils.o - $(CC) -fPIC -g -shared -o $@ $^ -L. $(shell pkg-config --libs openssl) + $(CC) $(LFLAGS) -o $@ $^ -L. $(shell pkg-config --libs openssl) openssl.o: openssl.c - $(CC) $(shel pkg-config --cflags openssl) $(CFLAGS) -c $< + $(CC) $(shell pkg-config --cflags openssl) $(CFLAGS) -c $< # Libtomcrypt shim tomcrypt_provider.so: tomcrypt.o c_utils.o - $(CC) -fPIC -g -shared -o $@ $^ -L. -ltommath $(shell pkg-config --libs libtomcrypt) + $(CC) $(LFLAGS) -o $@ $^ -L. -ltommath $(shell pkg-config --libs libtomcrypt) tomcrypt.o: tomcrypt.c $(CC) -DLTM_DESC $(shell pkg-config --cflags libtomcrypt) $(CFLAGS) -c $< @@ -70,7 +71,7 @@ tomcrypt.o: tomcrypt.c # Botan-2 shim botan_provider.so: botan.o cpp_utils.o - $(CXX) -fPIC -g -shared -o $@ $^ -L. $(shell pkg-config --libs botan-2) + $(CXX) $(LFLAGS) -o $@ $^ -L. $(shell pkg-config --libs botan-2) botan.o: botan.cpp $(CXX) $(shell pkg-config --cflags botan-2) $(CXXFLAGS) -c $< @@ -78,7 +79,7 @@ botan.o: botan.cpp # Crypto++ shim cryptopp_provider.so: cryptopp.o cpp_utils.o - $(CXX) -fPIC -g -shared -o $@ $^ -L. $(shell pkg-config --libs libcrypto++) + $(CXX) $(LFLAGS) -o $@ $^ -L. $(shell pkg-config --libs libcrypto++) cryptopp.o: cryptopp.cpp $(CXX) $(shell pkg-config --cflags libcrypto++) $(CXXFLAGS) -c $< |