8 files changed, 16 insertions, 18 deletions

diff --git a/src/cz/crcs/ectester/reader/CardMngr.java b/src/cz/crcs/ectester/reader/CardMngr.java
index 8f88ebb..8b6241d 100644
--- a/src/cz/crcs/ectester/reader/CardMngr.java
+++ b/src/cz/crcs/ectester/reader/CardMngr.java
@@ -352,7 +352,7 @@ public class CardMngr {
         return responseAPDU;
     }
 
-    public ResponseAPDU sendAPDU(byte apdu[]) throws CardException {
+    public ResponseAPDU sendAPDU(byte[] apdu) throws CardException {
         CommandAPDU commandAPDU = new CommandAPDU(apdu);
         return sendAPDU(commandAPDU);
     }
diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index dc49656..e5e6061 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -911,7 +911,7 @@ public class ECTesterReader {
             }
 
             format = cli.getOptionValue("format");
-            String formats[] = new String[]{"text", "xml", "yaml", "yml"};
+            String[] formats = new String[]{"text", "xml", "yaml", "yml"};
             if (format != null && !Arrays.asList(formats).contains(format)) {
                 System.err.println(Colors.error("Wrong output format " + format + ". Should be one of " + Arrays.toString(formats)));
                 return false;
diff --git a/src/cz/crcs/ectester/reader/command/Command.java b/src/cz/crcs/ectester/reader/command/Command.java
index 1ebd8bb..bf2441f 100644
--- a/src/cz/crcs/ectester/reader/command/Command.java
+++ b/src/cz/crcs/ectester/reader/command/Command.java
@@ -33,7 +33,7 @@ public abstract class Command implements Cloneable {
     // and for the even more stupid module system, which cannot properly work
     // with the fact that JCardSim has some java.* packages...
     final byte[] GOD_DAMN_JAVA_BUG_6474858_AND_GOD_DAMN_JAVA_12_MODULE_SYSTEM = new byte[]{0};
-    
+
 
     Command(CardMngr cardManager) {
         this.cardManager = cardManager;
diff --git a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
index 9add072..fc41805 100644
--- a/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
+++ b/src/cz/crcs/ectester/reader/output/XMLTestWriter.java
@@ -114,7 +114,7 @@ public class XMLTestWriter extends BaseXMLTestWriter {
             Response.GetInfo info = new Command.GetInfo(card).send();
             result.setAttribute("version", info.getVersion());
             result.setAttribute("javacard", String.format("%.1f", info.getJavaCardVersion()));
-            result.setAttribute("base", String.format("%#x",info.getBase()));
+            result.setAttribute("base", String.format("%#x", info.getBase()));
             result.setAttribute("cleanup", String.valueOf(info.getCleanupSupport()));
             Element arrays = doc.createElement("arrays");
             Element apduBuf = doc.createElement("length");
diff --git a/src/cz/crcs/ectester/reader/response/Response.java b/src/cz/crcs/ectester/reader/response/Response.java
index 0dded7c..6232423 100644
--- a/src/cz/crcs/ectester/reader/response/Response.java
+++ b/src/cz/crcs/ectester/reader/response/Response.java
@@ -474,11 +474,11 @@ public abstract class Response {
             byte major = (byte) (jcVersion >> 8);
             byte minor = (byte) (jcVersion & 0xff);
             int minorSize;
-			if (minor == 0) {
-				minorSize = 1;
-			} else {
-				minorSize = (int) Math.ceil(Math.log10(minor));				
-			}
+            if (minor == 0) {
+                minorSize = 1;
+            } else {
+                minorSize = (int) Math.ceil(Math.log10(minor));
+            }
             return (major + ((float) (minor) / (minorSize * 10)));
         }
 
diff --git a/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java b/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
index 29e2ef9..ebece61 100644
--- a/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardDefaultSuite.java
@@ -10,7 +10,6 @@ import cz.crcs.ectester.common.util.CardUtil;
 import cz.crcs.ectester.reader.CardMngr;
 import cz.crcs.ectester.reader.ECTesterReader;
 import cz.crcs.ectester.reader.command.Command;
-import cz.crcs.ectester.reader.response.Response;
 import javacard.security.KeyPair;
 
 import java.util.LinkedList;
diff --git a/src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java b/src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java
index f5ea86f..53f3b6b 100644
--- a/src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java
@@ -92,7 +92,7 @@ public class CardEdgeCasesSuite extends CardTestSuite {
                                 int firstDiff = ByteUtil.diffBytes(dh.getSecret(), 0, value.getData(0), 0, dh.secretLength());
                                 System.err.println(ByteUtil.bytesToHex(dh.getSecret()));
                                 System.err.println(ByteUtil.bytesToHex(value.getData(0)));
-                                return new Result(Result.Value.FAILURE, "ECDH derived secret does not match the test-vector, first difference was at byte " + String.valueOf(firstDiff) + ".");
+                                return new Result(Result.Value.FAILURE, "ECDH derived secret does not match the test-vector, first difference was at byte " + firstDiff + ".");
                             }
                             return new Result(Result.Value.SUCCESS);
                         }
@@ -154,7 +154,7 @@ public class CardEdgeCasesSuite extends CardTestSuite {
                 continue;
             }
             Test set = CommandTest.expect(new Command.Set(this.card, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), Result.ExpectedValue.SUCCESS);
-            Test generate = CommandTest.expect(new Command.Generate(this.card, ECTesterApplet.KEYPAIR_LOCAL), Result.ExpectedValue.SUCCESS);
+            Test generate = genOrPreset(curve, Result.ExpectedValue.SUCCESS);
             CommandTest export = CommandTest.expect(new Command.Export(this.card, ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.KEY_PUBLIC, EC_Consts.PARAMETER_W), Result.ExpectedValue.SUCCESS);
             Test setup = runTest(CompoundTest.all(Result.ExpectedValue.SUCCESS, "KeyPair setup.", key, set, generate, export));
 
@@ -162,11 +162,11 @@ public class CardEdgeCasesSuite extends CardTestSuite {
             BigInteger p = new BigInteger(1, pParam);
             byte[] wParam = ((Response.Export) export.getResponse()).getParameter(ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.PARAMETER_W);
             byte[] yValue = new byte[(wParam.length - 1) / 2];
-            System.arraycopy(wParam, (wParam.length/2) + 1, yValue, 0, yValue.length);
+            System.arraycopy(wParam, (wParam.length / 2) + 1, yValue, 0, yValue.length);
             BigInteger y = new BigInteger(1, yValue);
             BigInteger negY = p.subtract(y);
             byte[] newY = ECUtil.toByteArray(negY, curve.getBits());
-            System.arraycopy(newY, 0, wParam, (wParam.length/2) + 1, newY.length);
+            System.arraycopy(newY, 0, wParam, (wParam.length / 2) + 1, newY.length);
 
             EC_Params negYParams = makeParams(newY);
             Test negYTest = ecdhTest(new Command.Set(this.card, ECTesterApplet.KEYPAIR_LOCAL, EC_Consts.CURVE_external, negYParams.getParams(), negYParams.flatten()), "ECDH with pubkey negated.", Result.ExpectedValue.FAILURE, Result.ExpectedValue.FAILURE);
@@ -302,7 +302,7 @@ public class CardEdgeCasesSuite extends CardTestSuite {
             if (nearR.compareTo(r) >= 0) {
                 rTests[i++] = ecdhTest(new Command.Set(this.card, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, params.getParams(), params.flatten()), nearR.toString(16) + " (>=r)", Result.ExpectedValue.FAILURE, Result.ExpectedValue.FAILURE);
             } else {
-                rTests[i++] = ecdhTestBoth(new Command.Set(this.card, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, params.getParams(), params.flatten()), nearR.toString(16) +" (<r)", Result.ExpectedValue.SUCCESS, Result.ExpectedValue.SUCCESS);
+                rTests[i++] = ecdhTestBoth(new Command.Set(this.card, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, params.getParams(), params.flatten()), nearR.toString(16) + " (<r)", Result.ExpectedValue.SUCCESS, Result.ExpectedValue.SUCCESS);
             }
         }
         Test rTest = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Near r.", rTests);
diff --git a/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java b/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java
index fec1a64..b6dc904 100644
--- a/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardTestVectorSuite.java
@@ -31,7 +31,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static cz.crcs.ectester.common.test.Result.ExpectedValue;
@@ -86,7 +85,7 @@ public class CardTestVectorSuite extends CardTestSuite {
                         return new Result(Value.FAILURE, "ECDH response did not contain the derived secret.");
                     if (!ByteUtil.compareBytes(dh.getSecret(), 0, result.getData(0), 0, dh.secretLength())) {
                         int firstDiff = ByteUtil.diffBytes(dh.getSecret(), 0, result.getData(0), 0, dh.secretLength());
-                        return new Result(Value.FAILURE, "ECDH derived secret does not match the test-vector, first difference was at byte " + String.valueOf(firstDiff) + ".");
+                        return new Result(Value.FAILURE, "ECDH derived secret does not match the test-vector, first difference was at byte " + firstDiff + ".");
                     }
                     return new Result(Value.SUCCESS);
                 }
@@ -183,7 +182,7 @@ public class CardTestVectorSuite extends CardTestSuite {
                         if (diff == secret.length) {
                             return new Result(Value.SUCCESS, "Derived secret matched expected value.");
                         } else {
-                            return new Result(Value.FAILURE, "Derived secret does not match expected value, first difference was at byte " + String.valueOf(diff) + ".");
+                            return new Result(Value.FAILURE, "Derived secret does not match expected value, first difference was at byte " + diff + ".");
                         }
                     } catch (InvalidKeyException ex) {
                         return new Result(Value.SUCCESS, "Result could not be verified. " + ex.getMessage());