Fixed compiler flaws during merge

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/CertificateMessagePreparator.java

@@ -13,6 +13,7 @@
 import de.rub.nds.tlsattacker.core.certificate.CertificateKeyPair;
 import de.rub.nds.tlsattacker.core.constants.CertificateType;
 import de.rub.nds.tlsattacker.core.constants.ECPointFormat;
+import de.rub.nds.tlsattacker.core.constants.NamedGroup;
 import de.rub.nds.tlsattacker.core.crypto.ec.Point;
 import de.rub.nds.tlsattacker.core.crypto.ec.PointFormatter;
 import de.rub.nds.tlsattacker.core.exceptions.PreparationException;
@@ -82,10 +83,11 @@ private void prepareCertificateListBytes(CertificateMessage msg) {
                     } else {
                         ecPointToEncode = chooser.getServerEcPublicKey();
                     }
+                    //TODO this needs to be adjusted for different curves
                     asn1OutputStream.writeObject(new DLSequence(new ASN1Encodable[] {
                             new DLSequence(new ASN1Encodable[] { new ASN1ObjectIdentifier("1.2.840.10045.2.1"),
                                     new ASN1ObjectIdentifier("1.2.840.10045.3.1.7") }),
-                            new DERBitString(PointFormatter.formatToByteArray(ecPointToEncode,
+                            new DERBitString(PointFormatter.formatToByteArray(NamedGroup.SECP256R1, ecPointToEncode,
                                     ECPointFormat.UNCOMPRESSED)) }));
                     asn1OutputStream.flush();
                     asn1OutputStream.close();

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/state/TlsContext.java

@@ -1247,6 +1247,10 @@ public int getDtlsWriteEpoch() {
         return dtlsWriteEpoch;
     }
 
+    public void setDtlsWriteEpoch(int dtlsWriteEpoch) {
+        this.dtlsWriteEpoch = dtlsWriteEpoch;
+    }
+
     public int getDtlsReceiveEpoch() {
         return dtlsReadEpoch;
     }

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/action/ResetConnectionAction.java

@@ -53,10 +53,11 @@ public void execute(State state) throws WorkflowExecutionException {
         tlsContext.setWriteSequenceNumber(0);
         LOGGER.info("Resetting DTLS numbers and cookie");
         tlsContext.setDtlsCookie(new byte[] {});
-        tlsContext.setDtlsNextReceiveSequenceNumber(0);
-        tlsContext.setDtlsNextSendSequenceNumber(0);
-        tlsContext.setDtlsSendEpoch(0);
-        tlsContext.setDtlsNextReceiveEpoch(0);
+        tlsContext.setDtlsReadHandshakeMessageSequence(0);
+        tlsContext.setDtlsWriteHandshakeMessageSequence(0);
+        tlsContext.setDtlsReceiveEpoch(0);
+        tlsContext.setDtlsWriteEpoch(0);
+
         LOGGER.info("Reopening Connection");
         try {
             tlsContext.getTransportHandler().initialize();