Merge pull request #332 from RUB-NDS/mitmfix

Mitmfix

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/delegate/ServerDelegate.java

@@ -44,6 +44,7 @@ public void applyDelegate(Config config) {
             throw new ParameterException("port must be in interval [0,65535], but is " + port);
         }
         ServerConnectionEnd conEnd = new ServerConnectionEnd();
+        conEnd.setAlias(Config.DEFAULT_CONNECTION_END_ALIAS);
         conEnd.setPort(port);
         config.clearConnectionEnds();
         config.addConnectionEnd(conEnd);

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/parser/ParserStressTest.java

@@ -14,6 +14,8 @@
 import java.util.Random;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -27,10 +29,19 @@
  */
 public class ParserStressTest {
 
+    @Before
+    public void before() {
+        Configurator.setRootLevel(Level.OFF);
+    }
+
+    @After
+    public void after() {
+        Configurator.setRootLevel(Level.INFO);
+    }
+
     @Test
     @Category(IntegrationTests.class)
     public void testParser() {
-        Configurator.setRootLevel(Level.INFO);
         for (int i = 0; i < 10000; i++) {
             Random r = new Random(i);
             try {

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/parser/UnknownMessageParserStressTest.java

@@ -12,7 +12,11 @@
 import de.rub.nds.tlsattacker.core.protocol.message.UnknownMessage;
 import de.rub.nds.tlsattacker.util.tests.IntegrationTests;
 import java.util.Random;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.junit.After;
 import static org.junit.Assert.*;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -24,6 +28,16 @@ public class UnknownMessageParserStressTest {
 
     private UnknownMessageParser parser;
 
+    @Before
+    public void before() {
+        Configurator.setRootLevel(Level.OFF);
+    }
+
+    @After
+    public void after() {
+        Configurator.setRootLevel(Level.INFO);
+    }
+
     /**
      * Test of parse method, of class UnknownMessageParser.
      */

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/serializer/ParserSerializerStressTest.java

@@ -55,8 +55,11 @@
 import de.rub.nds.tlsattacker.core.protocol.parser.UnknownMessageParser;
 import de.rub.nds.tlsattacker.util.tests.IntegrationTests;
 import java.util.Random;
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.junit.After;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
@@ -71,7 +74,13 @@ public class ParserSerializerStressTest {
     private static final Logger LOGGER = LogManager.getLogger(ParserSerializerStressTest.class);
 
     @Before
-    public void setUp() {
+    public void before() {
+        Configurator.setRootLevel(Level.OFF);
+    }
+
+    @After
+    public void after() {
+        Configurator.setRootLevel(Level.INFO);
     }
 
     @Test