Merge pull request #14 from BenBE/master

Issues indicated by FindBugs

Author: jurajsomorovsky

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/ec/ICEPointReader.java

@@ -10,7 +10,6 @@
 
 import de.rub.nds.tlsattacker.tls.exceptions.ConfigurationException;
 import java.io.BufferedReader;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.math.BigInteger;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/HeartbleedAttack.java

@@ -16,7 +16,6 @@
 import de.rub.nds.tlsattacker.modifiablevariable.integer.ModifiableInteger;
 import de.rub.nds.tlsattacker.modifiablevariable.singlebyte.ModifiableByte;
 import de.rub.nds.tlsattacker.tls.config.ConfigHandler;
-import de.rub.nds.tlsattacker.tls.constants.ConnectionEnd;
 import de.rub.nds.tlsattacker.tls.protocol.heartbeat.HeartbeatMessage;
 import de.rub.nds.tlsattacker.tls.constants.ProtocolMessageType;
 import de.rub.nds.tlsattacker.tls.exceptions.WorkflowExecutionException;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/PaddingOracleAttack.java

@@ -8,11 +8,18 @@
  */
 package de.rub.nds.tlsattacker.attacks.impl;
 
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import de.rub.nds.tlsattacker.attacks.config.PaddingOracleCommandConfig;
-import de.rub.nds.tlsattacker.tls.Attacker;
 import de.rub.nds.tlsattacker.modifiablevariable.VariableModification;
 import de.rub.nds.tlsattacker.modifiablevariable.bytearray.ByteArrayModificationFactory;
 import de.rub.nds.tlsattacker.modifiablevariable.bytearray.ModifiableByteArray;
+import de.rub.nds.tlsattacker.tls.Attacker;
 import de.rub.nds.tlsattacker.tls.config.ConfigHandler;
 import de.rub.nds.tlsattacker.tls.constants.ConnectionEnd;
 import de.rub.nds.tlsattacker.tls.exceptions.WorkflowExecutionException;
@@ -26,11 +33,6 @@
 import de.rub.nds.tlsattacker.tls.workflow.WorkflowTrace;
 import de.rub.nds.tlsattacker.transport.TransportHandler;
 import de.rub.nds.tlsattacker.util.ArrayConverter;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * Executes a padding oracle attack check. It logs an error in case the tested
