Merge branch 'main' into openpgp-certificate-refactor

gefeili · gefeili · commit 2ea1d94cb014 · 2025-05-26T09:55:26.000+09:30
diff --git a/prov/src/main/ext-jdk1.9/module-info.java b/prov/src/main/ext-jdk1.9/module-info.java
@@ -8,6 +8,9 @@
 
     opens org.bouncycastle.jcajce.provider.asymmetric.edec to java.base;
     opens org.bouncycastle.pqc.jcajce.provider.lms to java.base;
+    opens org.bouncycastle.jcajce.provider.asymmetric.mldsa to java.base;
+    opens org.bouncycastle.jcajce.provider.asymmetric.mlkem to java.base;
+    opens org.bouncycastle.jcajce.provider.asymmetric.slhdsa to java.base;
 
     exports org.bouncycastle;
     exports org.bouncycastle.asn1;
@@ -110,20 +113,22 @@
     exports org.bouncycastle.pqc.crypto.bike;
     exports org.bouncycastle.pqc.crypto.cmce;
     exports org.bouncycastle.pqc.crypto.crystals.dilithium;
+    exports org.bouncycastle.pqc.crypto.mldsa;
     exports org.bouncycastle.pqc.crypto.mlkem;
     exports org.bouncycastle.pqc.crypto.falcon;
     exports org.bouncycastle.pqc.crypto.frodo;
     exports org.bouncycastle.pqc.legacy.crypto.gemss;
     exports org.bouncycastle.pqc.crypto.hqc;
     exports org.bouncycastle.pqc.crypto.lms;
+    exports org.bouncycastle.pqc.crypto.mayo;
     exports org.bouncycastle.pqc.crypto.newhope;
     exports org.bouncycastle.pqc.crypto.ntru;
     exports org.bouncycastle.pqc.crypto.ntruprime;
     exports org.bouncycastle.pqc.crypto.picnic;
-    exports org.bouncycastle.pqc.legacy.crypto.rainbow;
     exports org.bouncycastle.pqc.crypto.saber;
     exports org.bouncycastle.pqc.crypto.sphincs;
     exports org.bouncycastle.pqc.crypto.sphincsplus;
