Merge remote-tracking branch 'origin/main'

Author: gefeili

ant/jdk14.xml

@@ -41,6 +41,8 @@
             </fileset>
             <fileset dir="pg/src/main/java">
                 <exclude name="**/keybox/**/*.java"/>
+                <exclude name="**/api/*.java"/>
+                <exclude name="**/api/**/*.java"/>
             </fileset>
             <fileset dir="pkix/src/main/java">
                 <exclude name="**/JceAADStream.java"/>
@@ -213,7 +215,9 @@
             <fileset dir="pg/src/main/javadoc"/>
         </copy>
         <copy todir="${src.dir}" overwrite="true">
-            <fileset dir="pg/src/main/jdk1.5" includes="**/*.java"/>
+            <fileset dir="pg/src/main/jdk1.5">
+                <exclude name="**/api/**/*.java"/>
+            </fileset>
             <fileset dir="prov/src/test/jdk1.5" includes="**/*.java"/>
         </copy>
         <copy todir="${src.dir}" overwrite="true">

pg/src/main/java/org/bouncycastle/openpgp/IntegrityProtectedInputStream.java

@@ -1,11 +1,12 @@
 package org.bouncycastle.openpgp;
 
-import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket;
-
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.bouncycastle.bcpg.SymmetricEncIntegrityPacket;
+import org.bouncycastle.util.Exceptions;
+
 /**
  * {@link InputStream} that performs verification of integrity protection upon {@link #close()}.
  */
@@ -76,7 +77,7 @@ public void close()
                 }
                 catch (PGPException e)
                 {
-                    throw new IOException(e);
+                    throw Exceptions.ioException(e.getMessage(), e);
                 }
             }
         }

pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPCertificateTest.java

@@ -775,8 +775,9 @@ private void signatureValidityTest(OpenPGPApi api, String cert, TestSignature...
     {
         OpenPGPCertificate certificate = api.readKeyOrCertificate().parseCertificate(cert);
 
-        for (TestSignature test : testSignatures)
+        for (int i = 0; i != testSignatures.length; i++)
         {
+            TestSignature test = testSignatures[i];
             PGPSignature signature = test.getSignature();
             OpenPGPCertificate.OpenPGPComponentKey signingKey = certificate.getSigningKeyFor(signature);