Fix NullPointerException Error with static extensionMessage

Author: TanerBoecek

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

@@ -12,17 +12,15 @@
 import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
 import de.rub.nds.tlsattacker.core.protocol.message.HelloRetryRequestMessage;
 import de.rub.nds.tlsattacker.core.protocol.message.extension.ExtensionMessage;
+import de.rub.nds.tlsattacker.core.protocol.message.extension.EncryptThenMacExtensionMessage;
 import de.rub.nds.tlsattacker.core.protocol.parser.HelloRetryRequestParser;
 import de.rub.nds.tlsattacker.core.protocol.preparator.HelloRetryRequestPreparator;
 import de.rub.nds.tlsattacker.core.protocol.serializer.HelloRetryRequestSerializer;
 import de.rub.nds.tlsattacker.core.state.TlsContext;
-import de.rub.nds.tlsattacker.transport.ConnectionEndType;
 
 import org.junit.Before;
 import org.junit.Test;
-import java.util.List;
 
-import de.rub.nds.tlsattacker.core.protocol.MessageFactory;
 import de.rub.nds.tlsattacker.core.constants.ExtensionType;
 
 
@@ -57,30 +55,22 @@ public void testGetSerializer(){
     @Test
     public void testAdjustTLSContext(){
         HelloRetryRequestMessage message = new HelloRetryRequestMessage();
+        ExtensionMessage extensionMessage = new EncryptThenMacExtensionMessage();
         ProtocolVersion protocolVersion = ProtocolVersion.SSL2;
         CipherSuite cipherSuite = CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA;
-        ExtensionType extensionType = ExtensionType.SERVER_NAME_INDICATION;
-        List<ExtensionMessage> extensionMessages = MessageFactory.generateExtensionMessages();
+        ExtensionType extensionType = ExtensionType.ENCRYPT_THEN_MAC;
+
 
         message.setProtocolVersion(protocolVersion.getValue());
         message.setSelectedCipherSuite(cipherSuite.getByteValue());
         message.setExtensionBytes(extensionType.getValue());
-
-        message.addExtension(extensionMessages.get(0));
+        message.addExtension(extensionMessage);
 
         handler.adjustTLSContext(message);
-        ExtensionType type = ExtensionType.getExtensionType(message.getExtensions().get(0).getExtensionTypeConstant().getValue());
-
 
         assertSame(context.getSelectedProtocolVersion(),protocolVersion);
         assertSame(context.getSelectedCipherSuite(), cipherSuite);
-        assertEquals(context.getProposedExtensions().toString(),"["+type+"]");
-
-        if(context.getTalkingConnectionEndType() == ConnectionEndType.CLIENT){
-            assertTrue(context.isExtensionProposed(type));
-        }else if(context.getTalkingConnectionEndType() == ConnectionEndType.SERVER){
-            assertTrue(context.isExtensionNegotiated(type));
-        }
+        assertTrue(context.isExtensionProposed(extensionType));
 
     }