Properly parse and set PreferredAEADCipherSuites subpacket

Author: vanitasvitae

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

@@ -17,6 +17,7 @@
 import org.bouncycastle.bcpg.sig.KeyFlags;
 import org.bouncycastle.bcpg.sig.NotationData;
 import org.bouncycastle.bcpg.sig.PolicyURI;
+import org.bouncycastle.bcpg.sig.PreferredAEADCiphersuites;
 import org.bouncycastle.bcpg.sig.PreferredAlgorithms;
 import org.bouncycastle.bcpg.sig.PrimaryUserID;
 import org.bouncycastle.bcpg.sig.Revocable;
@@ -187,10 +188,9 @@ public void setPreferredCompressionAlgorithms(boolean isCritical, int[] algorith
      * @param isCritical true if should be treated as critical, false otherwise.
      * @param algorithms array of algorithms in descending preference
      */
-    public void setPreferredAEADAlgorithms(boolean isCritical, int[] algorithms)
+    public void setPreferredAEADAlgorithms(boolean isCritical, PreferredAEADCiphersuites.Combination[] algorithms)
     {
-        packets.add(new PreferredAlgorithms(SignatureSubpacketTags.PREFERRED_AEAD_ALGORITHMS, isCritical,
-            algorithms));
+        packets.add(new PreferredAEADCiphersuites(isCritical, algorithms));
     }
 
     public void addPolicyURI(boolean isCritical, String policyUri)

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

@@ -17,6 +17,7 @@
 import org.bouncycastle.bcpg.sig.KeyFlags;
 import org.bouncycastle.bcpg.sig.NotationData;
 import org.bouncycastle.bcpg.sig.PolicyURI;
+import org.bouncycastle.bcpg.sig.PreferredAEADCiphersuites;
 import org.bouncycastle.bcpg.sig.PreferredAlgorithms;
 import org.bouncycastle.bcpg.sig.PrimaryUserID;
 import org.bouncycastle.bcpg.sig.RegularExpression;
@@ -257,7 +258,7 @@ public int[] getPreferredCompressionAlgorithms()
         return ((PreferredAlgorithms)p).getPreferences();
     }
 
-    public int[] getPreferredAEADAlgorithms()
+    public PreferredAEADCiphersuites getPreferredAEADAlgorithms()
     {
         SignatureSubpacket p = this.getSubpacket(SignatureSubpacketTags.PREFERRED_AEAD_ALGORITHMS);
 
@@ -266,7 +267,8 @@ public int[] getPreferredAEADAlgorithms()
             return null;
         }
 
-        return ((PreferredAlgorithms)p).getPreferences();
+        PreferredAEADCiphersuites packet = (PreferredAEADCiphersuites) p;
+        return new PreferredAEADCiphersuites(packet.isCritical(), packet.getRawAlgorithms());
     }
 
     public int getKeyFlags()