Merge branch 'main' into 1832-openpgp-test-coverage

gefeili · gefeili · commit e8e08e76e21e · 2024-10-23T12:19:48.000+10:30
diff --git a/bc-build.properties b/bc-build.properties
@@ -3,10 +3,10 @@
 # intended to hold user-specific settings that are *not* committed to 
 # the repository.
 
-release.suffix: 1.79b01
-release.name: 1.78.99
-release.version: 1.78.99
-release.debug: true
+release.suffix: 1.79
+release.name: 1.79
+release.version: 1.79
+release.debug: false
 
 mail.jar.home: ./libs/javax.mail-1.4.7.jar
 activation.jar.home:  ./libs/activation-1.1.1.jar
diff --git a/build.gradle b/build.gradle
@@ -262,7 +262,7 @@ subprojects {
     }
 
     tasks.withType(JavaCompile).configureEach {
-        options.debug = true;
+        options.debug = false;
     }
 
     tasks.withType(Test).configureEach {
diff --git a/docs/releasenotes.html b/docs/releasenotes.html
@@ -24,6 +24,7 @@ <h2>2.0 Release History</h2>
 <h3>2.1.2 Defects Fixed</h3>
 <ul>
 <li>Leading zeroes were sometimes dropped from Ed25519 signatures leading to verification errors in the PGP API. This has been fixed.</li>
+<li>Default version string for Armored Output is now set correctly in 18on build.</li>
 </ul>
 <h3>2.1.3 Additional Features and Functionality</h3>
 <ul>
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx2g
-version=1.79-SNAPSHOT
+version=1.79
 maxVersion=1.80
 org.gradle.java.installations.auto-detect=false
 org.gradle.java.installations.auto-download=false
diff --git a/maven_public_key.asc b/maven_public_key.asc
diff --git a/pkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java b/pkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java
@@ -169,9 +169,9 @@ public DefaultCMSSignatureAlgorithmNameGenerator()
         simpleAlgs.put(MiscObjectIdentifiers.id_alg_composite, "COMPOSITE");
         simpleAlgs.put(BCObjectIdentifiers.falcon_512, "Falcon-512");
         simpleAlgs.put(BCObjectIdentifiers.falcon_1024, "Falcon-1024");
-        simpleAlgs.put(NISTObjectIdentifiers.id_ml_dsa_44, "Dilithium2");
-        simpleAlgs.put(NISTObjectIdentifiers.id_ml_dsa_65, "Dilithium3");
-        simpleAlgs.put(NISTObjectIdentifiers.id_ml_dsa_87, "Dilithium5");
+        simpleAlgs.put(BCObjectIdentifiers.dilithium2, "Dilithium2");
+        simpleAlgs.put(BCObjectIdentifiers.dilithium3, "Dilithium3");
+        simpleAlgs.put(BCObjectIdentifiers.dilithium5, "Dilithium5");
         simpleAlgs.put(BCObjectIdentifiers.sphincsPlus_sha2_128s, "SPHINCS+-SHA2-128s");
         simpleAlgs.put(BCObjectIdentifiers.sphincsPlus_sha2_128f, "SPHINCS+-SHA2-128f");
         simpleAlgs.put(BCObjectIdentifiers.sphincsPlus_sha2_192s, "SPHINCS+-SHA2-192s");
@@ -185,13 +185,24 @@ public DefaultCMSSignatureAlgorithmNameGenerator()
         simpleAlgs.put(BCObjectIdentifiers.sphincsPlus_shake_256s, "SPHINCS+-SHAKE-256s");
         simpleAlgs.put(BCObjectIdentifiers.sphincsPlus_shake_256f, "SPHINCS+-SHAKE-256f");
 
+        simpleAlgs.put(NISTObjectIdentifiers.id_ml_dsa_44, "ML-DSA-44");
+        simpleAlgs.put(NISTObjectIdentifiers.id_ml_dsa_65, "ML-DSA-65");
+        simpleAlgs.put(NISTObjectIdentifiers.id_ml_dsa_87, "ML-DSA-87");
+
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_128s, "SLH-DSA-SHA2-128S");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_128f, "SLH-DSA-SHA2-128F");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_192s, "SLH-DSA-SHA2-192S");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_192f, "SLH-DSA-SHA2-192F");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256s, "SLH-DSA-SHA2-256S");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256s, "SLH-DSA-SHA2-256F");
 
