diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2023-07-03 10:48:18 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2023-07-03 10:52:22 +0200 |
| commit | 3df0db9d50fb56a2a6d85063b564eaede98ad107 (patch) | |
| tree | 16d6fbf6fd3eeb128ae6b90db8721b51469c4dd0 | |
| parent | e9912a42603619d7b64c89dd72db80bdcc5f0419 (diff) | |
openpgp: Deprecate cert::Preferences::preferred_aead_algorithms.
- This is replaced by a more expressive subpacket type in the crypto
refresh.
- See #1017.
| -rw-r--r-- | openpgp/NEWS | 1 | ||||
| -rw-r--r-- | openpgp/src/cert.rs | 20 |
2 files changed, 16 insertions, 5 deletions
diff --git a/openpgp/NEWS b/openpgp/NEWS index 9902943f..355e3675 100644 --- a/openpgp/NEWS +++ b/openpgp/NEWS @@ -12,6 +12,7 @@ - crypto::SessionKey::as_protected - types::AEADAlgorithm::GCM ** Deprecated functionality + - cert::Preferences::preferred_aead_algorithms - types::Curve::len, use types::Curve::bits instead * Changes in 1.16.0 ** New functionality diff --git a/openpgp/src/cert.rs b/openpgp/src/cert.rs index 819b9245..23050580 100644 --- a/openpgp/src/cert.rs +++ b/openpgp/src/cert.rs @@ -474,6 +474,7 @@ pub trait Preferences<'a>: seal::Sealed { /// /// The algorithms are ordered according by the certificate holder's /// preference. + #[deprecated] fn preferred_aead_algorithms(&self) -> Option<&'a [AEADAlgorithm]>; /// Returns the certificate holder's keyserver preferences. @@ -4227,6 +4228,7 @@ impl<'a> ValidCert<'a> { macro_rules! impl_pref { ($subpacket:ident, $rt:ty) => { + #[allow(deprecated)] fn $subpacket(&self) -> Option<$rt> { // When addressed by the fingerprint or keyid, we first @@ -6537,7 +6539,9 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= assert_eq!(userid.preferred_compression_algorithms(), Some(&[ Zlib, BZip2, Zip ][..])); - assert_eq!(userid.preferred_aead_algorithms(), None); + #[allow(deprecated)] { + assert_eq!(userid.preferred_aead_algorithms(), None); + } // assert_eq!(userid.key_server_preferences(), // Some(KeyServerPreferences::new(&[]))); @@ -6566,7 +6570,9 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= assert_eq!(userid.preferred_compression_algorithms(), Some(&[ Zlib, BZip2, Zip ][..])); - assert_eq!(userid.preferred_aead_algorithms(), None); + #[allow(deprecated)] { + assert_eq!(userid.preferred_aead_algorithms(), None); + } assert_eq!(userid.key_server_preferences(), Some(KeyServerPreferences::new(&[0x80]))); @@ -6584,8 +6590,10 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= cert.preferred_hash_algorithms()); assert_eq!(userid.preferred_compression_algorithms(), cert.preferred_compression_algorithms()); - assert_eq!(userid.preferred_aead_algorithms(), - cert.preferred_aead_algorithms()); + #[allow(deprecated)] { + assert_eq!(userid.preferred_aead_algorithms(), + cert.preferred_aead_algorithms()); + } assert_eq!(userid.key_server_preferences(), cert.key_server_preferences()); assert_eq!(userid.features(), @@ -6612,7 +6620,9 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= assert_eq!(userid.preferred_compression_algorithms(), Some(&[ BZip2, Zlib, Zip ][..])); - assert_eq!(userid.preferred_aead_algorithms(), None); + #[allow(deprecated)] { + assert_eq!(userid.preferred_aead_algorithms(), None); + } assert_eq!(userid.key_server_preferences(), Some(KeyServerPreferences::new(&[0x80]))); |