1.74 release updates

dghgit · dghgit · commit f0dec6ec2948 · 2023-06-07T12:30:53.000+10:00
diff --git a/CONTRIBUTORS.html b/CONTRIBUTORS.html
@@ -530,7 +530,9 @@
 <li>Phillip Schichtel &lt;https://github.com/pschichtel&gt; - initial code for specifying wrapping algorithm with PGP PBE encryption method, forcing of session key usage.</li>
 <li>Alexander Dippel &lt;https://github.com/adippel&gt; - corrections to prevent NPEs on chunked encoding of EST responses.</li>
 <li>Johann N. Löfflmann &lt;https://github.com/jonelo&gt; - fix to "too small" buffer issue in Blake2sp.</li>
-<li>scott-xu &lt;https://github.com/scott-xu&gt; - message fix in OpenSSHPublicKeyUtil</li>
+<li> Scott Xu &lt;https://github.com/scott-xu&gt; - message fix in OpenSSHPublicKeyUtil</li>
+<li>Scott Arciszewski &lt;https://github/scottarc&gt; - correction to ant scripts to ensure UTF8 support.</li>
+<li>GitHub Security team - identification of the X509LDAPCertStoreSpi wildcard bug (see CVE-2023-33201).</li>
 </ul>
 </body>
 </html>
diff --git a/ant/jdk15+.xml b/ant/jdk15+.xml
@@ -47,7 +47,7 @@
             <fileset dir="pkix/src/main/java" includes="**/*.java" />
             <fileset dir="pkix/src/main/jdk1.5" includes="**/*.java" />
             <fileset dir="pkix/src/main/javadoc" includes="**/*.html" />
-            <fileset dir="pkix/src/main/java" includes="**/*.properties" />
+            <fileset dir="pkix/src/main/resources" includes="**/*.properties" />
             <fileset dir="pkix/src/test/java" includes="**/*.java" />
             <fileset dir="pkix/src/test/javadoc" includes="**/*.html" />
             <fileset dir="pkix/src/test/resources" includes="**/*.*" />
diff --git a/build.gradle b/build.gradle
@@ -164,7 +164,7 @@ subprojects {
     targetCompatibility = 1.8
   }
 
-  version = '1.73'
+  version = '1.74'
 
  task testFull(type:Test) {
     systemProperties = [
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.73";
+    private static String info = "BouncyCastle Security Provider v1.74";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -118,7 +118,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.73, info);
+        super(PROVIDER_NAME, 1.74, 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
@@ -49,7 +49,7 @@
 public final class BouncyCastleProvider extends Provider
     implements ConfigurableProvider
 {
-    private static String info = "BouncyCastle Security Provider v1.73";
+    private static String info = "BouncyCastle Security Provider v1.74";
 
     public static final String PROVIDER_NAME = "BC";
 
@@ -133,7 +133,7 @@ public final class BouncyCastleProvider extends Provider
      */
     public BouncyCastleProvider()
     {
-        super(PROVIDER_NAME, 1.73, info);
+        super(PROVIDER_NAME, 1.74, info);
 
         AccessController.doPrivileged(new PrivilegedAction()
         {

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ subprojects {`
`164`	`164`	`targetCompatibility = 1.8`
`165`	`165`	`}`
`166`	`166`
`167`		`- version = '1.73'`
	`167`	`+ version = '1.74'`
`168`	`168`
`169`	`169`	`task testFull(type:Test) {`
`170`	`170`	`systemProperties = [`
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.73";`
	`46`	`+ private static String info = "BouncyCastle Security Provider v1.74";`
`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.73, info);`
	`121`	`+ super(PROVIDER_NAME, 1.74, info);`
`122`	`122`
`123`	`123`	`setup();`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`public final class BouncyCastleProvider extends Provider`
`50`	`50`	`implements ConfigurableProvider`
`51`	`51`	`{`
`52`		`- private static String info = "BouncyCastle Security Provider v1.73";`
	`52`	`+ private static String info = "BouncyCastle Security Provider v1.74";`
`53`	`53`
`54`	`54`	`public static final String PROVIDER_NAME = "BC";`
`55`	`55`
`@@ -133,7 +133,7 @@ public final class BouncyCastleProvider extends Provider`
`133`	`133`	`*/`
`134`	`134`	`public BouncyCastleProvider()`
`135`	`135`	`{`
`136`		`- super(PROVIDER_NAME, 1.73, info);`
	`136`	`+ super(PROVIDER_NAME, 1.74, info);`
`137`	`137`
`138`	`138`	`AccessController.doPrivileged(new PrivilegedAction()`
`139`	`139`	`{`