This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=9bd4e1b17aefac90a3f20855e237d3873b90c3b9 commit 9bd4e1b17aefac90a3f20855e237d3873b90c3b9 (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Thu Aug 1 09:22:04 2024 +0200 doc: Replace references to crypto-refresh and RFC4880 with RFC9580 The refresh to the RFC4880 has been approved now, and it is called RFC9580, so we can use its final name instead of the obsolete RFC or the previous draft ones. --- man/deb-buildinfo.pod | 2 +- man/deb-changes.pod | 2 +- man/dsc.pod | 2 +- scripts/Dpkg/OpenPGP/Backend/GnuPG.pm | 8 +++----- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/man/deb-buildinfo.pod b/man/deb-buildinfo.pod index 9f43952f7..14da028f4 100644 --- a/man/deb-buildinfo.pod +++ b/man/deb-buildinfo.pod @@ -50,7 +50,7 @@ B<Checksums-Sha256>, see below). The control data might be enclosed in an OpenPGP ASCII Armored signature, -as specified in RFC4880. +as specified in RFC9580. The name of the B<.buildinfo> file will depend on the type of build and will be as specific as necessary but not more; the name will be: diff --git a/man/deb-changes.pod b/man/deb-changes.pod index 2813eba5e..580ef6750 100644 --- a/man/deb-changes.pod +++ b/man/deb-changes.pod @@ -48,7 +48,7 @@ B<Checksums-Sha256>, see below). The control data might be enclosed in an OpenPGP ASCII Armored signature, -as specified in RFC4880. +as specified in RFC9580. =head1 FIELDS diff --git a/man/dsc.pod b/man/dsc.pod index f82fdc966..5b50556a8 100644 --- a/man/dsc.pod +++ b/man/dsc.pod @@ -45,7 +45,7 @@ B<Package-List>, B<Files>, B<Checksums-Sha1> and B<Checksums-Sha256>, see below). The control data might be enclosed in an OpenPGP ASCII Armored signature, -as specified in RFC4880. +as specified in RFC9580. =head1 FIELDS diff --git a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm index 43ac1e2e6..8c2387202 100644 --- a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm +++ b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm @@ -107,7 +107,7 @@ sub get_trusted_keyrings { } # _pgp_* functions are strictly for applying or removing ASCII armor. -# See <https://datatracker.ietf.org/doc/html/rfc4880#section-6> for more +# See <https://www.rfc-editor.org/rfc/rfc9580.html#section-6> for more # details. # # Note that these _pgp_* functions are only necessary while relying on @@ -118,8 +118,7 @@ sub _pgp_dearmor_data { my ($type, $data) = @_; # Note that we ignore an incorrect or absent checksum, following the - # guidance of - # <https://datatracker.ietf.org/doc/draft-ietf-openpgp-crypto-refresh/>. + # guidance of <https://www.rfc-editor.org/rfc/rfc9580.html>. my $armor_regex = qr{ -----BEGIN\ PGP\ \Q$type\E-----[\r\t ]*\n (?:[^:]+:\ [^\n]*[\r\t ]*\n)* @@ -138,8 +137,7 @@ sub _pgp_dearmor_data { sub _pgp_armor_checksum { my ($data) = @_; - # From the upcoming revision to RFC 4880 - # <https://datatracker.ietf.org/doc/draft-ietf-openpgp-crypto-refresh/>. + # From RFC9580 <https://www.rfc-editor.org/rfc/rfc9580.html>. # # The resulting three-octet-wide value then gets base64-encoded into # four base64 ASCII characters. -- Dpkg.Org's dpkg
