From 7ed665c6a36267d495c44994a95b2e53d003968b Mon Sep 17 00:00:00 2001 From: job Date: Tue, 7 Apr 2026 14:38:04 +0000 Subject: [PATCH] Sync - CCR uses an IANA assigned codepoint nowadays OK tb@ --- usr.sbin/rpki-client/ccr.c | 4 ++-- usr.sbin/rpki-client/x509.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/rpki-client/ccr.c b/usr.sbin/rpki-client/ccr.c index c928619903b..9a61d8798f4 100644 --- a/usr.sbin/rpki-client/ccr.c +++ b/usr.sbin/rpki-client/ccr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccr.c,v 1.33 2026/01/29 18:25:29 tb Exp $ */ +/* $OpenBSD: ccr.c,v 1.34 2026/04/07 14:38:04 job Exp $ */ /* * Copyright (c) 2025 Job Snijders * @@ -1597,7 +1597,7 @@ ccr_parse(const char *fn, const unsigned char *der, size_t len) char buf[128]; OBJ_obj2txt(buf, sizeof(buf), ci->contentType, 1); - warnx("%s: unexpected OID: got %s, want 1.3.6.1.4.1.41948.828", + warnx("%s: unexpected OID: got %s, want 1.2.840.113549.1.9.16.1.54", fn, buf); goto out; } diff --git a/usr.sbin/rpki-client/x509.c b/usr.sbin/rpki-client/x509.c index 5574cc609ba..ec2723793cb 100644 --- a/usr.sbin/rpki-client/x509.c +++ b/usr.sbin/rpki-client/x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.c,v 1.129 2026/04/07 10:59:19 tb Exp $ */ +/* $OpenBSD: x509.c,v 1.130 2026/04/07 14:38:04 job Exp $ */ /* * Copyright (c) 2022 Theo Buehler * Copyright (c) 2021 Claudio Jeker @@ -46,7 +46,7 @@ ASN1_OBJECT *rsc_oid; /* id-ct-signedChecklist */ ASN1_OBJECT *aspa_oid; /* id-ct-ASPA */ ASN1_OBJECT *tak_oid; /* id-ct-SignedTAL */ ASN1_OBJECT *spl_oid; /* id-ct-signedPrefixList */ -ASN1_OBJECT *ccr_oid; /* CanonicalCacheRepresentation PEN OID */ +ASN1_OBJECT *ccr_oid; /* id-ct-rpkiCanonicalCacheRepresentation */ static const struct { const char *oid;