From: tb Date: Fri, 24 May 2024 12:57:20 +0000 (+0000) Subject: Update references to new and not quite so new RFCs X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c7a965b34bf1128cb5ccf649bb99fcbc074e0b64;p=openbsd Update references to new and not quite so new RFCs Four warnings now contain "RFC 9582" rather than "RFC 6482bis". Also update some references to I-Ds. ok claudio --- diff --git a/usr.sbin/rpki-client/cms.c b/usr.sbin/rpki-client/cms.c index c9d8ae5b42f..5ef647e1542 100644 --- a/usr.sbin/rpki-client/cms.c +++ b/usr.sbin/rpki-client/cms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms.c,v 1.44 2024/04/21 19:27:44 claudio Exp $ */ +/* $OpenBSD: cms.c,v 1.45 2024/05/24 12:57:20 tb Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -226,13 +226,14 @@ cms_parse_validate_internal(X509 **xp, const char *fn, const unsigned char *der, } if (!has_ct || !has_md) { + /* RFC 9589, section 4 */ warnx("%s: RFC 6488: CMS missing required " "signed attribute", fn); goto out; } if (!has_st) { - /* RFC-to-be draft-ietf-sidrops-cms-signing-time */ + /* RFC 9589, section 4 */ warnx("%s: missing CMS signing-time attribute", fn); goto out; } diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c index 64db5f6ff8e..46c57dbf1bf 100644 --- a/usr.sbin/rpki-client/mft.c +++ b/usr.sbin/rpki-client/mft.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mft.c,v 1.115 2024/05/20 15:51:43 claudio Exp $ */ +/* $OpenBSD: mft.c,v 1.116 2024/05/24 12:57:20 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler * Copyright (c) 2019 Kristaps Dzonsons @@ -129,7 +129,7 @@ rtype_from_file_extension(const char *fn) /* * Validate that a filename listed on a Manifest only contains characters - * permitted in draft-ietf-sidrops-6486bis section 4.2.2 + * permitted in RFC 9286 section 4.2.2. * Also ensure that there is exactly one '.'. */ static int diff --git a/usr.sbin/rpki-client/roa.c b/usr.sbin/rpki-client/roa.c index 9c98ca9f989..3d29e6a598c 100644 --- a/usr.sbin/rpki-client/roa.c +++ b/usr.sbin/rpki-client/roa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: roa.c,v 1.77 2024/02/21 09:17:06 tb Exp $ */ +/* $OpenBSD: roa.c,v 1.78 2024/05/24 12:57:20 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler * Copyright (c) 2019 Kristaps Dzonsons @@ -134,7 +134,7 @@ roa_parse_econtent(const char *fn, struct roa *roa, const unsigned char *d, ipaddrblocksz = sk_ROAIPAddressFamily_num(roa_asn1->ipAddrBlocks); if (ipaddrblocksz != 1 && ipaddrblocksz != 2) { - warnx("%s: draft-rfc6482bis: unexpected number of ipAddrBlocks " + warnx("%s: RFC 9582: unexpected number of ipAddrBlocks " "(got %d, expected 1 or 2)", fn, ipaddrblocksz); goto out; } @@ -154,14 +154,14 @@ roa_parse_econtent(const char *fn, struct roa *roa, const unsigned char *d, switch (afi) { case AFI_IPV4: if (ipv4_seen++ > 0) { - warnx("%s: RFC 6482bis section 4.3.2: " + warnx("%s: RFC 9582 section 4.3.2: " "IPv4 appears twice", fn); goto out; } break; case AFI_IPV6: if (ipv6_seen++ > 0) { - warnx("%s: RFC 6482bis section 4.3.2: " + warnx("%s: RFC 9582 section 4.3.2: " "IPv6 appears twice", fn); goto out; } @@ -169,7 +169,7 @@ roa_parse_econtent(const char *fn, struct roa *roa, const unsigned char *d, } if (addrsz == 0) { - warnx("%s: RFC 6482bis, section 4.3.2: " + warnx("%s: RFC 9582, section 4.3.2: " "empty ROAIPAddressFamily", fn); goto out; } diff --git a/usr.sbin/rpki-client/rpki-client.8 b/usr.sbin/rpki-client/rpki-client.8 index 15708529df7..062f0fe44f3 100644 --- a/usr.sbin/rpki-client/rpki-client.8 +++ b/usr.sbin/rpki-client/rpki-client.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rpki-client.8,v 1.103 2024/03/01 08:10:09 tb Exp $ +.\" $OpenBSD: rpki-client.8,v 1.104 2024/05/24 12:57:20 tb Exp $ .\" .\" Copyright (c) 2019 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: March 1 2024 $ +.Dd $Mdocdate: May 24 2024 $ .Dt RPKI-CLIENT 8 .Os .Sh NAME @@ -417,6 +417,16 @@ agreement regarding ARIN service restrictions. .Re .Pp .Rs +.%T A Profile for Route Origin Authorizations (ROAs) +.%R RFC 9582 +.Re +.Pp +.Rs +.%T On the use of the Cryptographic Message Syntax (CMS) Signing-Time Attribute in Resource Public Key Infrastructure (RPKI) Signed Objects +.%R RFC 9589 +.Re +.Pp +.Rs .%T RPKI Signed Object for Trust Anchor Key .%U https://datatracker.ietf.org/doc/html/draft-ietf-sidrops-signed-tal .%D Oct, 2022 @@ -428,24 +438,12 @@ agreement regarding ARIN service restrictions. .Re .Pp .Rs -.%T A Profile for Route Origin Authorizations (ROAs) -.%U https://datatracker.ietf.org/doc/html/draft-ietf-sidrops-rfc6482bis -.%D Nov, 2022 -.Re -.Pp -.Rs .%T A Profile for Autonomous System Provider Authorization (ASPA) .%U https://datatracker.ietf.org/doc/html/draft-ietf-sidrops-aspa-profile .%D Jun, 2023 .Re .Pp .Rs -.%T On the use of the CMS signing-time attribute in RPKI Signed Objects -.%U https://datatracker.ietf.org/doc/html/draft-ietf-sidrops-cms-signing-time -.%D Jan, 2024 -.Re -.Pp -.Rs .%T Constraining RPKI Trust Anchors .%U https://datatracker.ietf.org/doc/html/draft-snijders-constraining-rpki-trust-anchors .%D September, 2023 @@ -453,8 +451,8 @@ agreement regarding ARIN service restrictions. .Pp .Rs .%T Detecting RRDP Session Desynchronization -.%U https://datatracker.ietf.org/doc/html/draft-spaghetti-sidrops-rrdp-desynchronization-00 -.%D Jan, 2024 +.%U https://datatracker.ietf.org/doc/html/draft-ietf-sidrops-rrdp-desynchronization-00 +.%D April, 2024 .Re .Pp .Rs