Added getEmbeddedSignatures()

dghgit · dghgit · commit bdb43ae985f0 · 2014-03-21T14:54:21.000+11:00
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java b/pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java
@@ -520,4 +520,12 @@ private void setCreationTime()
             }
         }
     }
+
+    public static SignaturePacket fromByteArray(byte[] data)
+        throws IOException
+    {
+        BCPGInputStream in = new BCPGInputStream(new ByteArrayInputStream(data));
+
+        return new SignaturePacket(in);
+    }
 }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketVector.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPSignatureSubpacketVector.java
@@ -1,9 +1,11 @@
 package org.bouncycastle.openpgp;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import org.bouncycastle.bcpg.SignaturePacket;
 import org.bouncycastle.bcpg.SignatureSubpacket;
 import org.bouncycastle.bcpg.SignatureSubpacketTags;
 import org.bouncycastle.bcpg.sig.Features;
@@ -77,7 +79,28 @@ public SignatureSubpacket[] getSubpackets(
         return (SignatureSubpacket[])list.toArray(new SignatureSubpacket[]{});
     }
 
-    public NotationData[] getNotationDataOccurences()
+    public PGPSignatureList getEmbeddedSignatures()
+        throws PGPException
+    {
+        SignatureSubpacket[] sigs = getSubpackets(SignatureSubpacketTags.EMBEDDED_SIGNATURE);
+        ArrayList l = new ArrayList();
+
+        for (int i = 0; i < sigs.length; i++)
+        {
+            try
+            {
+                l.add(new PGPSignature(SignaturePacket.fromByteArray(sigs[i].getData())));
+            }
+            catch (IOException e)
+            {
+                throw new PGPException("Unable to parse signature packet: " + e.getMessage(), e);
+            }
+        }
+
+        return new PGPSignatureList((PGPSignature[])l.toArray(new PGPSignature[l.size()]));
+    }
+
+    public NotationData[] getNotationDataOccurrences()
     {
         SignatureSubpacket[] notations = getSubpackets(SignatureSubpacketTags.NOTATION_DATA);
         NotationData[] vals = new NotationData[notations.length];
@@ -89,6 +112,14 @@ public NotationData[] getNotationDataOccurences()
         return vals;
     }
 
+    /**
+     * @deprecated use  getNotationDataOccurrences()
+     */
+    public NotationData[] getNotationDataOccurences()
+    {
+        return getNotationDataOccurrences();
+    }
+
     public long getIssuerKeyID()
     {
         SignatureSubpacket    p = this.getSubpacket(SignatureSubpacketTags.ISSUER_KEY_ID);

Original file line number	Diff line number	Diff line change
`@@ -520,4 +520,12 @@ private void setCreationTime()`
`520`	`520`	`}`
`521`	`521`	`}`
`522`	`522`	`}`
	`523`	`+`
	`524`	`+ public static SignaturePacket fromByteArray(byte[] data)`
	`525`	`+ throws IOException`
	`526`	`+ {`
	`527`	`+ BCPGInputStream in = new BCPGInputStream(new ByteArrayInputStream(data));`
	`528`	`+`
	`529`	`+ return new SignaturePacket(in);`
	`530`	`+ }`
`523`	`531`	`}`