Merge branch 'openpgp-certificate-refactor' into 'main'

dghgit · dghgit · commit 42a4b2695610 · 2025-05-26T09:13:59.000Z
Openpgp certificate refactor

See merge request root/bc-java!99
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ArmoredOutputStream.java b/pg/src/main/java/org/bouncycastle/bcpg/ArmoredOutputStream.java
@@ -639,7 +639,7 @@ public Builder addSplitMultilineComment(String comment)
                     line = line.substring(availableCommentCharsPerLine).trim();
                 }
 
-                if (!line.isEmpty())
+                if (line.length() != 0)
                 {
                     addComment(line);
                 }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/AbstractOpenPGPDocumentSignatureGenerator.java b/pg/src/main/java/org/bouncycastle/openpgp/api/AbstractOpenPGPDocumentSignatureGenerator.java
@@ -5,7 +5,6 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 import java.util.function.IntPredicate;
 
 import org.bouncycastle.bcpg.sig.PreferredAlgorithms;
@@ -64,7 +63,11 @@ public AbstractOpenPGPDocumentSignatureGenerator(OpenPGPImplementation implement
      */
     public T setSigningKeySelector(SubkeySelector signingKeySelector)
     {
-        this.signingKeySelector = Objects.requireNonNull(signingKeySelector);
+        if (signingKeySelector == null)
+        {
+             throw new NullPointerException();
+        }
+        this.signingKeySelector = signingKeySelector;
         return (T)this;
     }
 
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java
@@ -15,7 +15,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.function.Function;
 
 import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.bouncycastle.bcpg.BCPGInputStream;
@@ -3034,41 +3033,56 @@ public boolean isHardRevocation()
          */
         public Date getSince()
         {
-            // Find most recent chain link
-//            return chainLinks.stream()
-//                .map(it -> it.signature)
-//                .max(Comparator.comparing(OpenPGPComponentSignature::getCreationTime))
-//                .map(OpenPGPComponentSignature::getCreationTime)
-//                .orElse(null);
-            return chainLinks.stream()
-                .map(new Function<Link, Object>()
-                {
-                    @Override
-                    public OpenPGPComponentSignature apply(Link it)
-                    {
-                        return it.signature; // Replace lambda: `it -> it.signature`
-                    }
-
-                })
-                .max(new Comparator<Object>()
-                {
-                    @Override
-                    public int compare(Object o1, Object o2)
-                    {
-                        // Replace method reference: `Comparator.comparing(OpenPGPComponentSignature::getCreationTime)`
-                        return ((OpenPGPComponentSignature)o1).getCreationTime().compareTo(((OpenPGPComponentSignature)o2).getCreationTime());
-                    }
-                })
-                .map(new Function<Object, Date>()
+            Date latestDate = null;
+            for (Iterator it = chainLinks.iterator(); it.hasNext(); )
+            {
+                Link link = (Link)it.next();
+                OpenPGPComponentSignature signature = link.getSignature();
+                Date currentDate = signature.getCreationTime();
+                if (latestDate == null || currentDate.after(latestDate))
                 {
-                    @Override
-                    public Date apply(Object sig)
-                    {
-                        return ((OpenPGPComponentSignature)sig).getCreationTime(); // Replace method reference: `OpenPGPComponentSignature::getCreationTime`
-                    }
-                })
-                .orElse(null);
+                    latestDate = currentDate;
+                }
+            }
+            return latestDate;
         }
