From 2f26fa0b0154b06dbd60509f486abc78529c843e Mon Sep 17 00:00:00 2001
From: job <job@openbsd.org>
Date: Mon, 13 Apr 2026 09:22:46 +0000
Subject: [PATCH] Fix CCR ROAIPAddressFamily sort order

RFC 9582 section 4.3.3 defines the canonical form of ipAddrBlocks.

Thanks to Bart Bakker from RIPE NCC for reporting.

OK tb@
---
 usr.sbin/rpki-client/ccr.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/rpki-client/ccr.c b/usr.sbin/rpki-client/ccr.c
index 9a61d8798f4..6a766280562 100644
--- a/usr.sbin/rpki-client/ccr.c
+++ b/usr.sbin/rpki-client/ccr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccr.c,v 1.34 2026/04/07 14:38:04 job Exp $ */
+/*	$OpenBSD: ccr.c,v 1.35 2026/04/13 09:22:46 job Exp $ */
 /*
  * Copyright (c) 2025 Job Snijders <job@openbsd.org>
  *
@@ -832,14 +832,14 @@ ccr_vrp_cmp(const struct vrp *a, const struct vrp *b)
 		break;
 	}
 
-	if (a->addr.prefixlen < b->addr.prefixlen)
-		return 1;
 	if (a->addr.prefixlen > b->addr.prefixlen)
+		return 1;
+	if (a->addr.prefixlen < b->addr.prefixlen)
 		return -1;
 
-	if (a->maxlength < b->maxlength)
-		return 1;
 	if (a->maxlength > b->maxlength)
+		return 1;
+	if (a->maxlength < b->maxlength)
 		return -1;
 
 	return 0;