Move TODOs in to KemUtil

Author: peterdettman

tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JcaTlsCrypto.java

@@ -447,19 +447,7 @@ else if (NamedGroup.refersToASpecificFiniteField(namedGroup))
         }
         else if (NamedGroup.refersToASpecificKem(namedGroup))
         {
-            switch (namedGroup)
-            {
-            /*
-             * TODO[tls-kem] Return AlgorithmParameters to check against disabled algorithms?
-             */
-            case NamedGroup.OQS_mlkem512:
-            case NamedGroup.OQS_mlkem768:
-            case NamedGroup.OQS_mlkem1024:
-            case NamedGroup.MLKEM512:
-            case NamedGroup.MLKEM768:
-            case NamedGroup.MLKEM1024:
-                return null;
-            }
+        	return KemUtil.getAlgorithmParameters(this, NamedGroup.getKemName(namedGroup));
         }
 
         throw new IllegalArgumentException("NamedGroup not supported: " + NamedGroup.getText(namedGroup));
@@ -1161,9 +1149,7 @@ protected Boolean isSupportedNamedGroup(int namedGroup)
             }
             else if (NamedGroup.refersToASpecificKem(namedGroup))
             {
-                // TODO[tls-kem] When implemented via provider, need to check for support dynamically
-//                return Boolean.valueOf(KemUtil.isKemSupported(this, NamedGroup.getKemName(namedGroup)));
-                return Boolean.TRUE;
+                return Boolean.valueOf(KemUtil.isKemSupported(this, NamedGroup.getKemName(namedGroup)));
             }
             else if (NamedGroup.refersToAnECDSACurve(namedGroup))
             {

tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/KemUtil.java

@@ -1,9 +1,27 @@
 package org.bouncycastle.tls.crypto.impl.jcajce;
 
+import java.security.AlgorithmParameters;
+
 import javax.crypto.Cipher;
 
 class KemUtil
 {
+    static AlgorithmParameters getAlgorithmParameters(JcaTlsCrypto crypto, String kemName)
+    {
+        try
+        {
+             // TODO[tls-kem] Return AlgorithmParameters to check against disabled algorithms?
+        }
+        catch (AssertionError e)
+        {
+        }
+        catch (Exception e)
+        {
+        }
+
+        return null;
+    }
+
     static Cipher getCipher(JcaTlsCrypto crypto, String kemName)
     {
         try
@@ -12,16 +30,18 @@ static Cipher getCipher(JcaTlsCrypto crypto, String kemName)
         }
         catch (AssertionError e)
         {
-            return null;
         }
         catch (Exception e)
         {
-            return null;
         }
+
+        return null;
     }
 
     static boolean isKemSupported(JcaTlsCrypto crypto, String kemName)
     {
-    	return kemName != null && getCipher(crypto, kemName) != null;
+        // TODO[tls-kem] When implemented via provider, need to check for support dynamically
+//    	return kemName != null && getCipher(crypto, kemName) != null;
+    	return true;
     }
 }