diff options
| author | Nora Widdecke <nora@sequoia-pgp.org> | 2020-09-24 10:24:20 +0200 |
|---|---|---|
| committer | Nora Widdecke <nora@sequoia-pgp.org> | 2020-09-25 13:09:46 +0200 |
| commit | efc45302fb53b65ab8839a8d8aa982d857547352 (patch) | |
| tree | 70fb1ab3084adf861fdc34e45b44a599848704a7 /openpgp | |
| parent | f3608f5c87c011076390a5e4aa551c8332ef3b90 (diff) | |
openpgp: Fix deprecation notices.
Diffstat (limited to 'openpgp')
| -rw-r--r-- | openpgp/src/crypto/s2k.rs | 8 | ||||
| -rw-r--r-- | openpgp/src/types/mod.rs | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/openpgp/src/crypto/s2k.rs b/openpgp/src/crypto/s2k.rs index f403589c..67198a0e 100644 --- a/openpgp/src/crypto/s2k.rs +++ b/openpgp/src/crypto/s2k.rs @@ -68,9 +68,11 @@ pub enum S2K { /// /// This mechanism uses neither iteration to increase the time it /// takes to derive the key from the password nor does it salt the - /// password. This makes dictionary attacks more feasible. Do - /// not use this variant. - #[deprecated(since = "rfc4880", note = "Use `S2K::Iterated`.")] + /// password. This makes dictionary attacks more feasible. + /// + /// This mechanism has been deprecated in RFC 4880. Do not use this + /// variant. + #[deprecated(note = "Use `S2K::Iterated`.")] Simple { /// Hash used for key derivation. hash: HashAlgorithm diff --git a/openpgp/src/types/mod.rs b/openpgp/src/types/mod.rs index dc98dfe4..cf3b4568 100644 --- a/openpgp/src/types/mod.rs +++ b/openpgp/src/types/mod.rs @@ -97,13 +97,11 @@ pub(crate) use timestamp::normalize_systemtime; pub enum PublicKeyAlgorithm { /// RSA (Encrypt or Sign) RSAEncryptSign, - /// RSA Encrypt-Only - #[deprecated(since = "rfc4880", - note = "Use `PublicKeyAlgorithm::RSAEncryptSign`.")] + /// RSA Encrypt-Only, deprecated in RFC 4880. + #[deprecated(note = "Use `PublicKeyAlgorithm::RSAEncryptSign`.")] RSAEncrypt, - /// RSA Sign-Only - #[deprecated(since = "rfc4880", - note = "Use `PublicKeyAlgorithm::RSAEncryptSign`.")] + /// RSA Sign-Only, deprecated in RFC 4880. + #[deprecated(note = "Use `PublicKeyAlgorithm::RSAEncryptSign`.")] RSASign, /// ElGamal (Encrypt-Only) ElGamalEncrypt, @@ -113,9 +111,8 @@ pub enum PublicKeyAlgorithm { ECDH, /// Elliptic curve DSA ECDSA, - /// ElGamal (Encrypt or Sign) - #[deprecated(since = "rfc4880", - note = "If you really must, use \ + /// ElGamal (Encrypt or Sign), deprecated in RFC 4880. + #[deprecated(note = "If you really must, use \ `PublicKeyAlgorithm::ElGamalEncrypt`.")] ElGamalEncryptSign, /// "Twisted" Edwards curve DSA |