+    exports org.bouncycastle.pqc.crypto.snova;
     exports org.bouncycastle.pqc.crypto.util;
     exports org.bouncycastle.pqc.crypto.xmss;
     exports org.bouncycastle.pqc.math.ntru;
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -78,7 +78,7 @@ public final class BouncyCastleProvider extends Provider
 {
     private static final Logger LOG = Logger.getLogger(BouncyCastleProvider.class.getName());
 
-    private static String info = "BouncyCastle Security Provider v1.80";
+    private static String info = "BouncyCastle Security Provider v1.81";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -171,7 +171,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.80, info);
+        super(PROVIDER_NAME, 1.81, info);
 
         AccessController.doPrivileged(new PrivilegedAction()
         {
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java b/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java
@@ -22,7 +22,7 @@ public class BouncyCastlePQCProvider
     extends Provider
     implements ConfigurableProvider
 {
-    private static String info = "BouncyCastle Post-Quantum Security Provider v1.80";
+    private static String info = "BouncyCastle Post-Quantum Security Provider v1.81";
 
     public static String PROVIDER_NAME = "BCPQC";
 
@@ -51,7 +51,7 @@ public class BouncyCastlePQCProvider
      */
     public BouncyCastlePQCProvider()
     {
-        super(PROVIDER_NAME, 1.80, info);
+        super(PROVIDER_NAME, 1.81, info);
 
         AccessController.doPrivileged(new PrivilegedAction()
         {
diff --git a/prov/src/main/jdk1.1/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/jdk1.1/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -43,7 +43,7 @@
 public final class BouncyCastleProvider extends Provider
     implements ConfigurableProvider
 {
-    private static String info = "BouncyCastle Security Provider v1.80";
+    private static String info = "BouncyCastle Security Provider v1.81";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -118,7 +118,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.8000, info);
+        super(PROVIDER_NAME, 1.8100, info);
 
         setup();
     }
diff --git a/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/jdk1.4/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -51,7 +51,7 @@
 public final class BouncyCastleProvider extends Provider
     implements ConfigurableProvider
 {
-    private static String info = "BouncyCastle Security Provider v1.80";
+    private static String info = "BouncyCastle Security Provider v1.81";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -135,7 +135,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.8000, info);
+        super(PROVIDER_NAME, 1.8100, info);
 
         AccessController.doPrivileged(new PrivilegedAction()
         {
diff --git a/prov/src/main/jdk1.9/module-info.java b/prov/src/main/jdk1.9/module-info.java
@@ -127,6 +127,7 @@
     exports org.bouncycastle.pqc.crypto.frodo;
     exports org.bouncycastle.pqc.crypto.hqc;
     exports org.bouncycastle.pqc.crypto.lms;
+    exports org.bouncycastle.pqc.crypto.mayo;
     exports org.bouncycastle.pqc.crypto.newhope;
     exports org.bouncycastle.pqc.crypto.ntru;
     exports org.bouncycastle.pqc.crypto.ntruprime;
@@ -136,6 +137,7 @@
     exports org.bouncycastle.pqc.crypto.sphincs;
     exports org.bouncycastle.pqc.crypto.sphincsplus;
     exports org.bouncycastle.pqc.crypto.slhdsa;
+    exports org.bouncycastle.pqc.crypto.snova;
     exports org.bouncycastle.pqc.crypto.util;
     exports org.bouncycastle.pqc.crypto.xmss;
     exports org.bouncycastle.pqc.math.ntru;
diff --git a/tls/src/main/java/org/bouncycastle/jsse/provider/BouncyCastleJsseProvider.java b/tls/src/main/java/org/bouncycastle/jsse/provider/BouncyCastleJsseProvider.java
@@ -26,8 +26,8 @@ public class BouncyCastleJsseProvider
 
     private static final String JSSE_CONFIG_PROPERTY = "org.bouncycastle.jsse.config";
 
-    private static final double PROVIDER_VERSION = 1.0020;
-    private static final String PROVIDER_INFO = "Bouncy Castle JSSE Provider Version 1.0.20";
+    private static final double PROVIDER_VERSION = 1.0021;
+    private static final String PROVIDER_INFO = "Bouncy Castle JSSE Provider Version 1.0.21";
 
     private final Map<String, BcJsseService> serviceMap = new ConcurrentHashMap<String, BcJsseService>();
     private final Map<String, EngineCreator> creatorMap = new HashMap<String, EngineCreator>();

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public final class BouncyCastleProvider extends Provider`
`78`	`78`	`{`
`79`	`79`	`private static final Logger LOG = Logger.getLogger(BouncyCastleProvider.class.getName());`
`80`	`80`
`81`		`- private static String info = "BouncyCastle Security Provider v1.80";`
	`81`	`+ private static String info = "BouncyCastle Security Provider v1.81";`
`82`	`82`
`83`	`83`	`public static final String PROVIDER_NAME = "BC";`
`84`	`84`
`@@ -171,7 +171,7 @@ public final class BouncyCastleProvider extends Provider`
`171`	`171`	`*/`
`172`	`172`	`public BouncyCastleProvider()`
`173`	`173`	`{`
`174`		`- super(PROVIDER_NAME, 1.80, info);`
	`174`	`+ super(PROVIDER_NAME, 1.81, info);`
`175`	`175`
`176`	`176`	`AccessController.doPrivileged(new PrivilegedAction()`
`177`	`177`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class BouncyCastlePQCProvider`
`22`	`22`	`extends Provider`
`23`	`23`	`implements ConfigurableProvider`
`24`	`24`	`{`
`25`		`- private static String info = "BouncyCastle Post-Quantum Security Provider v1.80";`
	`25`	`+ private static String info = "BouncyCastle Post-Quantum Security Provider v1.81";`
`26`	`26`
`27`	`27`	`public static String PROVIDER_NAME = "BCPQC";`
`28`	`28`
`@@ -51,7 +51,7 @@ public class BouncyCastlePQCProvider`
`51`	`51`	`*/`
`52`	`52`	`public BouncyCastlePQCProvider()`
`53`	`53`	`{`
`54`		`- super(PROVIDER_NAME, 1.80, info);`
	`54`	`+ super(PROVIDER_NAME, 1.81, info);`
`55`	`55`
`56`	`56`	`AccessController.doPrivileged(new PrivilegedAction()`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`public final class BouncyCastleProvider extends Provider`
`44`	`44`	`implements ConfigurableProvider`
`45`	`45`	`{`
`46`		`- private static String info = "BouncyCastle Security Provider v1.80";`
	`46`	`+ private static String info = "BouncyCastle Security Provider v1.81";`
`47`	`47`
`48`	`48`	`public static final String PROVIDER_NAME = "BC";`
`49`	`49`
`@@ -118,7 +118,7 @@ public final class BouncyCastleProvider extends Provider`
`118`	`118`	`*/`
`119`	`119`	`public BouncyCastleProvider()`
`120`	`120`	`{`
`121`		`- super(PROVIDER_NAME, 1.8000, info);`
	`121`	`+ super(PROVIDER_NAME, 1.8100, info);`
`122`	`122`
`123`	`123`	`setup();`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`public final class BouncyCastleProvider extends Provider`
`52`	`52`	`implements ConfigurableProvider`
`53`	`53`	`{`
`54`		`- private static String info = "BouncyCastle Security Provider v1.80";`
	`54`	`+ private static String info = "BouncyCastle Security Provider v1.81";`
`55`	`55`
`56`	`56`	`public static final String PROVIDER_NAME = "BC";`
`57`	`57`
`@@ -135,7 +135,7 @@ public final class BouncyCastleProvider extends Provider`
`135`	`135`	`*/`
`136`	`136`	`public BouncyCastleProvider()`
`137`	`137`	`{`
`138`		`- super(PROVIDER_NAME, 1.8000, info);`
	`138`	`+ super(PROVIDER_NAME, 1.8100, info);`
`139`	`139`
`140`	`140`	`AccessController.doPrivileged(new PrivilegedAction()`
`141`	`141`	`{`