Java compatibility updates.

First cut of Delta Certificate support.

Author: dghgit

bc-build.properties

@@ -8,7 +8,7 @@ release.name: 1.74.0
 release.version: 1.74.0
 release.debug: false
 
-mail.jar.home: ./libs/javax.mail-api-1.4.7.jar
+mail.jar.home: ./libs/javax.mail-1.4.7.jar
 activation.jar.home:  ./libs/activation-1.1.1.jar
 jmail.jar.home: ./libs/jakarta.mail-2.0.1.jar
 jactivation.jar.home:  ./libs/jakarta.activation-api-2.0.0.jar

build.gradle

@@ -37,7 +37,7 @@ allprojects {
   }
 
   dependencies {
-    testImplementation group: 'junit', name: 'junit', version: '4.11'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
   }
 
   tasks.withType(JavaCompile).configureEach {   

mail/src/test/jdk1.4/org/bouncycastle/mail/smime/test/SignedMailValidatorTest.java

@@ -139,7 +139,10 @@ public static byte[] encrypt(
             out = new ArmoredOutputStream(out);
         }
 
-        PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(algorithm).setSecureRandom(new SecureRandom()).setProvider("BC"));
+        JcePGPDataEncryptorBuilder encryptorBuilder = new JcePGPDataEncryptorBuilder(algorithm)
+            .setSecureRandom(new SecureRandom()).setProvider("BC");
+
+        PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(encryptorBuilder);
         encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator(passPhrase).setProvider("BC"));
 
         OutputStream encOut = encGen.open(out, compressedData.length);

pg/src/main/java/org/bouncycastle/openpgp/examples/ByteArrayHandler.java

@@ -29,6 +29,7 @@
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
 import org.bouncycastle.openpgp.PGPUtil;
 import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
+import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder;
 import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
 import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
 import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder;
@@ -216,8 +217,12 @@ private static void encryptFile(
         {
             byte[] bytes = PGPExampleUtil.compressFile(fileName, CompressionAlgorithmTags.ZIP);
 
-            PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(
-                new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(withIntegrityCheck).setSecureRandom(new SecureRandom()).setProvider("BC"));
+            PGPDataEncryptorBuilder encryptorBuilder = new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5)
+                        .setProvider("BC")
+                        .setSecureRandom(new SecureRandom())
+                        .setWithIntegrityPacket(withIntegrityCheck);
+
+            PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(encryptorBuilder);
 
             encGen.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(encKey).setProvider("BC"));
 

pg/src/main/java/org/bouncycastle/openpgp/examples/KeyBasedFileProcessor.java

@@ -29,6 +29,7 @@
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
 import org.bouncycastle.openpgp.PGPUtil;
 import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
+import org.bouncycastle.openpgp.operator.PGPDataEncryptorBuilder;
 import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
 import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
 import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder;
@@ -214,8 +215,13 @@ private static void encryptFile(
         }
 
         try
