rpgp
diff --git a/‎src/armor/mod.rs
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/armor/mod.rs
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/armor/reader.rs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎src/armor/reader.rs
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎src/composed/cleartext.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/composed/cleartext.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/composed/key/mod.rs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/composed/key/mod.rs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/composed/message/decrypt.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/composed/message/decrypt.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/composed/message/parser.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/composed/message/parser.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/composed/message/types.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/composed/message/types.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/composed/signed_key/mod.rs
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎src/composed/signed_key/mod.rs
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/composed/signed_key/public.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/composed/signed_key/public.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/composed/signed_key/secret.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/composed/signed_key/secret.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -1,6 +1,7 @@
 //! # Armor module
 //!
-//! Armor module provides implementation of ASCII Armor as specified in RFC 4880.
+//! Armor module provides implementation of ASCII Armor as specified in RFC 9580.
+//! <https://www.rfc-editor.org/rfc/rfc9580.html#name-forming-ascii-armor>
 
 mod reader;
 mod writer;
 
@@ -6,7 +6,6 @@ use std::{fmt, io, str};
 use base64::engine::{general_purpose::STANDARD, Engine as _};
 use buffer_redux::BufReader;
 use byteorder::{BigEndian, ByteOrder};
-
 use nom::branch::alt;
 use nom::bytes::streaming::{tag, take_until1};
 use nom::bytes::streaming::{take, take_until};
@@ -23,7 +22,7 @@ use crate::ser::Serialize;
 
 /// Armor block types.
 ///
-/// Both OpenPGP (RFC4880) and OpenSSL PEM armor types are included.
+/// Both OpenPGP (RFC 9580) and OpenSSL PEM armor types are included.
 #[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum BlockType {
     /// PGP public key
 
@@ -23,7 +23,7 @@ use crate::{ArmorOptions, Deserializable, Signature, StandaloneSignature};
 
 /// Implementation of a Cleartext Signed Message.
 ///
