Merge remote-tracking branch 'origin/main'

Author: mwcw

CONTRIBUTORS.html

@@ -548,6 +548,7 @@
 <li>yuhh0328 &lt;https://github.com/yuhh0328&gt; - initial patch for adding ML-KEM support to TLS.</li>
 <li>Jan Oupick&yacute; &lt;https://github.com/Honzaik&gt; - update to draft 13 of composite PQC signatures.</li>
 <li>Karsten Otto &lt;https://github.com/ottoka&gt; - finished the support for jdk.tls.server.defaultDHEParameters.</li>
+<li>Markus Sommer &lt;https://github.com/marsom&gt; - BCStyle lookup table fix for jurisdiction values.</li>
 </ul>
 </body>
 </html>

core/src/main/java/org/bouncycastle/asn1/x500/style/BCStyle.java

@@ -291,9 +291,9 @@ public class BCStyle
         DefaultLookUp.put("telephonenumber", TELEPHONE_NUMBER);
         DefaultLookUp.put("name", NAME);
         DefaultLookUp.put("organizationidentifier", ORGANIZATION_IDENTIFIER);
-        DefaultLookUp.put("jurisdictionCountry", JURISDICTION_C);
-        DefaultLookUp.put("jurisdictionState", JURISDICTION_ST);
-        DefaultLookUp.put("jurisdictionLocality", JURISDICTION_L);
+        DefaultLookUp.put("jurisdictioncountry", JURISDICTION_C);
+        DefaultLookUp.put("jurisdictionstate", JURISDICTION_ST);
+        DefaultLookUp.put("jurisdictionlocality", JURISDICTION_L);
     }
 
     /**

core/src/test/java/org/bouncycastle/asn1/test/X500NameTest.java

@@ -663,6 +663,10 @@ public void performTest()
         {
             fail("padded equality test failed");
         }
+
+        isTrue(BCStyle.INSTANCE.attrNameToOID("jurisdictionCountry").equals(BCStyle.JURISDICTION_C));
+        isTrue(BCStyle.INSTANCE.attrNameToOID("jurisdictionState").equals(BCStyle.JURISDICTION_ST));
+        isTrue(BCStyle.INSTANCE.attrNameToOID("jurisdictionLocality").equals(BCStyle.JURISDICTION_L));
     }
 
     private String getValue(RDN vl)