Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java

Author: dghgit

pg/src/main/java/org/bouncycastle/bcpg/PublicKeyPacket.java

@@ -136,7 +136,7 @@ public class PublicKeyPacket
             throw new UnsupportedPacketVersionException("Unsupported Public Key Packet version encountered: " + version);
         }
 
-        time = StreamUtil.read4OctetLength(in);
+        time = StreamUtil.read4OctetLength(in) & 0xFFFFFFFFL;
 
         if (version == 2 || version == VERSION_3)
         {

pg/src/main/java/org/bouncycastle/bcpg/StreamUtil.java

@@ -134,7 +134,7 @@ static int read2OctetLength(InputStream in)
     }
 
     static void write4OctetLength(OutputStream pOut, int len)
-        throws IOException
+            throws IOException
     {
         pOut.write(len >> 24);
         pOut.write(len >> 16);
@@ -151,7 +151,6 @@ static int read4OctetLength(InputStream in)
     static int flag_eof = 0;
     static int flag_isLongLength = 1;
     static int flag_partial = 2;
-
     /**
      * Note: flags is an array of three boolean values:
      * flags[0] indicates l is negative, flag for eof
@@ -192,27 +191,27 @@ else if (l == 255)
     static void write8OctetLength(OutputStream pOut, long len)
         throws IOException
     {
-        pOut.write((int)(len >> 56));
-        pOut.write((int)(len >> 48));
-        pOut.write((int)(len >> 40));
-        pOut.write((int)(len >> 32));
-        pOut.write((int)(len >> 24));
-        pOut.write((int)(len >> 16));
-        pOut.write((int)(len >> 8));
-        pOut.write((int)len);
+        pOut.write((int) (len >> 56));
+        pOut.write((int) (len >> 48));
+        pOut.write((int) (len >> 40));
+        pOut.write((int) (len >> 32));
+        pOut.write((int) (len >> 24));
+        pOut.write((int) (len >> 16));
+        pOut.write((int) (len >> 8));
+        pOut.write((int) len);
     }
 
     static long read8OctetLength(InputStream in)
         throws IOException
     {
-        return ((long)in.read() << 56) |
-            ((long)in.read() << 48) |
-            ((long)in.read() << 40) |
-            ((long)in.read() << 32) |
-            ((long)in.read() << 24) |
-            ((long)in.read() << 16) |
-            ((long)in.read() << 8) |
-            ((long)in.read());
+        return ((long) in.read() << 56) |
+            ((long) in.read() << 48) |
+            ((long) in.read() << 40) |
+            ((long) in.read() << 32) |
+            ((long) in.read() << 24) |
+            ((long) in.read() << 16) |
+            ((long) in.read() << 8) |
+            ((long) in.read());
     }
 
 }

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

@@ -10,15 +10,18 @@
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.cryptlib.CryptlibObjectIdentifiers;
+import org.bouncycastle.asn1.edec.EdECObjectIdentifiers;
 import org.bouncycastle.asn1.gnu.GNUObjectIdentifiers;
 import org.bouncycastle.asn1.x9.ECNamedCurveTable;
 import org.bouncycastle.asn1.x9.X9ECParametersHolder;
 import org.bouncycastle.bcpg.BCPGKey;
 import org.bouncycastle.bcpg.BCPGOutputStream;
 import org.bouncycastle.bcpg.DSAPublicBCPGKey;
 import org.bouncycastle.bcpg.ECPublicBCPGKey;
+import org.bouncycastle.bcpg.Ed448PublicBCPGKey;
 import org.bouncycastle.bcpg.ElGamalPublicBCPGKey;
 import org.bouncycastle.bcpg.KeyIdentifier;
+import org.bouncycastle.bcpg.OctetArrayBCPGKey;
 import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
 import org.bouncycastle.bcpg.PublicKeyPacket;
 import org.bouncycastle.bcpg.PublicSubkeyPacket;
@@ -28,6 +31,7 @@
 import org.bouncycastle.bcpg.UserAttributePacket;
 import org.bouncycastle.bcpg.UserDataPacket;
 import org.bouncycastle.bcpg.UserIDPacket;
+import org.bouncycastle.bcpg.X448PublicBCPGKey;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 import org.bouncycastle.util.Arrays;
 
@@ -47,7 +51,7 @@ public class PGPPublicKey
     List<List<PGPSignature>> idSigs = new ArrayList<List<PGPSignature>>();
 
     List<PGPSignature> subSigs = null;
-    
+
     private KeyIdentifier keyIdentifier;
     private int keyStrength;
 
@@ -90,6 +94,14 @@ else if (key instanceof ECPublicBCPGKey)
                 {
                     this.keyStrength = 256;
                 }
+                else if (curveOID.equals(EdECObjectIdentifiers.id_X448))
+                {
+                    this.keyStrength = X448PublicBCPGKey.LENGTH * 8;
+                }
+                else if (curveOID.equals(EdECObjectIdentifiers.id_Ed448))
+                {
+                    this.keyStrength = Ed448PublicBCPGKey.LENGTH * 8;
+                }
                 else
                 {
                     X9ECParametersHolder ecParameters = ECNamedCurveTable.getByOIDLazy(curveOID);
@@ -104,6 +116,10 @@ else if (key instanceof ECPublicBCPGKey)
                     }
                 }
             }
+            else if (key instanceof OctetArrayBCPGKey)
+            {
+                this.keyStrength = key.getEncoded().length * 8;
+            }
         }
     }
 
@@ -150,7 +166,7 @@ public PGPPublicKey(PublicKeyPacket publicKeyPacket, KeyFingerPrintCalculator fi
         this.publicPk = key.publicPk;
         this.trustPk = trust;
         this.subSigs = subSigs;
-        
+
         this.keyStrength = key.keyStrength;
         this.keyIdentifier = key.keyIdentifier;
     }
@@ -1216,7 +1232,8 @@ private static void joinPgpSignatureList(List<PGPSignature> source,
             for (int i = 0; isNotNull && i < rlt.size(); i++)
             {
                 PGPSignature existingSubSig = (PGPSignature)rlt.get(i);
-                if (PGPSignature.isSignatureEncodingEqual(existingSubSig, copySubSig))
+                if (existingSubSig.getVersion() == copySubSig.getVersion() &&
+                    PGPSignature.isSignatureEncodingEqual(existingSubSig, copySubSig))
                 {
                     found = true;
                     // join existing sig with copy to apply modifications in unhashed subpackets