fixed ellipticcurve getting serialised with dragonfly

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/computations/PWDComputations.java

@@ -186,9 +186,6 @@ public static PWDKeyMaterial generateKeyMaterial(EllipticCurve curve, Point pass
         return keyMaterial;
     }
 
-    @XmlTransient
-    private EllipticCurve curve;
-
     /**
      * shared secret derived from the shared password between server and client
      */
@@ -204,14 +201,6 @@ public static PWDKeyMaterial generateKeyMaterial(EllipticCurve curve, Point pass
     public void setSecretsInConfig(Config config) {
     }
 
-    public void setCurve(EllipticCurve curve) {
-        this.curve = curve;
-    }
-
-    public EllipticCurve getCurve() {
-        return curve;
-    }
-
     public Point getPasswordElement() {
         return passwordElement;
     }

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

@@ -42,7 +42,7 @@ public PWDClientKeyExchangePreparator(Chooser chooser, PWDClientKeyExchangeMessa
     public void prepareHandshakeMessageContents() {
         LOGGER.debug("Preparing PWDClientKeyExchangeMessage");
         msg.prepareComputations();
-        msg.getComputations().setCurve(CurveFactory.getCurve(chooser.getSelectedNamedGroup()));
+        EllipticCurve curve = CurveFactory.getCurve(chooser.getSelectedNamedGroup());
         LOGGER.debug(chooser.getSelectedNamedGroup().getJavaName());
 
         try {
@@ -52,7 +52,7 @@ public void prepareHandshakeMessageContents() {
         }
         prepareScalarElement(msg);
         byte[] premasterSecret = generatePremasterSecret(msg.getComputations().getPasswordElement(), msg
-                .getComputations().getPrivateKeyScalar(), msg.getComputations().getCurve());
+                .getComputations().getPrivateKeyScalar(), curve);
         preparePremasterSecret(msg, premasterSecret);
         prepareClientServerRandom(msg);
     }
@@ -61,15 +61,17 @@ public void prepareHandshakeMessageContents() {
     public void prepareAfterParse(boolean clientMode) {
         if (!clientMode) {
             msg.prepareComputations();
+            EllipticCurve curve = CurveFactory.getCurve(chooser.getSelectedNamedGroup());
             byte[] premasterSecret = generatePremasterSecret(chooser.getContext().getPWDPE(), chooser.getContext()
-                    .getServerPWDPrivate(), msg.getComputations().getCurve());
+                    .getServerPWDPrivate(), curve);
             preparePremasterSecret(msg, premasterSecret);
             prepareClientServerRandom(msg);
         }
     }
 
     protected void preparePasswordElement(PWDClientKeyExchangeMessage msg) throws CryptoException {
-        Point passwordElement = PWDComputations.computePasswordElement(chooser, msg.getComputations().getCurve());
+        EllipticCurve curve = CurveFactory.getCurve(chooser.getSelectedNamedGroup());
+        Point passwordElement = PWDComputations.computePasswordElement(chooser, curve);
         msg.getComputations().setPasswordElement(passwordElement);
 
         LOGGER.debug("PasswordElement.x: "
@@ -117,7 +119,7 @@ protected List<ECPointFormat> getPointFormatList() {
     }
 
     protected void prepareScalarElement(PWDClientKeyExchangeMessage msg) {
-        EllipticCurve curve = msg.getComputations().getCurve();
+        EllipticCurve curve = CurveFactory.getCurve(chooser.getSelectedNamedGroup());
         PWDComputations.PWDKeyMaterial keyMaterial = PWDComputations.generateKeyMaterial(curve, msg.getComputations()
                 .getPasswordElement(), chooser);
 

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

@@ -46,7 +46,7 @@ public void prepareHandshakeMessageContents() {
         msg.prepareComputations();
         prepareCurveType(msg);
         NamedGroup group = selectNamedGroup(msg);
-        msg.getComputations().setCurve(CurveFactory.getCurve(group));
+        EllipticCurve curve = CurveFactory.getCurve(group);
         msg.setNamedGroup(group.getValue());
         prepareSalt(msg);
         prepareSaltLength(msg);
@@ -60,7 +60,9 @@ public void prepareHandshakeMessageContents() {
     }
 
     protected void preparePasswordElement(PWDServerKeyExchangeMessage msg) throws CryptoException {
-        Point passwordElement = PWDComputations.computePasswordElement(chooser, msg.getComputations().getCurve());
+        NamedGroup group = selectNamedGroup(msg);
+        EllipticCurve curve = CurveFactory.getCurve(selectNamedGroup(msg));
+        Point passwordElement = PWDComputations.computePasswordElement(chooser, curve);
         msg.getComputations().setPasswordElement(passwordElement);
 
         LOGGER.debug("PasswordElement.x: "
@@ -150,7 +152,7 @@ protected List<ECPointFormat> getPointFormatList() {
     }
 
     protected void prepareScalarElement(PWDServerKeyExchangeMessage msg) {
-        EllipticCurve curve = msg.getComputations().getCurve();
+        EllipticCurve curve = CurveFactory.getCurve(selectNamedGroup(msg));
         PWDComputations.PWDKeyMaterial keyMaterial = PWDComputations.generateKeyMaterial(curve, msg.getComputations()
                 .getPasswordElement(), chooser);