Merge branch 'master' into montgomeryCurveFix

Author: ic0ns

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

@@ -10,10 +10,11 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
 import java.net.SocketException;
-
+import java.net.SocketTimeoutException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

Transport/src/main/java/de/rub/nds/tlsattacker/transport/udp/stream/UdpInputStream.java

@@ -68,7 +68,6 @@ public int read() throws IOException {
             } catch (InterruptedException _) {
             }
         }
-
         index++;
         return dataBuffer[index - 1] & 0xff;
     }

Transport/src/test/java/de/rub/nds/tlsattacker/transport/udp/ClientUdpTransportHandlerTest.java

@@ -85,4 +85,19 @@ public void testFetchData() throws Exception {
             udpTH.closeConnection();
         }
     }
+
+    @Test
+    public void testFetchTimeout() throws Exception {
+        ClientUdpTransportHandler udpTH = new ClientUdpTransportHandler(1, localhost.getHostName(), 12345);
+        udpTH.initialize();
+        udpTH.setTimeout(1);
+
+        byte[] rxData;
+        rxData = udpTH.fetchData();
+        assertEquals(0, rxData.length);
+        rxData = udpTH.fetchData();
+        assertEquals(0, rxData.length);
+        udpTH.closeConnection();
+
+    }
 }