Merge branch 'master' into fuzzerfixes

Author: ic0ns

README.md

@@ -13,7 +13,27 @@ In order to compile and use TLS-Attacker, you need to have Java and Maven instal
 ```bash
 $ sudo apt-get install maven
 ```
-TLS-Attacker currently needs Java JDK 8 to run. If you have the correct Java version you can run the maven command from the TLS-Attacker directory:
+TLS-Attacker currently needs Java JDK 8 to run. Since version 3.5.0, TLS-Attacker also required ASN.1-Tool and X509-Attacker as a dependency.
+
+Installing ASN.1 Tool:
+```bash
+$ git clone https://github.com/RUB-NDS/ASN.1-Tool
+$ cd ASN.1-Tool
+$ mvn clean install
+$ cd ..
+
+```
+
+Installing X509-Attacker:
+```bash
+$ git clone https://github.com/RUB-NDS/x509-Attacker
+$ cd X509-Attacker
+$ mvn clean install
+$ cd ..
+```
+
+
+If you have the correct Java version you can run the maven command from the TLS-Attacker directory:
 ```bash
 $ cd TLS-Attacker
 $ mvn clean install

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/DHClientKeyExchangeHandler.java

@@ -14,6 +14,7 @@
 import de.rub.nds.tlsattacker.core.protocol.preparator.DHClientKeyExchangePreparator;
 import de.rub.nds.tlsattacker.core.protocol.serializer.DHClientKeyExchangeSerializer;
 import de.rub.nds.tlsattacker.core.state.TlsContext;
+import java.math.BigInteger;
 
 /**
  * Handler for DH and DHE ClientKeyExchange messages
@@ -44,7 +45,12 @@ public DHClientKeyExchangeSerializer getSerializer(DHClientKeyExchangeMessage me
     public void adjustTLSContext(DHClientKeyExchangeMessage message) {
         adjustPremasterSecret(message);
         adjustMasterSecret(message);
+        adjustClientPublicKey(message);
         setRecordCipher();
         spawnNewSession();
     }
+
+    private void adjustClientPublicKey(DHClientKeyExchangeMessage message) {
+        tlsContext.setClientDhPublicKey(new BigInteger(message.getPublicKey().getValue()));
+    }
 }

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/socket/TlsAttackerSocket.java

@@ -80,8 +80,9 @@ public void send(byte[] bytes) {
         ApplicationMessage message = new ApplicationMessage();
         ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
         byte[] sendingBytes = new byte[16384];
-        int actuallyRead = 0;
+        int actuallyRead;
         do {
+            actuallyRead = 0;
             try {
                 actuallyRead = stream.read(sendingBytes);
                 if (actuallyRead > 0) {

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/handler/DHClientKeyExchangeHandlerTest.java

@@ -18,6 +18,7 @@
 import de.rub.nds.tlsattacker.core.protocol.serializer.DHClientKeyExchangeSerializer;
 import de.rub.nds.tlsattacker.core.record.layer.TlsRecordLayer;
 import de.rub.nds.tlsattacker.core.state.TlsContext;
+import java.math.BigInteger;
 import org.junit.After;
 import static org.junit.Assert.*;
 import org.junit.Before;
@@ -69,6 +70,7 @@ public void testGetSerializer() {
     @Test
     public void testAdjustTLSContext() {
         DHClientKeyExchangeMessage message = new DHClientKeyExchangeMessage();
+        message.setPublicKey(new byte[] { 1 });
         message.prepareComputations();
         message.getComputations()
                 .setPremasterSecret(
@@ -90,5 +92,6 @@ public void testAdjustTLSContext() {
                 ArrayConverter
                         .hexStringToByteArray("4a0a7f6a0598acb36684359e1a19d848ab03b3ba1167430471166d94dcf8315d1c4290c9d9e40c50ae834df7b4f4bdef"),
                 context.getMasterSecret());
+        assertTrue(context.getClientDhPublicKey().equals(BigInteger.ONE));
     }
 }

Transport/src/main/java/de/rub/nds/tlsattacker/transport/TimeableTransportHandler.java

@@ -11,5 +11,5 @@
 
 public interface TimeableTransportHandler {
 
-    public abstract long getLastMeasurement();
+    public abstract Long getLastMeasurement();
 }

Transport/src/main/java/de/rub/nds/tlsattacker/transport/TransportHandler.java

@@ -129,4 +129,13 @@ public long getTimeout() {
     public void setTimeout(long timeout) {
         this.timeout = timeout;
     }
+
+    public void setIsInStreamTerminating(boolean isInStreamTerminating) {
+        this.isInStreamTerminating = isInStreamTerminating;
+    }
+
+    public boolean isIsInStreamTerminating() {
+        return isInStreamTerminating;
+    }
+
 }

Transport/src/main/java/de/rub/nds/tlsattacker/transport/TransportHandlerFactory.java

@@ -63,7 +63,7 @@ public static TransportHandler createTransportHandler(Connection con) {
                 }
             case TCP_PROXY_TIMING:
                 if (localConEndType == ConnectionEndType.CLIENT) {
-                    return new TimingProxyClientTcpTransportHandler(timeout, con.getIp(), con.getPort());
+                    return new TimingProxyClientTcpTransportHandler(con);
                 } else {
                     throw new UnsupportedOperationException(
                             "TCP_PROXY_TIMING for server sockets is currently not supported");

Transport/src/main/java/de/rub/nds/tlsattacker/transport/tcp/ClientTcpTransportHandler.java

@@ -87,9 +87,7 @@ public SocketState getSocketState() throws InvalidTransportHandlerStateException
             if (socket.getInputStream().available() > 0) {
                 return SocketState.DATA_AVAILABLE;
             }
-            socket.setSoTimeout(1);
             int read = socket.getInputStream().read();
-            socket.setSoTimeout((int) timeout);
             if (read == -1) {
                 return SocketState.CLOSED;
             } else {

Transport/src/main/java/de/rub/nds/tlsattacker/transport/tcp/proxy/TimingProxyClientTcpTransportHandler.java

@@ -35,7 +35,7 @@ public class TimingProxyClientTcpTransportHandler extends TransportHandler imple
     protected int proxyDataPort = 4444;
     protected String proxyControlHostName = "127.0.0.1";
     protected int proxyControlPort = 5555;
-    protected long measurement = 0;
+    protected Long measurement = null;
 
     @Override
     public byte[] fetchData() throws IOException {
@@ -60,20 +60,23 @@ public TimingProxyClientTcpTransportHandler(Connection connection) {
         this.proxyDataPort = connection.getProxyDataPort();
         this.proxyControlHostName = connection.getProxyControlHostname();
         this.proxyControlPort = connection.getProxyControlPort();
+        setIsInStreamTerminating(false);
     }
 
     public TimingProxyClientTcpTransportHandler(long timeout, String hostname, int port) {
         super(timeout, ConnectionEndType.CLIENT);
         this.hostname = hostname;
         this.port = port;
+        setIsInStreamTerminating(false);
     }
 
     @Override
-    public void setProxy(String dataChanelHost, int dataChanelPort, String controlChanelHost, int controlChanelPort) {
-        proxyDataHostName = dataChanelHost;
+    public void setProxy(String dataChannelHost, int dataChanelPort, String controlChannelHost, int controlChanelPort) {
+        proxyDataHostName = dataChannelHost;
         proxyDataPort = dataChanelPort;
-        proxyControlHostName = controlChanelHost;
+        proxyControlHostName = controlChannelHost;
         proxyControlPort = controlChanelPort;
+
     }
 
     @Override
@@ -149,7 +152,7 @@ public SocketState getSocketState() throws InvalidTransportHandlerStateException
     }
 
     @Override
-    public long getLastMeasurement() {
+    public Long getLastMeasurement() {
         return measurement;
     }
 }

Transport/src/main/java/de/rub/nds/tlsattacker/transport/tcp/timing/TimingClientTcpTransportHandler.java

@@ -16,7 +16,7 @@
 
 public class TimingClientTcpTransportHandler extends ClientTcpTransportHandler implements TimeableTransportHandler {
 
-    private long measurement = 0;
+    private Long measurement = null;
     private boolean prependEarlyReadData = false;
     private int earlyReadData = 0;
 
@@ -54,7 +54,7 @@ public byte[] fetchData() throws IOException {
     }
 
     @Override
-    public long getLastMeasurement() {
+    public Long getLastMeasurement() {
         return measurement;
     }