openpgp: Deprecate SubpacketValue::PreferredAEADAlgorithms.

  - This is replaced by a more expressive subpacket type in the crypto
    refresh.

  - Fixes #1017.

4 files changed, 7 insertions, 0 deletions

diff --git a/openpgp/NEWS b/openpgp/NEWS
index 3062572e..9813c082 100644
--- a/openpgp/NEWS
+++ b/openpgp/NEWS
@@ -16,6 +16,7 @@
    - packet::signature::SignatureBuilder::set_preferred_aead_algorithms
    - packet::signature::subpacket::SubpacketAreas::preferred_aead_algorithms
    - packet::signature::subpacket::SubpacketTag::PreferredAEADAlgorithms
+   - packet::signature::subpacket::SubpacketValue::PreferredAEADAlgorithms
    - types::Curve::len, use types::Curve::bits instead
 * Changes in 1.16.0
 ** New functionality
diff --git a/openpgp/examples/statistics.rs b/openpgp/examples/statistics.rs
index 76f6e559..4382a924 100644
--- a/openpgp/examples/statistics.rs
+++ b/openpgp/examples/statistics.rs
@@ -179,6 +179,7 @@ fn main() -> openpgp::Result<()> {
                                 sigs_subpacket_tags_size_max[i] = len;
                             }
 
+                            #[allow(deprecated)]
                             match sub.value() {
                                 SubpacketValue::Unknown { .. } =>
                                     unreachable!(),
diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs
index 49e26d3e..c520e7a0 100644
--- a/openpgp/src/packet/signature/subpacket.rs
+++ b/openpgp/src/packet/signature/subpacket.rs
@@ -1666,6 +1666,7 @@ pub enum SubpacketValue {
     /// See [Section 5.2.3.8 of RFC 4880bis] for details.
     ///
     ///  [Section 5.2.3.8 of RFC 4880bis]: https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-09.html#section-5.2.3.8
+    #[deprecated]
     PreferredAEADAlgorithms(Vec<AEADAlgorithm>),
     /// Who the signed message was intended for (proposed).
     ///
@@ -1694,6 +1695,7 @@ impl ArbitraryBounded for SubpacketValue {
         use crate::arbitrary_helper::gen_arbitrary_from_range;
 
         loop {
+            #[allow(deprecated)]
             break match gen_arbitrary_from_range(0..26, g) {
                 0 => SignatureCreationTime(Arbitrary::arbitrary(g)),
                 1 => SignatureExpirationTime(Arbitrary::arbitrary(g)),
@@ -6881,6 +6883,7 @@ impl signature::SignatureBuilder {
                                          preferences: Vec<AEADAlgorithm>)
         -> Result<Self>
     {
+        #[allow(deprecated)]
         self.hashed_area.replace(Subpacket::new(
             SubpacketValue::PreferredAEADAlgorithms(preferences),
             false)?)?;
diff --git a/openpgp/src/serialize.rs b/openpgp/src/serialize.rs
index f01197ef..fe6d2183 100644
--- a/openpgp/src/serialize.rs
+++ b/openpgp/src/serialize.rs
@@ -1391,6 +1391,7 @@ impl seal::Sealed for SubpacketValue {}
 impl Marshal for SubpacketValue {
     fn serialize(&self, o: &mut dyn std::io::Write) -> Result<()> {
         use self::SubpacketValue::*;
+        #[allow(deprecated)]
         match self {
             SignatureCreationTime(t) =>
                 write_be_u32(o, (*t).into())?,
@@ -1496,6 +1497,7 @@ impl Marshal for SubpacketValue {
 impl MarshalInto for SubpacketValue {
     fn serialized_len(&self) -> usize {
         use self::SubpacketValue::*;
+        #[allow(deprecated)]
         match self {
             SignatureCreationTime(_) => 4,
             SignatureExpirationTime(_) => 4,