+        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_128s, "SLH-DSA-SHAKE-128S");
+        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_128f, "SLH-DSA-SHAKE-128F");
+        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_192s, "SLH-DSA-SHAKE-192S");
+        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_192f, "SLH-DSA-SHAKE-192F");
+        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_256s, "SLH-DSA-SHAKE-256S");
+        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_256s, "SLH-DSA-SHAKE-256F");
+
         simpleAlgs.put(BCObjectIdentifiers.picnic_signature, "Picnic");
     }
 
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -76,7 +76,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.79b";
+    private static String info = "BouncyCastle Security Provider v1.79";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -169,7 +169,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.7899, info);
+        super(PROVIDER_NAME, 1.7900, 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.78.1";
+    private static String info = "BouncyCastle Post-Quantum Security Provider v1.79";
 
     public static String PROVIDER_NAME = "BCPQC";
 
@@ -50,7 +50,7 @@ public class BouncyCastlePQCProvider
      */
     public BouncyCastlePQCProvider()
     {
-        super(PROVIDER_NAME, 1.7801, info);
+        super(PROVIDER_NAME, 1.7900, 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.78.1";
+    private static String info = "BouncyCastle Security Provider v1.79";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -118,7 +118,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.7801, info);
+        super(PROVIDER_NAME, 1.7900, 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.78.1";
+    private static String info = "BouncyCastle Security Provider v1.79";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -135,7 +135,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.7801, info);
+        super(PROVIDER_NAME, 1.7900, info);
 
         AccessController.doPrivileged(new PrivilegedAction()
         {

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ subprojects {`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`tasks.withType(JavaCompile).configureEach {`
`265`		`- options.debug = true;`
	`265`	`+ options.debug = false;`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`tasks.withType(Test).configureEach {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public final class BouncyCastleProvider extends Provider`
`76`	`76`	`{`
`77`	`77`	`private static final Logger LOG = Logger.getLogger(BouncyCastleProvider.class.getName());`
`78`	`78`
`79`		`- private static String info = "BouncyCastle Security Provider v1.79b";`
	`79`	`+ private static String info = "BouncyCastle Security Provider v1.79";`
`80`	`80`
`81`	`81`	`public static final String PROVIDER_NAME = "BC";`
`82`	`82`
`@@ -169,7 +169,7 @@ public final class BouncyCastleProvider extends Provider`
`169`	`169`	`*/`
`170`	`170`	`public BouncyCastleProvider()`
`171`	`171`	`{`
`172`		`- super(PROVIDER_NAME, 1.7899, info);`
	`172`	`+ super(PROVIDER_NAME, 1.7900, info);`
`173`	`173`
`174`	`174`	`AccessController.doPrivileged(new PrivilegedAction()`
`175`	`175`	`{`
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.78.1";`
	`25`	`+ private static String info = "BouncyCastle Post-Quantum Security Provider v1.79";`
`26`	`26`
`27`	`27`	`public static String PROVIDER_NAME = "BCPQC";`
`28`	`28`
`@@ -50,7 +50,7 @@ public class BouncyCastlePQCProvider`
`50`	`50`	`*/`
`51`	`51`	`public BouncyCastlePQCProvider()`
`52`	`52`	`{`
`53`		`- super(PROVIDER_NAME, 1.7801, info);`
	`53`	`+ super(PROVIDER_NAME, 1.7900, info);`
`54`	`54`
`55`	`55`	`AccessController.doPrivileged(new PrivilegedAction()`
`56`	`56`	`{`
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.78.1";`
	`46`	`+ private static String info = "BouncyCastle Security Provider v1.79";`
`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.7801, info);`
	`121`	`+ super(PROVIDER_NAME, 1.7900, 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.78.1";`
	`54`	`+ private static String info = "BouncyCastle Security Provider v1.79";`
`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.7801, info);`
	`138`	`+ super(PROVIDER_NAME, 1.7900, info);`
`139`	`139`
`140`	`140`	`AccessController.doPrivileged(new PrivilegedAction()`
`141`	`141`	`{`