fixed a group selection bug

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/certificate/CertificateKeyPair.java

@@ -359,7 +359,7 @@ public void adjustInContext(TlsContext context, ConnectionEndType connectionEnd)
         if (privateKey != null) {
             privateKey.adjustInContext(context, connectionEnd);
         }
-        context.setSelectedGroup(publicKeyGroup);
+        context.setEcCertificateCurve(publicKeyGroup);
         if (context.getConfig().getAutoAdjustSignatureAndHashAlgorithm()) {
             // TODO rething auto selection
             SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.RSA;

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/crypto/keys/CustomECPrivateKey.java

@@ -85,11 +85,11 @@ public void adjustInContext(TlsContext context, ConnectionEndType ownerOfKey) {
             switch (ownerOfKey) {
                 case CLIENT:
                     context.setClientEcPrivateKey(privatekey);
-                    context.setSelectedGroup(group);
+                    context.setEcCertificateCurve(group);
                     break;
                 case SERVER:
                     context.setServerEcPrivateKey(privatekey);
-                    context.setSelectedGroup(group);
+                    context.setEcCertificateCurve(group);
                     break;
                 default:
                     throw new IllegalArgumentException("Owner of Key " + ownerOfKey + " is not supported");
@@ -105,11 +105,11 @@ public void adjustInConfig(Config config, ConnectionEndType ownerOfKey) {
             switch (ownerOfKey) {
                 case CLIENT:
                     config.setDefaultClientEcPrivateKey(privatekey);
-                    config.setDefaultSelectedNamedGroup(group);
+                    config.setDefaultEcCertificateCurve(group);
                     break;
                 case SERVER:
                     config.setDefaultServerEcPrivateKey(privatekey);
-                    config.setDefaultSelectedNamedGroup(group);
+                    config.setDefaultEcCertificateCurve(group);
                     break;
                 default:
                     throw new IllegalArgumentException("Owner of Key " + ownerOfKey + " is not supported");

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/crypto/keys/CustomEcPublicKey.java

@@ -73,11 +73,15 @@ public void adjustInContext(TlsContext context, ConnectionEndType ownerOfKey) {
             switch (ownerOfKey) {
                 case CLIENT:
                     context.setClientEcPublicKey(point);
-                    context.setSelectedGroup(group);
+                    if (group != null) {
+                        context.setEcCertificateCurve(group);
+                    }
                     break;
                 case SERVER:
                     context.setServerEcPublicKey(point);
-                    context.setSelectedGroup(group);
+                    if (group != null) {
+                        context.setEcCertificateCurve(group);
+                    }
                     break;
                 default:
                     throw new IllegalArgumentException("Owner of Key " + ownerOfKey + " is not supported");
@@ -125,11 +129,15 @@ public void adjustInConfig(Config config, ConnectionEndType ownerOfKey) {
             switch (ownerOfKey) {
                 case CLIENT:
                     config.setDefaultClientEcPublicKey(point);
-                    config.setDefaultSelectedNamedGroup(group);
+                    if (group != null) {
+                        config.setDefaultEcCertificateCurve(group);
+                    }
                     break;
                 case SERVER:
                     config.setDefaultServerEcPublicKey(point);
-                    config.setDefaultSelectedNamedGroup(group);
+                    if (group != null) {
+                        config.setDefaultEcCertificateCurve(group);
+                    }
                     break;
                 default:
                     throw new IllegalArgumentException("Owner of Key " + ownerOfKey + " is not supported");