@@ -64,7 +66,7 @@ public void executeAttack(ConfigHandler configHandler) {
 	LOGGER.info("All the attack runs executed. The following messages arrived at the ends of the connections");
 	LOGGER.info("If there are different messages, this could indicate the server does not process padding correctly");
 
-	LinkedHashSet<ProtocolMessage> pmSet = new LinkedHashSet();
+	LinkedHashSet<ProtocolMessage> pmSet = new LinkedHashSet<>();
 	for (int i = 0; i < lastMessages.size(); i++) {
 	    ProtocolMessage pm = lastMessages.get(i);
 	    pmSet.add(pm);
@@ -118,7 +120,7 @@ public void executeAttackRound(ConfigHandler configHandler, Record record) {
     }
 
     private List<Record> createRecordsWithPlainData() {
-	List<Record> records = new LinkedList();
+	List<Record> records = new LinkedList<>();
 	for (int i = 0; i < 64; i++) {
 	    byte[] padding = createPaddingBytes(i);
 	    int messageSize = config.getBlockSize() - (padding.length % config.getBlockSize());
@@ -152,7 +154,7 @@ private Record createRecordWithPlainData(byte[] plain) {
     }
 
     private List<Record> createRecordsWithModifiedPadding() {
-	List<Record> records = new LinkedList();
+	List<Record> records = new LinkedList<>();
 
 	Record r = new Record();
 	ModifiableByteArray padding = new ModifiableByteArray();
@@ -165,7 +167,7 @@ private List<Record> createRecordsWithModifiedPadding() {
     }
 
     private List<Record> createRecordsWithModifiedMac() {
-	List<Record> records = new LinkedList();
+	List<Record> records = new LinkedList<>();
 
 	Record r = new Record();
 	ModifiableByteArray mac = new ModifiableByteArray();

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/mitm/MitMWorkflowExecutor.java

@@ -8,28 +8,30 @@
  */
 package de.rub.nds.tlsattacker.attacks.mitm;
 
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import de.rub.nds.tlsattacker.tls.constants.AlertLevel;
 import de.rub.nds.tlsattacker.tls.constants.ConnectionEnd;
-import de.rub.nds.tlsattacker.tls.exceptions.CryptoException;
 import de.rub.nds.tlsattacker.tls.constants.ProtocolMessageType;
+import de.rub.nds.tlsattacker.tls.exceptions.CryptoException;
 import de.rub.nds.tlsattacker.tls.exceptions.WorkflowExecutionException;
 import de.rub.nds.tlsattacker.tls.protocol.ProtocolMessage;
-import de.rub.nds.tlsattacker.tls.record.RecordHandler;
 import de.rub.nds.tlsattacker.tls.protocol.ProtocolMessageHandler;
-import de.rub.nds.tlsattacker.tls.constants.AlertLevel;
 import de.rub.nds.tlsattacker.tls.protocol.alert.AlertMessage;
 import de.rub.nds.tlsattacker.tls.record.Record;
+import de.rub.nds.tlsattacker.tls.record.RecordHandler;
 import de.rub.nds.tlsattacker.tls.workflow.MessageBytesCollector;
 import de.rub.nds.tlsattacker.tls.workflow.RenegotiationWorkflowConfiguration;
 import de.rub.nds.tlsattacker.tls.workflow.TlsContext;
 import de.rub.nds.tlsattacker.tls.workflow.WorkflowContext;
 import de.rub.nds.tlsattacker.transport.TransportHandler;
 import de.rub.nds.tlsattacker.util.ArrayConverter;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 /**
  * @author Philip Riese <philip.riese@rub.de>
@@ -199,7 +201,7 @@ private void handleMyProtocolMessage(List<ProtocolMessage> protocolMessages) thr
      */
     protected void prepareMyProtocolMessageBytes(ProtocolMessage pm) {
 	LOGGER.debug("Preparing the following protocol message to send: {}", pm.getClass());
-	ProtocolMessageHandler handler = pm.getProtocolMessageHandler(tlsContext);
+	ProtocolMessageHandler<? extends ProtocolMessage> handler = pm.getProtocolMessageHandler(tlsContext);
 	byte[] pmBytes;
 	boolean finished = pm.getClass().toString()
 		.equals("class de.rub.nds.tlsattacker.tls.protocol.handshake.FinishedMessage");
@@ -307,7 +309,7 @@ protected void parseRawBytesIntoProtocolMessages(byte[] rawProtocolMessageBytes,
 	    List<ProtocolMessage> protocolMessages, ProtocolMessageType protocolMessageType) {
 	int dataPointer = 0;
 	while (dataPointer != rawProtocolMessageBytes.length && workflowContext.isProceedWorkflow()) {
-	    ProtocolMessageHandler pmh = protocolMessageType.getProtocolMessageHandler(
+	    ProtocolMessageHandler<? extends ProtocolMessage> pmh = protocolMessageType.getProtocolMessageHandler(
 		    rawProtocolMessageBytes[dataPointer], tlsContext);
 	    if (Arrays.equals(rawProtocolMessageBytes,
 		    new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 })) {
@@ -329,7 +331,7 @@ protected void parseRawBytesIntoProtocolMessages(byte[] rawProtocolMessageBytes,
      * 
      * @param pmh
      */
-    private void handleIncomingAlert(ProtocolMessageHandler pmh) {
+    private void handleIncomingAlert(ProtocolMessageHandler<? extends ProtocolMessage> pmh) {
 	if (pmh.getProtocolMessage().getProtocolMessageType() == ProtocolMessageType.ALERT) {
 	    AlertMessage am = (AlertMessage) pmh.getProtocolMessage();
 	    am.setMessageIssuer(ConnectionEnd.SERVER);
@@ -345,7 +347,7 @@ private void handleIncomingAlert(ProtocolMessageHandler pmh) {
      * @param protocolMessages
      * @param pmh
      */
-    private void identifyCorrectProtocolMessage(List<ProtocolMessage> protocolMessages, ProtocolMessageHandler pmh) {
+    private void identifyCorrectProtocolMessage(List<ProtocolMessage> protocolMessages, ProtocolMessageHandler<? extends ProtocolMessage> pmh) {
 	ProtocolMessage pm = null;
 	if (workflowContext.getProtocolMessagePointer() < protocolMessages.size()) {
 	    pm = protocolMessages.get(workflowContext.getProtocolMessagePointer());
@@ -385,7 +387,7 @@ protected byte[] getRawProtocolBytesFromRecords(List<Record> records) {
      * @return
      */
     protected List<List<Record>> createListsOfRecordsOfTheSameContentType(List<Record> records) {
-	List<List<Record>> result = new LinkedList();
+	List<List<Record>> result = new LinkedList<>();
 	int recordPointer = 0;
 	Record record = records.get(recordPointer);
 	List<Record> currentRecords = new LinkedList<>();

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/mitm/MitM_Dialog.java

@@ -49,25 +49,6 @@ public MitM_Dialog(java.awt.Frame parent, boolean modal, ProtocolMessage pm, Str
      * WARNING: Do NOT modify this code. The content of this method is always
      * regenerated by the Form Editor.
      */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
-    // <editor-fold defaultstate="collapsed"
     // <editor-fold defaultstate="collapsed"
     // desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {

Attacks/src/test/java/de/rub/nds/tlsattacker/attacks/ec/ICEAttackerTest.java

@@ -11,7 +11,6 @@
 import de.rub.nds.tlsattacker.attacks.ec.oracles.TestECOracle;
 import de.rub.nds.tlsattacker.attacks.ec.oracles.TestECSunOracle;
 import java.math.BigInteger;
-import java.util.Arrays;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.Ignore;

Attacks/src/test/java/de/rub/nds/tlsattacker/attacks/ec/oracles/TestECOracle.java

@@ -9,7 +9,6 @@
 package de.rub.nds.tlsattacker.attacks.ec.oracles;
 
 import de.rub.nds.tlsattacker.attacks.ec.oracles.ECOracle;
-import de.rub.nds.tlsattacker.tls.crypto.ec.Curve;
 import de.rub.nds.tlsattacker.tls.crypto.ec.CurveFactory;
 import de.rub.nds.tlsattacker.tls.crypto.ec.DivisionException;
 import de.rub.nds.tlsattacker.tls.crypto.ec.ECComputer;

Attacks/src/test/java/de/rub/nds/tlsattacker/attacks/ec/oracles/TestECSunOracle.java

@@ -9,9 +9,7 @@
 package de.rub.nds.tlsattacker.attacks.ec.oracles;
 
 import de.rub.nds.tlsattacker.attacks.ec.oracles.ECOracle;
-import de.rub.nds.tlsattacker.tls.crypto.ec.Curve;
 import de.rub.nds.tlsattacker.tls.crypto.ec.CurveFactory;
-import de.rub.nds.tlsattacker.tls.crypto.ec.DivisionException;
 import de.rub.nds.tlsattacker.tls.crypto.ec.ECComputer;
 import de.rub.nds.tlsattacker.tls.crypto.ec.Point;
 import java.math.BigInteger;

Attacks/src/test/java/de/rub/nds/tlsattacker/attacks/pkcs1/BleichenbacherAttackPlaintextTest.java

@@ -17,7 +17,6 @@
 import java.security.SecureRandom;
 import java.security.Security;
 import javax.crypto.Cipher;
-import org.apache.logging.log4j.LogManager;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.Assert;
 import org.junit.Test;

Attacks/src/test/java/de/rub/nds/tlsattacker/attacks/pkcs1/MangerAttackPlaintextTest.java

@@ -15,7 +15,6 @@
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
 import java.security.Security;
 import java.util.Collections;
 import java.util.LinkedList;