Added requested changes from reviewed pullrequest #734

Author: Patrick Weixler

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/constants/KeyUpdateRequest.java

@@ -9,22 +9,22 @@
  */
 package de.rub.nds.tlsattacker.core.constants;
 
-import de.rub.nds.modifiablevariable.HoldsModifiableVariable;
+import de.rub.nds.modifiablevariable.ModifiableVariableFactory;
+import de.rub.nds.modifiablevariable.singlebyte.ModifiableByte;
 
 public enum KeyUpdateRequest {
 
     UPDATE_NOT_REQUESTED((byte) 0),
     UPDATE_REQUESTED((byte) 1);
 
-    @HoldsModifiableVariable
-    private byte requestUpdate;
+    private ModifiableByte requestUpdate;
 
     private KeyUpdateRequest(byte requestUpdate) {
-        this.requestUpdate = requestUpdate;
+        this.requestUpdate = ModifiableVariableFactory.safelySetValue(this.requestUpdate, requestUpdate);
     }
 
     public byte getValue() {
-        return requestUpdate;
+        return requestUpdate.getValue();
     }
 
 }

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

@@ -160,10 +160,17 @@ private void setRecordCipher(Tls13KeySetType keySetType) {
                             AlgorithmResolver.getCipher(tlsContext.getChooser().getSelectedCipherSuite()).getKeySize()));
                 }
 
+                RecordCipher recordCipherClient = RecordCipherFactory.getRecordCipher(tlsContext, keySet, tlsContext
+                        .getChooser().getSelectedCipherSuite());
+                tlsContext.getRecordLayer().setRecordCipher(recordCipherClient);
+
+                tlsContext.setWriteSequenceNumber(0);
+                tlsContext.getRecordLayer().updateEncryptionCipher();
+
             } else if (tlsContext.getChooser().getTalkingConnectionEnd() != tlsContext.getChooser()
                     .getConnectionEndType()) {
 
-                if (tlsContext.getChooser().getConnectionEndType() == ConnectionEndType.SERVER) {
+                if (tlsContext.getChooser().getTalkingConnectionEnd() == ConnectionEndType.SERVER) {
 
                     keySet.setServerWriteIv(HKDFunction.expandLabel(hkdfAlgortihm,
                             tlsContext.getServerApplicationTrafficSecret(), HKDFunction.IV, new byte[0], AEAD_IV_LENGTH));
@@ -182,19 +189,13 @@ private void setRecordCipher(Tls13KeySetType keySetType) {
                             AlgorithmResolver.getCipher(tlsContext.getChooser().getSelectedCipherSuite()).getKeySize()));
                 }
 
-            }
-
-            RecordCipher recordCipherClient = RecordCipherFactory.getRecordCipher(tlsContext, keySet, tlsContext
-                    .getChooser().getSelectedCipherSuite());
-            tlsContext.getRecordLayer().setRecordCipher(recordCipherClient);
+                RecordCipher recordCipherClient = RecordCipherFactory.getRecordCipher(tlsContext, keySet, tlsContext
+                        .getChooser().getSelectedCipherSuite());
+                tlsContext.getRecordLayer().setRecordCipher(recordCipherClient);
 
-            if (tlsContext.getChooser().getTalkingConnectionEnd() == tlsContext.getChooser().getConnectionEndType()) {
-                tlsContext.setWriteSequenceNumber(0);
-                tlsContext.getRecordLayer().updateEncryptionCipher();
-            } else if (tlsContext.getChooser().getTalkingConnectionEnd() != tlsContext.getChooser()
-                    .getConnectionEndType()) {
                 tlsContext.setReadSequenceNumber(0);
                 tlsContext.getRecordLayer().updateDecryptionCipher();
+
             }
 
         } catch (CryptoException ex) {

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/KeyUpdateParser.java

@@ -41,8 +41,9 @@ private void parseUpdateRequest(KeyUpdateMessage msg) {
 
         if (parseByteField(HandshakeByteLength.KEY_UPDATE_LENGTH) == KeyUpdateRequest.UPDATE_REQUESTED.getValue()) {
             msg.setRequestUpdate(KeyUpdateRequest.UPDATE_REQUESTED);
-        } else
+        } else {
             msg.setRequestUpdate(KeyUpdateRequest.UPDATE_NOT_REQUESTED);
+        }
         LOGGER.debug("KeyUpdateValue: " + msg.getRequestUpdate());
 
     }