Give libraries a name in Java.

18 files changed, 25 insertions, 25 deletions

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
index 53e9024..72ac87e 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -296,7 +296,8 @@ public class ECTesterStandalone {
         for (ProviderECLibrary lib : libs) {
             if (lib.isInitialized() && (cfg.selected == null || lib == cfg.selected)) {
                 System.out.println("\t- " + Colors.bold(lib.name()));
-                System.out.println(Colors.bold("\t\t- Version: ") + String.format("%f", lib.getProvider().getVersion()));
+                System.out.println(Colors.bold("\t\t- Fullname: ") + lib.getProvider().getName());
+                System.out.println(Colors.bold("\t\t- Version: ") + lib.getProvider().getVersionStr());
                 System.out.println(Colors.bold("\t\t- Supports native timing: ") + lib.getNativeTimingSupport().toString());
                 Set<KeyPairGeneratorIdent> kpgs = lib.getKPGs();
                 if (!kpgs.isEmpty()) {
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
index 60ca5d9..af4d969 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BoringsslLib.java
@@ -8,7 +8,7 @@ import java.util.Set;
  */
 public class BoringsslLib extends NativeECLibrary {
     public BoringsslLib() {
-        super("boringssl_provider", "lib_boringssl.so");
+        super("BoringSSL", "boringssl_provider", "lib_boringssl.so");
     }
 
     @Override
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 cd28791..e8f6e13 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_provider", "botan-2");
+        super("Botan", "botan_provider", "botan-2");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BouncyCastleLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BouncyCastleLib.java
index 6c06adc..e8a4d30 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BouncyCastleLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/BouncyCastleLib.java
@@ -13,7 +13,7 @@ import java.util.TreeSet;
 public class BouncyCastleLib extends ProviderECLibrary {
 
     public BouncyCastleLib() {
-        super(new BouncyCastleProvider());
+        super("BouncyCastle", new BouncyCastleProvider());
     }
 
     @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 5112d7d..66aa9ea 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("cryptopp_provider", "cryptopp");
+        super("Crypto++","cryptopp_provider", "cryptopp");
     }
 
     @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 a0a7fc8..83d78ef 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("gcrypt_provider", "gcrypt", "gpg-error");
+        super("libgcrypt","gcrypt_provider", "gcrypt", "gpg-error");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/IppcpLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/IppcpLib.java
index 0dec0a2..115fe00 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/IppcpLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/IppcpLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class IppcpLib extends NativeECLibrary {
 
     public IppcpLib() {
-        super("ippcp_provider", "lib_ippcp.so");
+        super("IPPCP", "ippcp_provider", "lib_ippcp.so");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
index cee4e4d..2dba049 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/LibresslLib.java
@@ -8,7 +8,7 @@ import java.util.Set;
  */
 public class LibresslLib extends NativeECLibrary {
     public LibresslLib() {
-        super("libressl_provider", "lib_libressl.so");
+        super("LibreSSL", "libressl_provider", "lib_libressl.so");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MbedTLSLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MbedTLSLib.java
index 5c0ad12..e44598c 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MbedTLSLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MbedTLSLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class MbedTLSLib extends NativeECLibrary {
 
     public MbedTLSLib() {
-        super("mbedtls_provider", "lib_mbedtls.so");
+        super("mbedTLS", "mbedtls_provider", "lib_mbedtls.so");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MscngLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MscngLib.java
index 527a65b..77879db 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MscngLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MscngLib.java
@@ -9,7 +9,7 @@ import java.util.Set;
 public class MscngLib extends NativeECLibrary {
 
     public MscngLib() {
-        super("mscng_provider", "bcrypt");
+        super("MicrosoftCNG", "mscng_provider", "bcrypt");
     }
 
     @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 ba016b7..7f9d96e 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
@@ -15,8 +15,8 @@ public abstract class NativeECLibrary extends ProviderECLibrary {
     private final String resource;
     private final String[] requriements;
 
-
-    public NativeECLibrary(String resource, String... requirements) {
+    public NativeECLibrary(String name, String resource, String... requirements) {
+        super(name);
         this.resource = resource;
         this.requriements = requirements;
     }
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 00e3b39..6b60779 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
@@ -9,7 +9,7 @@ import java.util.Set;
 public class NettleLib extends NativeECLibrary {
 
     public NettleLib() {
-        super("nettle_provider", "nettle","hogweed", "gmp");
+        super("Nettle", "nettle_provider", "nettle","hogweed", "gmp");
     }
 
     @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 e558336..61f00a4 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_provider", "crypto");
+        super("OpenSSL", "openssl_provider", "crypto");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java
index dd8e49c..a9a49e9 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/ProviderECLibrary.java
@@ -15,14 +15,16 @@ import java.util.function.Function;
  * @author Jan Jancar johny@neuromancer.sk
  */
 public abstract class ProviderECLibrary implements ECLibrary {
+    String name;
     Provider provider;
     private boolean initialized = false;
 
-    public ProviderECLibrary() {
-
+    public ProviderECLibrary(String name) {
+        this.name = name;
     }
 
-    public ProviderECLibrary(Provider provider) {
+    public ProviderECLibrary(String name, Provider provider) {
+        this.name = name;
         this.provider = provider;
     }
 
@@ -99,7 +101,7 @@ public abstract class ProviderECLibrary implements ECLibrary {
 
     @Override
     public String name() {
-        return provider.getInfo();
+        return name;
     }
 
     public Provider getProvider() {
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/SunECLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/SunECLib.java
index 3aec842..7209dc3 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/SunECLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/SunECLib.java
@@ -11,7 +11,7 @@ import java.util.TreeSet;
 public class SunECLib extends ProviderECLibrary {
 
     public SunECLib() {
-        super(new SunEC());
+        super("SunEC", new SunEC());
     }
 
     @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 78db00e..8c000a2 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_provider", "tommath", "tomcrypt");
+        super("tomcrypt","tomcrypt_provider", "tommath", "tomcrypt");
     }
 
     @Override
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/WolfCryptLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/WolfCryptLib.java
index ff592d1..c8d5ad5 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/WolfCryptLib.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/WolfCryptLib.java
@@ -8,7 +8,7 @@ import java.util.Set;
 public class WolfCryptLib extends ProviderECLibrary {
 
     public WolfCryptLib() {
-        super(new WolfCryptProvider());
+        super("wolfCrypt", new WolfCryptProvider());
     }
 
     @Override
diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/ippcp.c b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/ippcp.c
index decf496..2f876d2 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/ippcp.c
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/ippcp.c
@@ -55,10 +55,7 @@ JNIEXPORT jobject JNICALL Java_cz_crcs_ectester_standalone_libs_IppcpLib_createP
 	jmethodID init = (*env)->GetMethodID(env, local_provider_class, "<init>", "(Ljava/lang/String;DLjava/lang/String;)V");
 
 	const IppLibraryVersion *lib = ippcpGetLibVersion();
-	char full_name[strlen("ippcp ") + strlen(lib->Name) + 1];
-	strcpy(full_name, "ippcp ");
-	strcat(full_name, lib->Name);
-	jstring name = (*env)->NewStringUTF(env, full_name);
+	jstring name = (*env)->NewStringUTF(env, lib->Name);
 	double version = (double)lib->major + ((double)lib->minor / 10);
 	jstring info = (*env)->NewStringUTF(env, lib->Version);