Followup curveSM2MLKEM768 changes

Author: peterdettman

tls/src/main/java/org/bouncycastle/jsse/provider/FipsUtils.java

@@ -178,6 +178,7 @@ static boolean isFipsNamedGroup(int namedGroup)
         case NamedGroup.MLKEM768:
         case NamedGroup.MLKEM1024:
         case NamedGroup.X25519MLKEM768:
+        case NamedGroup.curveSM2MLKEM768:
         default:
             return false;
         }

tls/src/main/java/org/bouncycastle/jsse/provider/NamedGroupInfo.java

@@ -88,7 +88,8 @@ private enum All
 
         SecP256r1MLKEM768(NamedGroup.SecP256r1MLKEM768, "EC", "ML-KEM"),
         X25519MLKEM768(NamedGroup.X25519MLKEM768, "ML-KEM", "XDH"),
-        SecP384r1MLKEM1024(NamedGroup.SecP384r1MLKEM1024, "EC", "ML-KEM");
+        SecP384r1MLKEM1024(NamedGroup.SecP384r1MLKEM1024, "EC", "ML-KEM"),
+        curveMLKEM768(NamedGroup.curveSM2MLKEM768, "EC", "ML-KEM");
 
         private final int namedGroup;
         private final String name;

tls/src/main/java/org/bouncycastle/tls/NamedGroup.java

@@ -131,7 +131,6 @@ public class NamedGroup
      */
     public static final int curveSM2MLKEM768 = 0x11EE;
 
-
     /* Names of the actual underlying elliptic curves (not necessarily matching the NamedGroup names). */
     private static final String[] CURVE_NAMES = new String[]{ "sect163k1", "sect163r1", "sect163r2", "sect193r1",
         "sect193r2", "sect233k1", "sect233r1", "sect239k1", "sect283k1", "sect283r1", "sect409k1", "sect409r1",
@@ -466,12 +465,12 @@ public static String getName(int namedGroup)
             return "MLKEM1024";
         case SecP256r1MLKEM768:
             return "SecP256r1MLKEM768";
-        case curveSM2MLKEM768:
-            return "curveSM2MLKEM768";
         case X25519MLKEM768:
             return "X25519MLKEM768";
         case SecP384r1MLKEM1024:
             return "SecP384r1MLKEM1024";
+        case curveSM2MLKEM768:
+            return "curveSM2MLKEM768";
         case arbitrary_explicit_prime_curves:
             return "arbitrary_explicit_prime_curves";
         case arbitrary_explicit_char2_curves:

tls/src/test/java/org/bouncycastle/tls/test/MockTlsHybridServer.java

@@ -35,8 +35,8 @@ class MockTlsHybridServer
         NamedGroup.SecP256r1MLKEM768,
         NamedGroup.X25519MLKEM768,
         NamedGroup.SecP384r1MLKEM1024,
-        NamedGroup.x25519,
         NamedGroup.curveSM2MLKEM768,
+        NamedGroup.x25519,
     };
 
     MockTlsHybridServer(TlsCrypto crypto)

tls/src/test/java/org/bouncycastle/tls/test/TlsProtocolHybridTest.java

@@ -68,7 +68,6 @@ public void testCurveSM2MLKEM768() throws Exception
         implTestClientServer(NamedGroup.curveSM2MLKEM768);
     }
 
-
     public void testSecP256r1MLKEM768() throws Exception
     {
         implTestClientServer(NamedGroup.SecP256r1MLKEM768);