Update regress to align with recent changes in rpki-client

5 files changed, 13 insertions, 29 deletions

diff --git a/regress/usr.sbin/rpki-client/Makefile.inc b/regress/usr.sbin/rpki-client/Makefile.inc
index 1c25ca05257..be503b590ba 100644
--- a/regress/usr.sbin/rpki-client/Makefile.inc
+++ b/regress/usr.sbin/rpki-client/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.32 2023/05/30 15:56:47 job Exp $
+# $OpenBSD: Makefile.inc,v 1.33 2023/06/20 12:52:32 job Exp $
 
 .PATH:		${.CURDIR}/../../../../usr.sbin/rpki-client
 
@@ -40,7 +40,7 @@ run-regress-test-cert: test-cert
 	./test-cert -vt ${TALARGS:S,,${.CURDIR}/../&,}
 
 SRCS_test-mft+=	test-mft.c mft.c crl.c cms.c x509.c ip.c io.c log.c validate.c \
-		encoding.c print.c dummy.c json.c
+		encoding.c print.c json.c cert.c as.c
 run-regress-test-mft: test-mft
 	./test-mft -v ${.CURDIR}/../mft/*.mft
 
@@ -64,8 +64,8 @@ SRCS_test-geofeed+=	test-geofeed.c geofeed.c cms.c x509.c ip.c io.c log.c \
 run-regress-test-geofeed: test-geofeed
 	./test-geofeed -v ${.CURDIR}/../geofeed/*.csv
 
-SRCS_test-tal+=	test-tal.c tal.c ip.c io.c log.c validate.c \
-		encoding.c print.c crl.c dummy.c x509.c json.c
+SRCS_test-tal+=	test-tal.c tal.c ip.c io.c log.c validate.c cms.c \
+		encoding.c print.c crl.c x509.c json.c cert.c as.c mft.c
 run-regress-test-tal: test-tal
 	./test-tal -v ${.CURDIR}/../tal/*.tal
 
@@ -80,9 +80,9 @@ SRCS_test-tak+=	test-tak.c tak.c cms.c x509.c ip.c as.c io.c log.c \
 run-regress-test-tak: test-tak
 	./test-tak -v ${.CURDIR}/../tak/*.tak
 
-SRCS_test-rrdp+=	test-rrdp.c rrdp_delta.c rrdp_notification.c \
-			rrdp_snapshot.c rrdp_util.c \
-			log.c encoding.c ip.c validate.c dummy.c crl.c x509.c
+SRCS_test-rrdp+=	test-rrdp.c rrdp_delta.c rrdp_notification.c cms.c \
+			rrdp_snapshot.c rrdp_util.c cert.c as.c mft.c io.c \
+			log.c encoding.c ip.c validate.c crl.c x509.c
 LDADD_test-rrdp+=	-lexpat ${LDADD}
 DPADD_test-rrdp+=	${LIBEXPAT} ${DPADD}
 run-regress-test-rrdp: test-rrdp
diff --git a/regress/usr.sbin/rpki-client/dummy.c b/regress/usr.sbin/rpki-client/dummy.c
deleted file mode 100644
index 5caf1ebd944..00000000000
--- a/regress/usr.sbin/rpki-client/dummy.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Public domain
- * dummy shim for some tests.
- */
-
-#include "extern.h"
-
-struct auth *
-auth_find(struct auth_tree *auths, const char *aki)
-{
-	return NULL;
-}
-
-int
-as_check_covered(uint32_t min, uint32_t max,
-    const struct cert_as *as, size_t asz)
-{
-	return -1;
-}
diff --git a/regress/usr.sbin/rpki-client/test-mft.c b/regress/usr.sbin/rpki-client/test-mft.c
index f975c8496e5..a2737b26657 100644
--- a/regress/usr.sbin/rpki-client/test-mft.c
+++ b/regress/usr.sbin/rpki-client/test-mft.c
@@ -1,4 +1,4 @@
-/*	$Id: test-mft.c,v 1.25 2023/05/30 12:14:48 claudio Exp $ */
+/*	$Id: test-mft.c,v 1.26 2023/06/20 12:52:32 job Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -35,6 +35,7 @@
 
 int outformats;
 int verbose;
+int filemode;
 
 int
 main(int argc, char *argv[])
diff --git a/regress/usr.sbin/rpki-client/test-rrdp.c b/regress/usr.sbin/rpki-client/test-rrdp.c
index abcd843d53f..b6da63c6745 100644
--- a/regress/usr.sbin/rpki-client/test-rrdp.c
+++ b/regress/usr.sbin/rpki-client/test-rrdp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test-rrdp.c,v 1.6 2023/05/30 12:14:48 claudio Exp $ */
+/*	$OpenBSD: test-rrdp.c,v 1.7 2023/06/20 12:52:32 job Exp $ */
 /*
  * Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
@@ -36,6 +36,7 @@
 #include "rrdp.h"
 
 int verbose;
+int filemode;
 
 #define REGRESS_NOTIFY_URI	"https://rpki.example.com/notify.xml"
 
diff --git a/regress/usr.sbin/rpki-client/test-tal.c b/regress/usr.sbin/rpki-client/test-tal.c
index 3d9eb351f7c..aa30269540e 100644
--- a/regress/usr.sbin/rpki-client/test-tal.c
+++ b/regress/usr.sbin/rpki-client/test-tal.c
@@ -1,4 +1,4 @@
-/*	$Id: test-tal.c,v 1.12 2023/05/30 12:14:48 claudio Exp $ */
+/*	$Id: test-tal.c,v 1.13 2023/06/20 12:52:32 job Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,6 +31,7 @@
 
 int outformats;
 int verbose;
+int filemode;
 
 int
 main(int argc, char *argv[])