+//        public Date getSince()
+//        {
+//            // Find most recent chain link
+////            return chainLinks.stream()
+////                .map(it -> it.signature)
+////                .max(Comparator.comparing(OpenPGPComponentSignature::getCreationTime))
+////                .map(OpenPGPComponentSignature::getCreationTime)
+////                .orElse(null);
+//            return chainLinks.stream()
+//                .map(new Function<Link, Object>()
+//                {
+//                    @Override
+//                    public OpenPGPComponentSignature apply(Link it)
+//                    {
+//                        return it.signature; // Replace lambda: `it -> it.signature`
+//                    }
+//
+//                })
+//                .max(new Comparator<Object>()
+//                {
+//                    @Override
+//                    public int compare(Object o1, Object o2)
+//                    {
+//                        // Replace method reference: `Comparator.comparing(OpenPGPComponentSignature::getCreationTime)`
+//                        return ((OpenPGPComponentSignature)o1).getCreationTime().compareTo(((OpenPGPComponentSignature)o2).getCreationTime());
+//                    }
+//                })
+//                .map(new Function<Object, Date>()
+//                {
+//                    @Override
+//                    public Date apply(Object sig)
+//                    {
+//                        return ((OpenPGPComponentSignature)sig).getCreationTime(); // Replace method reference: `OpenPGPComponentSignature::getCreationTime`
+//                    }
+//                })
+//                .orElse(null);
+//        }
 
         /**
          * Return the date until which the chain link is valid.
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKeyEditor.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKeyEditor.java
@@ -101,7 +101,8 @@ public OpenPGPKeyEditor addUserId(String userId,
                                       SignatureParameters.Callback signatureCallback)
         throws PGPException
     {
-        if (userId == null || userId.trim().isEmpty())
+        // care needs to run with Java 5
+        if (userId == null || userId.trim().length() == 0)
         {
             throw new IllegalArgumentException("User-ID cannot be null or empty.");
         }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKeyGenerator.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKeyGenerator.java
@@ -379,7 +379,8 @@ public WithPrimaryKey addUserId(
             SignatureParameters.Callback signatureParameters)
             throws PGPException
         {
-            if (userId == null || userId.trim().isEmpty())
+            // care - needs to run with Java 5.
+            if (userId == null || userId.trim().length() == 0)
             {
                 throw new IllegalArgumentException("User-ID cannot be null or empty.");
             }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKeyMaterialPool.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKeyMaterialPool.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -63,7 +62,11 @@ public OpenPGPKeyMaterialPool(Collection<M> items)
      */
     public OpenPGPKeyMaterialPool<M> setMissingItemCallback(OpenPGPKeyMaterialProvider<M> callback)
     {
-        this.callback = Objects.requireNonNull(callback);
+        if (callback == null)
+        {
+            throw new NullPointerException();
+        }
+        this.callback = callback;
         return this;
     }
 
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPMessageGenerator.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPMessageGenerator.java
@@ -8,7 +8,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 import org.bouncycastle.bcpg.AEADAlgorithmTags;
@@ -571,7 +570,11 @@ public int negotiateCompression(OpenPGPMessageGenerator configuration, OpenPGPPo
      */
     public OpenPGPMessageGenerator setPasswordBasedEncryptionNegotiator(OpenPGPEncryptionNegotiator pbeNegotiator)
     {
-        this.passwordBasedEncryptionNegotiator = Objects.requireNonNull(pbeNegotiator);
+        if (pbeNegotiator == null)
+        {
+            throw new NullPointerException();
+        }
+        this.passwordBasedEncryptionNegotiator = pbeNegotiator;
         return this;
     }
 
@@ -584,7 +587,11 @@ public OpenPGPMessageGenerator setPasswordBasedEncryptionNegotiator(OpenPGPEncry
      */
     public OpenPGPMessageGenerator setPublicKeyBasedEncryptionNegotiator(OpenPGPEncryptionNegotiator pkbeNegotiator)
     {
-        this.publicKeyBasedEncryptionNegotiator = Objects.requireNonNull(pkbeNegotiator);
+        if (pkbeNegotiator == null)
+        {
+            throw new NullPointerException();
+        }
+        this.publicKeyBasedEncryptionNegotiator = pkbeNegotiator;
         return this;
     }
 
@@ -598,7 +605,11 @@ public OpenPGPMessageGenerator setPublicKeyBasedEncryptionNegotiator(OpenPGPEncr
      */
     public OpenPGPMessageGenerator setEncryptionKeySelector(SubkeySelector encryptionKeySelector)
     {
-        this.encryptionKeySelector = Objects.requireNonNull(encryptionKeySelector);
+        if (encryptionKeySelector == null)
+        {
+            throw new NullPointerException();
+        }
+        this.encryptionKeySelector = encryptionKeySelector;
         return this;
     }
 
@@ -612,7 +623,11 @@ public OpenPGPMessageGenerator setEncryptionKeySelector(SubkeySelector encryptio
      */
     public OpenPGPMessageGenerator setCompressionNegotiator(CompressionNegotiator compressionNegotiator)
     {
-        this.compressionNegotiator = Objects.requireNonNull(compressionNegotiator);
+        if (compressionNegotiator == null)
+        {
+            throw new NullPointerException();
+        }
+        this.compressionNegotiator = compressionNegotiator;
         return this;
     }
 
@@ -624,7 +639,11 @@ public OpenPGPMessageGenerator setCompressionNegotiator(CompressionNegotiator co
      */
     public OpenPGPMessageGenerator setArmorStreamFactory(ArmoredOutputStreamFactory factory)
     {
-        this.armorStreamFactory = Objects.requireNonNull(factory);
+        if (factory == null)
+        {
+            throw new NullPointerException();
+        }
+        this.armorStreamFactory = factory;
         return this;
     }
 
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/SignatureParameters.java b/pg/src/main/java/org/bouncycastle/openpgp/api/SignatureParameters.java
@@ -1,7 +1,6 @@
 package org.bouncycastle.openpgp.api;
 
 import java.util.Date;
-import java.util.Objects;
 
 import org.bouncycastle.openpgp.PGPSignature;
 import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
@@ -200,8 +199,13 @@ public int getSignatureType()
      */
     public SignatureParameters setSignatureCreationTime(Date signatureCreationTime)
     {
-        this.signatureCreationTime = Objects.requireNonNull(signatureCreationTime,
-            "Signature creation time cannot be null.");
+        if (signatureCreationTime == null)
+        {
+             throw new NullPointerException("Signature creation time cannot be null.");
+        }
+        
+        this.signatureCreationTime = signatureCreationTime;
+
         return this;
     }
 
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPKeyPairGeneratorProvider.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPGPKeyPairGeneratorProvider.java
@@ -142,8 +142,8 @@ public PGPKeyPair generateECDHKeyPair(ASN1ObjectIdentifier curveOID)
         {
             ECKeyPairGenerator gen = new ECKeyPairGenerator();
             gen.init(new ECKeyGenerationParameters(
-                    new ECNamedDomainParameters(curveOID, getNamedCurveByOid(curveOID)),
-                    CryptoServicesRegistrar.getSecureRandom()));
+                new ECNamedDomainParameters(curveOID, getNamedCurveByOid(curveOID)),
+                CryptoServicesRegistrar.getSecureRandom()));
 
             AsymmetricCipherKeyPair keyPair = gen.generateKeyPair();
             return new BcPGPKeyPair(version, PublicKeyAlgorithmTags.ECDH, keyPair, creationTime);
@@ -155,8 +155,8 @@ public PGPKeyPair generateECDSAKeyPair(ASN1ObjectIdentifier curveOID)
         {
             ECKeyPairGenerator gen = new ECKeyPairGenerator();
             gen.init(new ECKeyGenerationParameters(
-                    new ECNamedDomainParameters(curveOID, getNamedCurveByOid(curveOID)),
-                    CryptoServicesRegistrar.getSecureRandom()));
+                new ECNamedDomainParameters(curveOID, getNamedCurveByOid(curveOID)),
+                CryptoServicesRegistrar.getSecureRandom()));
 
             AsymmetricCipherKeyPair keyPair = gen.generateKeyPair();
             return new BcPGPKeyPair(version, PublicKeyAlgorithmTags.ECDSA, keyPair, creationTime);
diff --git a/pg/src/main/jdk1.5/org/bouncycastle/openpgp/api/SignatureParameters.java b/pg/src/main/jdk1.5/org/bouncycastle/openpgp/api/SignatureParameters.java
@@ -5,7 +5,6 @@
 import org.bouncycastle.util.Arrays;
 
 import java.util.Date;
-import java.util.Objects;
 
 /**
  * Parameters for signature generation.
@@ -200,8 +199,11 @@ public int getSignatureType()
      */
     public SignatureParameters setSignatureCreationTime(Date signatureCreationTime)
     {
-        this.signatureCreationTime = Objects.requireNonNull(signatureCreationTime,
-            "Signature creation time cannot be null.");
+        if (signatureCreationTime == null)
+        {
+            throw new NullPointerException("Signature creation time cannot be null.");
+        }
+        this.signatureCreationTime = signatureCreationTime;
         return this;
     }
 
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/ChangeKeyPassphraseTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/ChangeKeyPassphraseTest.java
@@ -15,11 +15,14 @@ public class ChangeKeyPassphraseTest
     protected void performTestWith(OpenPGPApi api)
             throws PGPException, IOException
     {
-        removeAEADPassphrase(api);
-        addAEADPassphrase(api);
-        changeAEADPassphrase(api);
-
-        testChangingCFBPassphrase(api);
+        if (System.getProperty("java.version").indexOf("1.5.") < 0)
+        {
+            removeAEADPassphrase(api);
+            addAEADPassphrase(api);
+            changeAEADPassphrase(api);
+
+            testChangingCFBPassphrase(api);
+        }
     }
 
     private void removeAEADPassphrase(OpenPGPApi api)
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPCertificateTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPCertificateTest.java
@@ -2,7 +2,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
 
@@ -26,6 +25,7 @@
 import org.bouncycastle.openpgp.api.SignatureSubpacketsFunction;
 import org.bouncycastle.openpgp.api.util.UTCUtil;
 import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
+import org.bouncycastle.util.Strings;
 
 public class OpenPGPCertificateTest
         extends APITest
@@ -808,7 +808,6 @@ private void testGetPrimaryUserId(OpenPGPApi api)
                 .addUserId("New primary <primary@user.id>",
                         SignatureParameters.Callback.Util.modifyHashedSubpackets(new SignatureSubpacketsFunction()
                         {
-                            @Override
                             public PGPSignatureSubpacketGenerator apply(PGPSignatureSubpacketGenerator subpackets)
                             {
                                 subpackets.removePacketsOfType(SignatureSubpacketTags.CREATION_TIME);
@@ -850,7 +849,7 @@ public TestSignature(String armoredSignature, boolean expectValid, String msg)
         private static PGPSignature parseSignature(String armoredSignature)
                 throws IOException
         {
-            ByteArrayInputStream bIn = new ByteArrayInputStream(armoredSignature.getBytes(StandardCharsets.UTF_8));
+            ByteArrayInputStream bIn = new ByteArrayInputStream(Strings.toUTF8ByteArray(armoredSignature));
             ArmoredInputStream aIn = new ArmoredInputStream(bIn);
             BCPGInputStream pIn = new BCPGInputStream(aIn);
             PGPObjectFactory objFac = new BcPGPObjectFactory(pIn);
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPDetachedSignatureProcessorTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPDetachedSignatureProcessorTest.java
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPMessageGeneratorTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPMessageGeneratorTest.java
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/StaticV6OpenPGPMessageGeneratorTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/StaticV6OpenPGPMessageGeneratorTest.java
diff --git a/prov/src/test/jdk1.5/org/bouncycastle/test/JVMVersionTest.java b/prov/src/test/jdk1.5/org/bouncycastle/test/JVMVersionTest.java

Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,7 @@ public Builder addSplitMultilineComment(String comment)`
`639`	`639`	`line = line.substring(availableCommentCharsPerLine).trim();`
`640`	`640`	`}`
`641`	`641`
`642`		`- if (!line.isEmpty())`
	`642`	`+ if (line.length() != 0)`
`643`	`643`	`{`
`644`	`644`	`addComment(line);`
`645`	`645`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ public OpenPGPKeyEditor addUserId(String userId,`
`101`	`101`	`SignatureParameters.Callback signatureCallback)`
`102`	`102`	`throws PGPException`
`103`	`103`	`{`
`104`		`- if (userId == null \|\| userId.trim().isEmpty())`
	`104`	`+ // care needs to run with Java 5`
	`105`	`+ if (userId == null \|\| userId.trim().length() == 0)`
`105`	`106`	`{`
`106`	`107`	`throw new IllegalArgumentException("User-ID cannot be null or empty.");`
`107`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,8 @@ public WithPrimaryKey addUserId(`
`379`	`379`	`SignatureParameters.Callback signatureParameters)`
`380`	`380`	`throws PGPException`
`381`	`381`	`{`
`382`		`- if (userId == null \|\| userId.trim().isEmpty())`
	`382`	`+ // care - needs to run with Java 5.`
	`383`	`+ if (userId == null \|\| userId.trim().length() == 0)`
`383`	`384`	`{`
`384`	`385`	`throw new IllegalArgumentException("User-ID cannot be null or empty.");`
`385`	`386`	`}`