diff options
Diffstat (limited to 'standalone')
19 files changed, 80 insertions, 86 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 5d3bad2..57ab98f 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java @@ -81,7 +81,7 @@ public class ECTesterStandalone { private static final String CLI_HEADER = "\n" + DESCRIPTION + "\n\n"; private static final String CLI_FOOTER = "\n" + LICENSE; - public static String LIB_RESOURCE_DIR = "/cz/crcs/ectester/standalone/libs/jni/"; + public static final String LIB_RESOURCE_DIR = "/cz/crcs/ectester/standalone/libs/jni/"; private void run(String[] args) { try { @@ -109,7 +109,7 @@ public class ECTesterStandalone { } List<ProviderECLibrary> libObjects = new LinkedList<>(); - Class[] libClasses = new Class[]{SunECLib.class, + Class<?>[] libClasses = new Class[]{SunECLib.class, BouncyCastleLib.class, TomcryptLib.class, BotanLib.class, @@ -124,12 +124,11 @@ public class ECTesterStandalone { MatrixsslLib.class, NettleLib.class, LibresslLib.class}; - for (Class c : libClasses) { + for (Class<?> c : libClasses) { try { libObjects.add((ProviderECLibrary) c.getDeclaredConstructor().newInstance()); } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | - InvocationTargetException e) { - + InvocationTargetException ignored) { } } libs = libObjects.toArray(new ProviderECLibrary[0]); @@ -302,15 +301,15 @@ public class ECTesterStandalone { System.out.println(Colors.bold("\t\t- Supports native timing: ") + lib.getNativeTimingSupport().toString()); Set<KeyPairGeneratorIdent> kpgs = lib.getKPGs(); if (!kpgs.isEmpty()) { - System.out.println(Colors.bold("\t\t- KeyPairGenerators: ") + String.join(", ", kpgs.stream().map(KeyPairGeneratorIdent::getName).collect(Collectors.toList()))); + System.out.println(Colors.bold("\t\t- KeyPairGenerators: ") + kpgs.stream().map(KeyPairGeneratorIdent::getName).collect(Collectors.joining(", "))); } Set<KeyAgreementIdent> eckas = lib.getKAs(); if (!eckas.isEmpty()) { - System.out.println(Colors.bold("\t\t- KeyAgreements: ") + String.join(", ", eckas.stream().map(KeyAgreementIdent::getName).collect(Collectors.toList()))); + System.out.println(Colors.bold("\t\t- KeyAgreements: ") + eckas.stream().map(KeyAgreementIdent::getName).collect(Collectors.joining(", "))); } Set<SignatureIdent> sigs = lib.getSigs(); if (!sigs.isEmpty()) { - System.out.println(Colors.bold("\t\t- Signatures: ") + String.join(", ", sigs.stream().map(SignatureIdent::getName).collect(Collectors.toList()))); + System.out.println(Colors.bold("\t\t- Signatures: ") + sigs.stream().map(SignatureIdent::getName).collect(Collectors.joining(", "))); } Set<String> curves = lib.getCurves(); if (!curves.isEmpty()) { @@ -352,15 +351,15 @@ public class ECTesterStandalone { private void listIdents() { System.out.println(Colors.bold("\t- KeyPairGenerator")); for (KeyPairGeneratorIdent kpgIdent : KeyPairGeneratorIdent.list()) { - System.out.println("\t\t- " + Colors.underline(kpgIdent.getName()) + " " + kpgIdent.toString()); + System.out.println("\t\t- " + Colors.underline(kpgIdent.getName()) + " " + kpgIdent); } System.out.println(Colors.bold("\t- KeyAgreement")); for (KeyAgreementIdent kaIdent : KeyAgreementIdent.list()) { - System.out.println("\t\t- " + Colors.underline(kaIdent.getName()) + " " + kaIdent.toString()); + System.out.println("\t\t- " + Colors.underline(kaIdent.getName()) + " " + kaIdent); } System.out.println(Colors.bold("\t- Signature")); for (SignatureIdent sigIdent : SignatureIdent.list()) { - System.out.println("\t\t- " + Colors.underline(sigIdent.getName()) + " " + sigIdent.toString()); + System.out.println("\t\t- " + Colors.underline(sigIdent.getName()) + " " + sigIdent); } } @@ -443,7 +442,7 @@ public class ECTesterStandalone { } String hashAlgo = kaIdent.getBaseAlgo() != null ? String.format("[%s]", kaIdent.getBaseAlgo()) : "[NONE]"; - out.println(String.format("index;time[%s];pubW;privS;secret%s", timeUnit, hashAlgo)); + out.printf("index;time[%s];pubW;privS;secret%s%n", timeUnit, hashAlgo); KeyPair one = null; if (cli.hasOption("ecdh.fixed-private") && !cli.hasOption("ecdh.named-private") && !cli.hasOption("ecdh.private")) { @@ -500,7 +499,7 @@ public class ECTesterStandalone { String pub = ByteUtil.bytesToHex(ECUtil.toX962Uncompressed(pubkey.getW(), pubkey.getParams()), false); String priv = ByteUtil.bytesToHex(privkey.getS().toByteArray(), false); String dh = ByteUtil.bytesToHex(result, false); - out.println(String.format("%d;%d;%s;%s;%s", i, elapsed, pub, priv, dh)); + out.printf("%d;%d;%s;%s;%s%n", i, elapsed, pub, priv, dh); } if (cli.hasOption("ecdh.output")) { @@ -599,7 +598,7 @@ public class ECTesterStandalone { } String hashAlgoOut = sigIdent.getHashAlgo() != null ? String.format("[%s]", sigIdent.getHashAlgo()) : ""; - out.println(String.format("index;signTime[%s];verifyTime[%s];data;pubW;privS;signature%s;nonce;verified", timeUnit, timeUnit, hashAlgoOut)); + out.printf("index;signTime[%s];verifyTime[%s];data;pubW;privS;signature%s;nonce;verified%n", timeUnit, timeUnit, hashAlgoOut); ECPrivateKey privkey = (ECPrivateKey) ECUtil.loadKey(EC_Consts.PARAMETER_S, cli.getOptionValue("ecdsa.named-private"), cli.getOptionValue("ecdsa.private"), spec); ECPublicKey pubkey = (ECPublicKey) ECUtil.loadKey(EC_Consts.PARAMETER_W, cli.getOptionValue("ecdsa.named-public"), cli.getOptionValue("ecdsa.public"), spec); @@ -670,7 +669,7 @@ public class ECTesterStandalone { k = ByteUtil.bytesToHex(kValue.toByteArray(), false); } } - out.println(String.format("%d;%d;%d;%s;%s;%s;%s;%s;%d", i, signTime, verifyTime, dataString, pub, priv, sign, k, verified ? 1 : 0)); + out.printf("%d;%d;%d;%s;%s;%s;%s;%s;%d%n", i, signTime, verifyTime, dataString, pub, priv, sign, k, verified ? 1 : 0); } if (cli.hasOption("ecdsa.output")) { @@ -730,7 +729,7 @@ public class ECTesterStandalone { out = System.out; } - out.println(String.format("index;time[%s];pubW;privS", timeUnit)); + out.printf("index;time[%s];pubW;privS%n", timeUnit); int amount = Integer.parseInt(cli.getOptionValue("generate.amount", "1")); for (int i = 0; i < amount || amount == 0; ++i) { @@ -745,7 +744,7 @@ public class ECTesterStandalone { String pub = ByteUtil.bytesToHex(ECUtil.toX962Uncompressed(publicKey.getW(), publicKey.getParams()), false); String priv = ByteUtil.bytesToHex(privateKey.getS().toByteArray(), false); - out.println(String.format("%d;%d;%s;%s", i, elapsed, pub, priv)); + out.printf("%d;%d;%s;%s%n", i, elapsed, pub, priv); } if (cli.hasOption("generate.output")) { @@ -898,11 +897,11 @@ public class ECTesterStandalone { matchedLibs.add(lib); } } - if (matchedLibs.size() == 0) { + if (matchedLibs.isEmpty()) { System.err.println("No library " + libraryName + " found."); return false; } else if (matchedLibs.size() > 1) { - System.err.println("Multiple matching libraries found: " + String.join(",", matchedLibs.stream().map(ECLibrary::name).collect(Collectors.toList()))); + System.err.println("Multiple matching libraries found: " + matchedLibs.stream().map(ECLibrary::name).collect(Collectors.joining(","))); return false; } else { selected = matchedLibs.get(0); @@ -937,7 +936,7 @@ public class ECTesterStandalone { if (cli.hasOption(next + ".time-source")) { String source = cli.getOptionValue(next + ".time-source"); if (!selected.getNativeTimingSupport().contains(source)) { - System.err.println(String.format("Time source %s unavailable for library %s.", source, selected.name())); + System.err.printf("Time source %s unavailable for library %s.%n", source, selected.name()); return false; } } diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/consts/Ident.java b/standalone/src/main/java/cz/crcs/ectester/standalone/consts/Ident.java index fcc811d..fa5dffa 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/consts/Ident.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/consts/Ident.java @@ -6,8 +6,8 @@ import java.util.*; import java.util.function.BiFunction; public abstract class Ident { - Set<String> idents; - String name; + final Set<String> idents; + final String name; public Ident(String name, String... aliases) { this.name = name; 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 c6600f9..6c06adc 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 @@ -19,7 +19,7 @@ public class BouncyCastleLib extends ProviderECLibrary { @Override public Set<String> getCurves() { Set<String> result = new TreeSet<>(); - Enumeration names = ECNamedCurveTable.getNames(); + Enumeration<?> names = ECNamedCurveTable.getNames(); while (names.hasMoreElements()) { result.add((String) names.nextElement()); } 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 2f469aa..ba016b7 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 @@ -3,7 +3,6 @@ package cz.crcs.ectester.standalone.libs; import cz.crcs.ectester.common.util.FileUtil; import cz.crcs.ectester.standalone.ECTesterStandalone; -import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.security.Provider; @@ -13,8 +12,8 @@ import java.util.Set; * @author Jan Jancar johny@neuromancer.sk */ public abstract class NativeECLibrary extends ProviderECLibrary { - private String resource; - private String[] requriements; + private final String resource; + private final String[] requriements; public NativeECLibrary(String resource, String... requirements) { @@ -36,7 +35,6 @@ public abstract class NativeECLibrary extends ProviderECLibrary { /* Write the shim. */ boolean found = FileUtil.writeNewer(ECTesterStandalone.LIB_RESOURCE_DIR + resource + "." + suffix, libPath); if (!found) { - //System.err.printf("Resource %s not found.\n", resource); return false; } @@ -48,7 +46,6 @@ public abstract class NativeECLibrary extends ProviderECLibrary { Path reqPath = libReqDir.resolve(requirement); found = FileUtil.writeNewer(ECTesterStandalone.LIB_RESOURCE_DIR + requirement, reqPath); if (!found) { - //System.err.printf("Requirement %s not found for %s.\n", requirement, resource); return false; } System.load(reqPath.toString()); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java index 81bd387..34f04e9 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java @@ -12,9 +12,9 @@ import java.security.spec.ECParameterSpec; */ @SuppressWarnings("serial") public abstract class NativeECPrivateKey implements ECPrivateKey { - private String algorithm; - private String format; - ECParameterSpec params; + private final String algorithm; + private final String format; + final ECParameterSpec params; public NativeECPrivateKey(String algorithm, String format, ECParameterSpec params) { this.algorithm = algorithm; @@ -41,7 +41,7 @@ public abstract class NativeECPrivateKey implements ECPrivateKey { @SuppressWarnings("serial") private static class Raw extends NativeECPrivateKey { - byte[] keyData; + final byte[] keyData; public Raw(byte[] keyData, ECParameterSpec params) { super("EC", "raw", params); @@ -138,11 +138,11 @@ public abstract class NativeECPrivateKey implements ECPrivateKey { // 0 -> implicit (meta = curveName UTF16, header = full); // 1 -> explicit (meta = null, header = full); // 2 -> nist (meta = null, header = full) - private int flag; - private byte[] meta = null; - private byte[] header; - private byte[] x; - private byte[] y; + private final int flag; + private final byte[] meta; + private final byte[] header; + private final byte[] x; + private final byte[] y; public Mscng(int flag, byte[] meta, byte[] header, byte[] x, byte[] y, byte[] keyData, ECParameterSpec params) { super(keyData, params); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java index 7a8de83..16d903d 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java @@ -13,9 +13,9 @@ import java.security.spec.ECPoint; */ @SuppressWarnings("serial") public abstract class NativeECPublicKey implements ECPublicKey { - private String algorithm; - private String format; - ECParameterSpec params; + private final String algorithm; + private final String format; + final ECParameterSpec params; public NativeECPublicKey(String algorithm, String format, ECParameterSpec params) { this.algorithm = algorithm; @@ -139,11 +139,11 @@ public abstract class NativeECPublicKey implements ECPublicKey { // 0 -> implicit (meta = curveName UTF16, header = full); // 1 -> explicit (meta = null, header = full); // 2 -> nist (meta = null, header = full) - private int flag; - private byte[] meta = null; - private byte[] header; - private byte[] x; - private byte[] y; + private final int flag; + private final byte[] meta; + private final byte[] header; + private final byte[] x; + private final byte[] y; public Mscng(int flag, byte[] meta, byte[] header, byte[] x, byte[] y, ECParameterSpec params) { super(ByteUtil.concatenate(new byte[]{0x04}, x, y), params); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java index 1e68f78..938af73 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java @@ -146,7 +146,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Botan extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Botan(String type) { this.type = type; @@ -196,7 +196,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Cryptopp extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Cryptopp(String type) { this.type = type; @@ -216,7 +216,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Openssl extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Openssl(String type) { this.type = type; @@ -236,7 +236,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Boringssl extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Boringssl(String type) { this.type = type; @@ -256,7 +256,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Gcrypt extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Gcrypt(String type) { this.type = type; @@ -277,7 +277,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { public abstract static class Mscng extends ExtendedKeyAgreementSpi { - private String type; + private final String type; public Mscng(String type) { this.type = type; @@ -315,7 +315,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class MbedTLS extends SimpleKeyAgreementSpi { - private String type; + private final String type; public MbedTLS(String type) { this.type = type; @@ -335,7 +335,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Ippcp extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Ippcp(String type) { this.type = type; @@ -355,7 +355,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Matrixssl extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Matrixssl(String type) { this.type = type; @@ -375,7 +375,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Libressl extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Libressl(String type) { this.type = type; @@ -389,7 +389,7 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } public abstract static class Nettle extends SimpleKeyAgreementSpi { - private String type; + private final String type; public Nettle(String type) { this.type = type; diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyPairGeneratorSpi.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyPairGeneratorSpi.java index 636f423..4b5d652 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyPairGeneratorSpi.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyPairGeneratorSpi.java @@ -5,10 +5,8 @@ import cz.crcs.ectester.data.EC_Store; import java.security.*; import java.security.spec.AlgorithmParameterSpec; -import java.security.AlgorithmParameters; import java.security.spec.ECGenParameterSpec; import java.security.spec.ECParameterSpec; -import java.security.spec.InvalidParameterSpecException; /** * @author Jan Jancar johny@neuromancer.sk @@ -89,7 +87,7 @@ public abstract class NativeKeyPairGeneratorSpi extends KeyPairGeneratorSpi { } public static abstract class Botan extends NativeKeyPairGeneratorSpi { - private String type; + private final String type; public Botan(String type) { this.type = type; @@ -137,7 +135,7 @@ public abstract class NativeKeyPairGeneratorSpi extends KeyPairGeneratorSpi { } public static abstract class Cryptopp extends NativeKeyPairGeneratorSpi { - private String type; + private final String type; public Cryptopp(String type) { this.type = type; @@ -225,7 +223,7 @@ public abstract class NativeKeyPairGeneratorSpi extends KeyPairGeneratorSpi { } public static abstract class Mscng extends NativeKeyPairGeneratorSpi { - private String type; + private final String type; public Mscng(String type) { this.type = type; diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java index d6e814c..fd8d5ca 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java @@ -121,7 +121,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Botan extends SimpleSignatureSpi { - private String type; + private final String type; public Botan(String type) { this.type = type; @@ -261,7 +261,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Cryptopp extends SimpleSignatureSpi { - private String type; + private final String type; public Cryptopp(String type) { this.type = type; @@ -310,7 +310,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Openssl extends SimpleSignatureSpi { - private String type; + private final String type; public Openssl(String type) { this.type = type; @@ -331,7 +331,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Boringssl extends SimpleSignatureSpi { - private String type; + private final String type; public Boringssl(String type) { this.type = type; @@ -352,7 +352,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Gcrypt extends SimpleSignatureSpi { - private String type; + private final String type; public Gcrypt(String type) { this.type = type; @@ -443,7 +443,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class MbedTLS extends SimpleSignatureSpi { - private String type; + private final String type; public MbedTLS(String type) { this.type = type; @@ -464,7 +464,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Ippcp extends SimpleSignatureSpi { - private String type; + private final String type; public Ippcp(String type) { this.type = type; @@ -485,7 +485,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Libressl extends SimpleSignatureSpi { - private String type; + private final String type; public Libressl(String type) { this.type = type; @@ -506,7 +506,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Matrixssl extends SimpleSignatureSpi { - private String type; + private final String type; public Matrixssl(String type) { this.type = type; @@ -527,7 +527,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Mscng extends ExtendedSignatureSpi { - private String type; + private final String type; public Mscng(String type) { this.type = type; @@ -569,7 +569,7 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } public abstract static class Nettle extends SimpleSignatureSpi { - private String type; + private final String type; public Nettle(String type) { this.type = type; diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java b/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java index d7be4dc..ba345e7 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java @@ -32,7 +32,7 @@ public class TextTestWriter extends BaseTextTestWriter { @Override protected String testableString(Testable t) { if (t instanceof StandaloneTestable) { - StandaloneTestable<?> testable = (StandaloneTestable) t; + StandaloneTestable<?> testable = (StandaloneTestable<?>) t; Enum<?> stage = testable.getStage(); String stageName = stage.name(); String exception = causeString(testable.getException()); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/output/XMLTestWriter.java b/standalone/src/main/java/cz/crcs/ectester/standalone/output/XMLTestWriter.java index 812634f..60751f5 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/output/XMLTestWriter.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/output/XMLTestWriter.java @@ -119,7 +119,7 @@ public class XMLTestWriter extends BaseXMLTestWriter { protected Element testableElement(Testable t) { Element result = doc.createElement("test"); if (t instanceof StandaloneTestable) { - StandaloneTestable<?> testable = (StandaloneTestable) t; + StandaloneTestable<?> testable = (StandaloneTestable<?>) t; if (t instanceof KeyGeneratorTestable) { result.setAttribute("type", "key-pair-generator"); result.appendChild(kgtElement((KeyGeneratorTestable) t)); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/output/YAMLTestWriter.java b/standalone/src/main/java/cz/crcs/ectester/standalone/output/YAMLTestWriter.java index ee8a199..664fa18 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/output/YAMLTestWriter.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/output/YAMLTestWriter.java @@ -92,7 +92,7 @@ public class YAMLTestWriter extends BaseYAMLTestWriter { protected Map<String, Object> testableObject(Testable t) { Map<String, Object> result = new LinkedHashMap<>(); if (t instanceof StandaloneTestable) { - StandaloneTestable<?> testable = (StandaloneTestable) t; + StandaloneTestable<?> testable = (StandaloneTestable<?>) t; if (t instanceof KeyGeneratorTestable) { result.put("type", "key-pair-generator"); result.put("key-pair-generator", kgtObject((KeyGeneratorTestable) t)); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java index fd48212..9a4a39a 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTest.java @@ -15,7 +15,7 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> { } public static KeyAgreementTest match(KeyAgreementTestable ka, byte[] expectedSecret) { - return new KeyAgreementTest(ka, new TestCallback<KeyAgreementTestable>() { + return new KeyAgreementTest(ka, new TestCallback<>() { @Override public Result apply(KeyAgreementTestable ka) { if (Arrays.equals(ka.getSecret(), expectedSecret)) { @@ -28,7 +28,7 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> { } public static KeyAgreementTest expect(KeyAgreementTestable ka, Result.ExpectedValue expected) { - return new KeyAgreementTest(ka, new TestCallback<KeyAgreementTestable>() { + return new KeyAgreementTest(ka, new TestCallback<>() { @Override public Result apply(KeyAgreementTestable keyAgreementTestable) { Result.Value value = Result.Value.fromExpected(expected, keyAgreementTestable.ok(), keyAgreementTestable.error()); @@ -38,7 +38,7 @@ public class KeyAgreementTest extends SimpleTest<KeyAgreementTestable> { } public static KeyAgreementTest expectError(KeyAgreementTestable ka, Result.ExpectedValue expected) { - return new KeyAgreementTest(ka, new TestCallback<KeyAgreementTestable>() { + return new KeyAgreementTest(ka, new TestCallback<>() { @Override public Result apply(KeyAgreementTestable keyAgreementTestable) { Result.Value value = Result.Value.fromExpected(expected, keyAgreementTestable.ok(), false); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java index 32f82cb..4ba0647 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTest.java @@ -13,7 +13,7 @@ public class KeyGeneratorTest extends SimpleTest<KeyGeneratorTestable> { } public static KeyGeneratorTest expect(KeyGeneratorTestable kg, Result.ExpectedValue expected) { - return new KeyGeneratorTest(kg, new TestCallback<KeyGeneratorTestable>() { + return new KeyGeneratorTest(kg, new TestCallback<>() { @Override public Result apply(KeyGeneratorTestable keyGenerationTestable) { Result.Value value = Result.Value.fromExpected(expected, keyGenerationTestable.ok(), keyGenerationTestable.error()); @@ -23,7 +23,7 @@ public class KeyGeneratorTest extends SimpleTest<KeyGeneratorTestable> { } public static KeyGeneratorTest expectError(KeyGeneratorTestable kg, Result.ExpectedValue expected) { - return new KeyGeneratorTest(kg, new TestCallback<KeyGeneratorTestable>() { + return new KeyGeneratorTest(kg, new TestCallback<>() { @Override public Result apply(KeyGeneratorTestable keyGenerationTestable) { Result.Value value = Result.Value.fromExpected(expected, keyGenerationTestable.ok(), false); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTestable.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTestable.java index c05d6e3..296ec3c 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTestable.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyGeneratorTestable.java @@ -10,7 +10,7 @@ import java.security.spec.ECParameterSpec; */ public class KeyGeneratorTestable extends StandaloneTestable<KeyGeneratorTestable.KeyGeneratorStage> { private KeyPair kp; - private KeyPairGenerator kpg; + private final KeyPairGenerator kpg; private int keysize = 0; private ECParameterSpec spec = null; diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java index 258ca12..318715d 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java @@ -19,7 +19,7 @@ public class PerformanceTest extends SimpleTest<BaseTestable> { private final String desc; private PerformanceTest(BaseTestable testable, int count, String desc) { - super(testable, new TestCallback<BaseTestable>() { + super(testable, new TestCallback<>() { @Override public Result apply(BaseTestable testable) { return new Result(Result.Value.SUCCESS); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTest.java index a817691..9c3048a 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTest.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTest.java @@ -13,7 +13,7 @@ public class SignatureTest extends SimpleTest<SignatureTestable> { } public static SignatureTest expect(SignatureTestable kg, Result.ExpectedValue expected) { - return new SignatureTest(kg, new TestCallback<SignatureTestable>() { + return new SignatureTest(kg, new TestCallback<>() { @Override public Result apply(SignatureTestable signatureTestable) { Result.Value value = Result.Value.fromExpected(expected, signatureTestable.ok(), signatureTestable.error()); @@ -23,7 +23,7 @@ public class SignatureTest extends SimpleTest<SignatureTestable> { } public static SignatureTest expectError(SignatureTestable kg, Result.ExpectedValue expected) { - return new SignatureTest(kg, new TestCallback<SignatureTestable>() { + return new SignatureTest(kg, new TestCallback<>() { @Override public Result apply(SignatureTestable signatureTestable) { Result.Value value = Result.Value.fromExpected(expected, signatureTestable.ok(), false); diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java index 1900bea..d4e0841 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java @@ -148,7 +148,7 @@ public class StandaloneEdgeCasesSuite extends StandaloneTestSuite { ECPublicKey ecpub = ECUtil.toPublicKey(EC_Store.getInstance().getObject(EC_Key.Public.class, openssl_bug.getOneKey())); KeyAgreement ka = kaIdent.getInstance(cfg.selected.getProvider()); KeyAgreementTestable testable = new KeyAgreementTestable(ka, ecpriv, ecpub); - Test ecdh = KeyAgreementTest.function(testable, new TestCallback<KeyAgreementTestable>() { + Test ecdh = KeyAgreementTest.function(testable, new TestCallback<>() { @Override public Result apply(KeyAgreementTestable testable) { if (!testable.ok()) { diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile index cc3f24f..be7449c 100644 --- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile +++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile @@ -39,7 +39,7 @@ ifneq ($(JAVA_HOME),) endif ifeq ($(JNI_INCLUDEDIR),) - $(error Could not determine JNI include dir. Try specifying either JAVA_HOME or JNI_INCLUDEDIR.) + $(error "Could not determine JNI include dir. Try specifying either JAVA_HOME or JNI_INCLUDEDIR.") endif TARGETTRIPLET := $(shell $(CC) -dumpmachine) |