-        {    
-            PGPEncryptedDataGenerator   cPk = new PGPEncryptedDataGenerator(new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(withIntegrityCheck).setSecureRandom(new SecureRandom()).setProvider("BC"));
+        {
+            PGPDataEncryptorBuilder encryptorBuilder = new JcePGPDataEncryptorBuilder(PGPEncryptedData.CAST5)
+                    .setProvider("BC")
+                    .setSecureRandom(new SecureRandom())
+                    .setWithIntegrityPacket(withIntegrityCheck);
+    
+            PGPEncryptedDataGenerator   cPk = new PGPEncryptedDataGenerator(encryptorBuilder);
 
             cPk.addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(encKey).setProvider("BC"));
 

pg/src/main/java/org/bouncycastle/openpgp/examples/KeyBasedLargeFileProcessor.java

@@ -1,5 +1,16 @@
 package org.bouncycastle.openpgp.examples;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.SecureRandom;
+import java.security.Security;
+
 import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.bouncycastle.bcpg.CompressionAlgorithmTags;
 import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
@@ -20,17 +31,6 @@
 import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
 import org.bouncycastle.util.io.Streams;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.security.Security;
-
 /**
  * A simple utility class that encrypts/decrypts password based
  * encryption files.
@@ -155,8 +155,8 @@ private static void encryptToStream(
             // Encryption
             PGPDataEncryptorBuilder dataEncBuilder = new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.AES_256)
                     .setProvider("BC")
-                    .setWithIntegrityPacket(true)
-                    .setSecureRandom(new SecureRandom());
+                    .setSecureRandom(new SecureRandom())
+                    .setWithIntegrityPacket(true);
             PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(dataEncBuilder);
             encGen.addMethod(new JcePBEKeyEncryptionMethodGenerator(passPhrase).setProvider("BC"));
             OutputStream encOut = encGen.open(out, new byte[8192]);

pg/src/main/java/org/bouncycastle/openpgp/examples/PBEFileProcessor.java

@@ -116,7 +116,7 @@ public PGPDataEncryptorBuilder setWithAEAD(int aeadAlgorithm, int chunkSize)
      * @param random the secure random to be used.
      * @return the current builder.
      */
-    public PGPDataEncryptorBuilder setSecureRandom(SecureRandom random)
+    public BcPGPDataEncryptorBuilder setSecureRandom(SecureRandom random)
     {
         this.random = random;
 

pg/src/main/jdk1.4/org/bouncycastle/openpgp/operator/bc/BcPGPDataEncryptorBuilder.java

@@ -118,7 +118,7 @@ public PGPDataEncryptorBuilder setUseV6AEAD()
      * @param provider the JCE provider to use.
      * @return the current builder.
      */
-    public PGPDataEncryptorBuilder setProvider(Provider provider)
+    public JcePGPDataEncryptorBuilder setProvider(Provider provider)
     {
         this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
         this.aeadHelper = new JceAEADUtil(helper);
@@ -132,7 +132,7 @@ public PGPDataEncryptorBuilder setProvider(Provider provider)
      * @param providerName the name of the JCE provider to use.
      * @return the current builder.
      */
-    public PGPDataEncryptorBuilder setProvider(String providerName)
+    public JcePGPDataEncryptorBuilder setProvider(String providerName)
     {
         this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
         this.aeadHelper = new JceAEADUtil(helper);
@@ -149,7 +149,7 @@ public PGPDataEncryptorBuilder setProvider(String providerName)
      * @param random the secure random to be used.
      * @return the current builder.
      */
-    public PGPDataEncryptorBuilder setSecureRandom(SecureRandom random)
+    public JcePGPDataEncryptorBuilder setSecureRandom(SecureRandom random)
     {
         this.random = random;
 

pg/src/main/jdk1.4/org/bouncycastle/openpgp/operator/jcajce/JcePGPDataEncryptorBuilder.java

@@ -334,7 +334,7 @@ public void performTest()
         // with integrity packet
         //
         cbOut = new ByteArrayOutputStream();
-        cPk = new PGPEncryptedDataGenerator(new BcPGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(true).setSecureRandom(rand));
+        cPk = new PGPEncryptedDataGenerator(new BcPGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setSecureRandom(rand).setWithIntegrityPacket(true));
 
         cPk.addMethod(new BcPBEKeyEncryptionMethodGenerator(pass));
 
@@ -413,7 +413,7 @@ public void performTest()
         comOut.close();
 
         cbOut = new ByteArrayOutputStream();
-        cPk = new PGPEncryptedDataGenerator(new BcPGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setWithIntegrityPacket(true).setSecureRandom(rand));
+        cPk = new PGPEncryptedDataGenerator(new BcPGPDataEncryptorBuilder(PGPEncryptedData.CAST5).setSecureRandom(rand).setWithIntegrityPacket(true));
 
         cPk.addMethod(new BcPBEKeyEncryptionMethodGenerator(pass));
 

pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPPBETest.java

@@ -446,7 +446,7 @@ private void mixedTest(PGPPrivateKey pgpPrivKey, PGPPublicKey pgpPubKey)
 
         ByteArrayOutputStream bcOut = new ByteArrayOutputStream();
 
-        PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new BcPGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.AES_128).setWithIntegrityPacket(true).setSecureRandom(new SecureRandom()));
+        PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(new BcPGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.AES_128).setSecureRandom(new SecureRandom()).setWithIntegrityPacket(true));
 
         encGen.addMethod(new BcPublicKeyKeyEncryptionMethodGenerator(pgpPubKey));