Add regress for Signed Prefix List objects

diff --git a/regress/usr.sbin/rpki-client/Makefile.inc b/regress/usr.sbin/rpki-client/Makefile.inc
index d16f78c..80326f2 100644 (file)
--- 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.36 2024/01/08 08:26:38 tb Exp $
+# $OpenBSD: Makefile.inc,v 1.37 2024/02/22 12:51:50 job Exp $
 
 .PATH:         ${.CURDIR}/../../../../usr.sbin/rpki-client
 
@@ -13,6 +13,7 @@ PROGS += test-tal
 PROGS += test-rrdp
 PROGS += test-aspa
 PROGS += test-tak
+PROGS += test-spl
 
 .for p in ${PROGS}
 REGRESS_TARGETS += run-regress-$p
@@ -89,6 +90,12 @@ SRCS_test-tak+=      test-tak.c tak.c cms.c x509.c ip.c as.c io.c \
 run-regress-test-tak: test-tak
        ./test-tak -v ${.CURDIR}/../tak/*.tak
 
+SRCS_test-spl+=        test-spl.c spl.c cms.c x509.c ip.c as.c io.c \
+               encoding.c print.c validate.c cert.c crl.c mft.c json.c \
+               constraints-dummy.c repo-dummy.c rfc3779.c
+run-regress-test-spl: test-spl
+       ./test-spl -v ${.CURDIR}/../spl/*.spl
+
 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 \
                        encoding.c ip.c validate.c crl.c x509.c \

diff --git a/regress/usr.sbin/rpki-client/spl/9X0AhXWTJDl8lJhfOwvnac-42CA.spl b/regress/usr.sbin/rpki-client/spl/9X0AhXWTJDl8lJhfOwvnac-42CA.spl
new file mode 100644 (file)
index 0000000..0fea07f
Binary files /dev/null and b/regress/usr.sbin/rpki-client/spl/9X0AhXWTJDl8lJhfOwvnac-42CA.spl differ

diff --git a/regress/usr.sbin/rpki-client/test-spl.c b/regress/usr.sbin/rpki-client/test-spl.c
new file mode 100644 (file)
index 0000000..bb6019d
--- /dev/null
+++ b/regress/usr.sbin/rpki-client/test-spl.c
@@ -0,0 +1,104 @@
+/*     $Id: test-spl.c,v 1.1 2024/02/22 12:51:50 job Exp $ */
+/*
+ * Copyright (c) 2024 Job Snijders <job@fastly.com>
+ * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <assert.h>
+#include <err.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+
+#include "extern.h"
+
+int outformats;
+int verbose;
+int filemode;
+
+int
+main(int argc, char *argv[])
+{
+       int              c, i, ppem = 0, verb = 0;
+       X509            *xp = NULL;
+       struct spl      *p;
+       unsigned char   *buf;
+       size_t           len;
+
+       ERR_load_crypto_strings();
+       OpenSSL_add_all_ciphers();
+       OpenSSL_add_all_digests();
+       x509_init_oid();
+
+       while ((c = getopt(argc, argv, "pv")) != -1)
+               switch (c) {
+               case 'p':
+                       if (ppem)
+                               break;
+                       ppem = 1;
+                       break;
+               case 'v':
+                       verb++;
+                       break;
+               default:
+                       errx(1, "bad argument %c", c);
+               }
+
+       argv += optind;
+       argc -= optind;
+
+       if (argc == 0)
+               errx(1, "argument missing");
+
+       for (i = 0; i < argc; i++) {
+               buf = load_file(argv[i], &len);
+               if ((p = spl_parse(&xp, argv[i], -1, buf, len)) == NULL) {
+                       free(buf);
+                       break;
+               }
+               if (verb)
+                       spl_print(xp, p);
+               if (ppem) {
+                       if (!PEM_write_X509(stdout, xp))
+                               errx(1, "PEM_write_X509: unable to write cert");
+               }
+               free(buf);
+               spl_free(p);
+               X509_free(xp);
+       }
+
+       EVP_cleanup();
+       CRYPTO_cleanup_all_ex_data();
+       ERR_free_strings();
+
+       if (i < argc)
+               errx(1, "test failed for %s", argv[i]);
+
+       printf("OK\n");
+       return 0;
+}
+
+time_t
+get_current_time(void)
+{
+       return time(NULL);
+}