-/// Ref <https://datatracker.ietf.org/doc/html/rfc4880.html#section-7>
+/// Ref <https://www.rfc-editor.org/rfc/rfc9580.html#name-cleartext-signature-framewo>
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CleartextSignedMessage {
     /// Normalized and dash-escaped representation of the signed text.
@@ -292,7 +292,7 @@ fn validate_headers(headers: Headers) -> Result<Vec<HashAlgorithm>> {
 ///
 /// This implementation is implicitly agnostic between "\n" and "\r\n" line endings.
 ///
-/// Ref https://www.rfc-editor.org/rfc/rfc9580.html#name-dash-escaped-text
+/// Ref <https://www.rfc-editor.org/rfc/rfc9580.html#name-dash-escaped-text>
 fn dash_escape(text: &str) -> String {
     let mut out = String::new();
     for line in text.split_inclusive('\n') {
 
@@ -1,6 +1,6 @@
 //! Internal key definitions
 //!
-//! These APIs do not provide guaranteed RFC4880 compliance,
+//! These APIs do not provide guaranteed RFC 9580 compliance,
 //! since hashing is to be done externally.
 //!
 //!
 
@@ -27,11 +27,11 @@ where
 /// A v3/v4 session key can be used  v1 SEIPD (and historically with SED packets).
 /// A v6 session key can only be used with a v2 SEIPD.
 ///
-/// https://www.rfc-editor.org/rfc/rfc9580.html#name-packet-versions-in-encrypte
+/// <https://www.rfc-editor.org/rfc/rfc9580.html#name-packet-versions-in-encrypte>
 ///
 /// (Note that SED packets are malleable. They are historical and considered dangerous!
 /// They MUST NOT be produced and decryption is also discouraged:
-/// https://www.rfc-editor.org/rfc/rfc9580.html#sed)
+/// <https://www.rfc-editor.org/rfc/rfc9580.html#sed>)
 #[derive(derive_more::Debug, Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
 pub enum PlainSessionKey {
     /// A session key from a v3 PKESK or a v4 SKESK
 
@@ -136,7 +136,7 @@ fn next<I: Iterator<Item = Result<Packet>>>(packets: &mut Peekable<I>) -> Option
             }
             Tag::Marker => {
                 // Marker Packets are ignored
-                // see https://tools.ietf.org/html/rfc4880#section-5.8
+                // see https://www.rfc-editor.org/rfc/rfc9580.html#marker-packet
             }
             Tag::Padding => {
                 // Padding Packets are ignored
@@ -161,7 +161,7 @@ impl<I: Sized + Iterator<Item = Result<Packet>>> Iterator for MessageParser<I> {
 
 impl Deserializable for Message {
     /// Parse a composed message.
-    /// Ref: <https://tools.ietf.org/html/rfc4880#section-11.3>
+    /// Ref: <https://www.rfc-editor.org/rfc/rfc9580.html#name-openpgp-messages>
     fn from_packets<'a, I: Iterator<Item = Result<Packet>> + 'a>(
         packets: std::iter::Peekable<I>,
     ) -> Box<dyn Iterator<Item = Result<Self>> + 'a> {
 
@@ -28,7 +28,7 @@ use crate::types::{
     StringToKey, Tag,
 };
 
-/// An [OpenPGP message](https://tools.ietf.org/html/rfc4880.html#section-11.3)
+/// An [OpenPGP message](https://www.rfc-editor.org/rfc/rfc9580.html#name-openpgp-messages)
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Message {
     Literal(LiteralData),
@@ -1363,7 +1363,7 @@ mod tests {
         // The literal data packet (which is in binary mode) contains the output of:
         // echo -en "foo\nbar\r\nbaz"
         //
-        // RFC 4880 mandates that the hash for signature type 0x01 has to be calculated over normalized line endings,
+        // RFC 9580 mandates that the hash for signature type 0x01 has to be calculated over normalized line endings,
         // so the hash for this message is calculated over "foo\r\nbar\r\nbaz".
         //
         // So it must also be verified against a hash digest over this normalized format.
 
@@ -1,12 +1,12 @@
 //! Signed Secret and Public Key
 //!
-//! Signed secret keys shall be used to sign and decrypt, where as public keys
+//! Signed secret keys shall be used to sign and decrypt, whereas public keys
 //! can verify and encrypt.
 //! Note that technically secret keys also can by definition derive a public key
-//! and hence themself perform verify and encrypt as a public key can.
+//! and hence themselves perform verify and encrypt as a public key can.
 //!
 //! [Key generation] is handled separately.
-//! For signing directly with an RFC4880 compliant internal hashing, see [signing and verifying based on packets].
+//! For signing directly with an RFC 9580 compliant internal hashing, see [signing and verifying based on packets].
 //!
 //! [Key generation]: super::key
 //! [signing and verifying based on packets]: crate::packet
@@ -53,7 +53,7 @@
 //!
 //! let passwd_fn = || String::new();
 //!
-//! // simulate a digest, make sure it is a compliant produce with RFC4880
+//! // simulate a digest, make sure it is a compliant produce with RFC 9580
 //! // i.e. depending on the version one needs a special suffix / prefix
 //! // and length encoding. The following is NOT compliant:
 //! use sha2::{Sha256, Digest};
@@ -89,7 +89,7 @@
 //!     vec![],
 //! );
 //!
-//! // sign and and write the package (the package written here is NOT rfc4880 compliant)
+//! // sign and and write the package (the package written here is NOT RFC 9580 compliant)
 //! let mut signature_bytes = Vec::with_capacity(1024);
 //!
 //! packet::write_packet(&mut signature_bytes, &signature)
 
@@ -26,7 +26,7 @@ pub struct SignedPublicKey {
 }
 
 /// Parse a transferable keys from the given packets.
-/// Ref: <https://tools.ietf.org/html/rfc4880.html#section-11.1>
+/// Ref: <https://www.rfc-editor.org/rfc/rfc9580.html#name-transferable-public-keys>
 pub struct SignedPublicKeyParser<
     I: Sized + Iterator<Item = crate::errors::Result<crate::packet::Packet>>,
 > {
@@ -67,7 +67,7 @@ impl<I: Sized + Iterator<Item = Result<Packet>>> Iterator for SignedPublicKeyPar
 
 impl crate::composed::Deserializable for SignedPublicKey {
     /// Parse a transferable key from packets.
-    /// Ref: <https://tools.ietf.org/html/rfc4880.html#section-11.1>
+    /// Ref: <https://www.rfc-editor.org/rfc/rfc9580.html#name-transferable-public-keys>
     fn from_packets<'a, I: Iterator<Item = Result<Packet>> + 'a>(
         packets: std::iter::Peekable<I>,
     ) -> Box<dyn Iterator<Item = Result<Self>> + 'a> {
 
@@ -27,7 +27,7 @@ pub struct SignedSecretKey {
 }
 
 /// Parse a transferable keys from the given packets.
-/// Ref: <https://tools.ietf.org/html/rfc4880.html#section-11.1>
+/// Ref: <https://www.rfc-editor.org/rfc/rfc9580.html#name-transferable-secret-keys>
 pub struct SignedSecretKeyParser<
     I: Sized + Iterator<Item = crate::errors::Result<crate::packet::Packet>>,
 > {
@@ -63,7 +63,7 @@ impl<I: Sized + Iterator<Item = Result<Packet>>> Iterator for SignedSecretKeyPar
 
 impl crate::composed::Deserializable for SignedSecretKey {
     /// Parse a transferable key from packets.
-    /// Ref: <https://tools.ietf.org/html/rfc4880.html#section-11.1>
+    /// Ref: <https://www.rfc-editor.org/rfc/rfc9580.html#name-transferable-secret-keys>
     fn from_packets<'a, I: Iterator<Item = Result<Packet>> + 'a>(
         packets: std::iter::Peekable<I>,
     ) -> Box<dyn Iterator<Item = Result<Self>> + 'a> {