TLS: Use more appropriate method to check for ECDH curve

bcgit · Apr 4, 2024 · 7a2cc6f · 7a2cc6f
1 parent c626bc3
commit 7a2cc6f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tls/src/main/java/org/bouncycastle/tls/TlsServerProtocol.java b/tls/src/main/java/org/bouncycastle/tls/TlsServerProtocol.java
@@ -398,7 +398,7 @@ protected ServerHello generate13ServerHello(ClientHello clientHello, HandshakeMe
             int namedGroup = clientShare.getNamedGroup();
 
             TlsAgreement agreement;
-            if (NamedGroup.refersToASpecificCurve(namedGroup))
+            if (NamedGroup.refersToAnECDHCurve(namedGroup))
             {
                 agreement = crypto.createECDomain(new TlsECConfig(namedGroup)).createECDH();
             }

diff --git a/tls/src/main/java/org/bouncycastle/tls/TlsUtils.java b/tls/src/main/java/org/bouncycastle/tls/TlsUtils.java
@@ -5336,7 +5336,7 @@ private static void collectKeyShares(TlsClientContext clientContext, int[] suppo
             }
 
             TlsAgreement agreement = null;
-            if (NamedGroup.refersToASpecificCurve(supportedGroup))
+            if (NamedGroup.refersToAnECDHCurve(supportedGroup))
             {
                 if (crypto.hasECDHAgreement())
                 {
@@ -5409,7 +5409,7 @@ static KeyShareEntry selectKeyShare(TlsCrypto crypto, ProtocolVersion negotiated
                     continue;
                 }
 
-                if ((NamedGroup.refersToASpecificCurve(group) && !crypto.hasECDHAgreement()) ||
+                if ((NamedGroup.refersToAnECDHCurve(group) && !crypto.hasECDHAgreement()) ||
                     (NamedGroup.refersToASpecificFiniteField(group) && !crypto.hasDHAgreement()) ||
                     (NamedGroup.refersToASpecificKem(group) && !crypto.hasKemAgreement()))
                 {
@@ -5446,7 +5446,7 @@ static int selectKeyShareGroup(TlsCrypto crypto, ProtocolVersion negotiatedVersi
                     continue;
                 }
 
-                if ((NamedGroup.refersToASpecificCurve(group) && !crypto.hasECDHAgreement()) ||
+                if ((NamedGroup.refersToAnECDHCurve(group) && !crypto.hasECDHAgreement()) ||
                     (NamedGroup.refersToASpecificFiniteField(group) && !crypto.hasDHAgreement()) ||
                     (NamedGroup.refersToASpecificKem(group) && !crypto.hasKemAgreement()))
                 {