Merge branch 'main' into 1958-aead-parameters

Author: gefeili

tls/src/test/java/org/bouncycastle/jsse/provider/test/EdDSACredentialsTest.java

@@ -28,10 +28,10 @@ protected void setUp()
     }
 
     private static final String HOST = "localhost";
-    private static final int PORT_NO_12_ED25519 = 9020;
-    private static final int PORT_NO_12_ED448 = 9021;
-    private static final int PORT_NO_13_ED25519 = 9022;
-    private static final int PORT_NO_13_ED448 = 9023;
+    private static final int PORT_NO_12_ED25519 = 9050;
+    private static final int PORT_NO_12_ED448 = 9051;
+    private static final int PORT_NO_13_ED25519 = 9052;
+    private static final int PORT_NO_13_ED448 = 9053;
 
     static class EdDSAClient
         implements TestProtocolUtil.BlockingCallable

tls/src/test/java/org/bouncycastle/tls/crypto/test/TlsCryptoTest.java

@@ -221,6 +221,14 @@ public void testDHDomain() throws Exception
             implTestDHDomain(new TlsDHConfig(namedGroup, false));
             implTestDHDomain(new TlsDHConfig(namedGroup, true));
         }
+    }
+
+    public void testDHExplicit() throws Exception
+    {
+        if (!crypto.hasDHAgreement())
+        {
+            return;
+        }
 
         new DefaultTlsDHGroupVerifier()
         {{
@@ -236,9 +244,10 @@ public void testDHDomain() throws Exception
                 assertSame(dhGroup, TlsDHUtils.getStandardGroupForDHParameters(p, g));
 
                 int namedGroup = TlsDHUtils.getNamedGroupForDHParameters(p, g);
+
+                // Named groups tested elsewhere
                 if (NamedGroup.refersToASpecificFiniteField(namedGroup))
                 {
-                    // Already tested the named groups
                     continue;
                 }
 

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

@@ -31,6 +31,7 @@ public static Test suite()
         suite.addTestSuite(OCSPTest.class);
         suite.addTestSuite(PRFTest.class);
         suite.addTestSuite(Tls13PSKProtocolTest.class);
+        suite.addTestSuite(TlsProtocolKemTest.class);
         suite.addTestSuite(TlsProtocolNonBlockingTest.class);
         suite.addTestSuite(TlsProtocolTest.class);
         suite.addTestSuite(TlsPSKProtocolTest.class);

util/src/main/java/org/bouncycastle/oer/its/template/ieee1609dot2/IEEE1609dot2.java

@@ -259,7 +259,8 @@ public Element result(SwitchIndexer indexer)
      * EndEntityType ::= BIT STRING {app (0), enrol (1) } (SIZE (8))
      */
     public static final OERDefinition.Builder EndEntityType =
-        OERDefinition.bitString(8).defaultValue(new DERBitString(new byte[]{0}, 0))
+        OERDefinition.bitString(8)
+                .defaultValue(new DERBitString(org.bouncycastle.oer.its.ieee1609dot2.EndEntityType.app))
             .typeName("EndEntityType");
 
     /**