Merge pull request #29 from quapka/build-with-nix

Build with Nix. Finally!

7 files changed, 12 insertions, 24 deletions

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BotanLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BotanLib.java
index c072e84..d3691df 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BotanLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BotanLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class BotanLib extends NativeECLibrary {
 
     public BotanLib() {
-        super("Botan", "botan_provider", "botan-2");
+        super("Botan", "botan_provider");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/CryptoppLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/CryptoppLib.java
index 25f2de4..4449f99 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/CryptoppLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/CryptoppLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class CryptoppLib extends NativeECLibrary {
 
     public CryptoppLib() {
-        super("Crypto++","cryptopp_provider", "cryptopp");
+        super("Crypto++","cryptopp_provider");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/GcryptLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/GcryptLib.java
index d1452a9..3647ab9 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/GcryptLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/GcryptLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class GcryptLib extends NativeECLibrary {
 
     public GcryptLib() {
-        super("libgcrypt","gcrypt_provider", "gcrypt", "gpg-error");
+        super("libgcrypt","gcrypt_provider");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java
index fb4e430..210a6e9 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NativeECLibrary.java
@@ -38,25 +38,13 @@ public abstract class NativeECLibrary extends ProviderECLibrary {
                 return false;
             }
 
-            /* Load the requirements, if they are bundled, write them in and load them. */
-            try {
-                for (String requirement : requriements) {
-                    if (requirement.endsWith(suffix)) {
-                        /* The requirement is bundled, write it */
-                        Path reqPath = libReqDir.resolve(requirement);
-                        found = FileUtil.write(ECTesterStandalone.LIB_RESOURCE_DIR + requirement, reqPath);
-                        if (!found) {
-                            return false;
-                        }
-                        System.load(reqPath.toString());
-                    } else {
-                        System.loadLibrary(requirement);
-                    }
+            /* Load the requirements, if they are bundled, write them in. */
+            for (String requirement : requriements) {
+                if (requirement.endsWith(suffix)) {
+                    /* The requirement is bundled, write it */
+                    Path reqPath = libReqDir.resolve(requirement);
+                    FileUtil.write(ECTesterStandalone.LIB_RESOURCE_DIR + requirement, reqPath);
                 }
-            } catch (UnsatisfiedLinkError ule) {
-                System.err.println(resource);
-                ule.printStackTrace();
-                return false;
             }
 
             System.load(libPath.toString());
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NettleLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NettleLib.java
index aa90c38..ea9cca3 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NettleLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/NettleLib.java
@@ -18,7 +18,7 @@ import java.util.Set;
 public class NettleLib extends NativeECLibrary {
 
     public NettleLib() {
-        super("Nettle", "nettle_provider", "nettle","hogweed", "gmp");
+        super("Nettle", "nettle_provider");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java
index 69c84bc..036739c 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/OpensslLib.java
@@ -8,7 +8,7 @@ import java.util.Set;
  */
 public class OpensslLib extends NativeECLibrary {
     public OpensslLib() {
-        super("OpenSSL", "openssl_provider", "crypto");
+        super("OpenSSL", "openssl_provider");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/TomcryptLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/TomcryptLib.java
index e499451..f1fac47 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/TomcryptLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/TomcryptLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class TomcryptLib extends NativeECLibrary {
 
     public TomcryptLib() {
-        super("tomcrypt","tomcrypt_provider", "tommath", "tomcrypt");
+        super("tomcrypt","tomcrypt_provider");
     }
 
     @Override