Add BGPsec router certificate to rpki-client regress

diff --git a/regress/usr.sbin/rpki-client/Makefile.inc b/regress/usr.sbin/rpki-client/Makefile.inc
index 0177a5a..7261c3b 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.11 2021/07/15 11:07:33 job Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2021/10/05 11:23:16 job Exp $
 
 .PATH:         ${.CURDIR}/../../../../usr.sbin/rpki-client
 
@@ -8,6 +8,7 @@ PROGS += test-gbr
 PROGS += test-mft
 PROGS += test-roa
 PROGS += test-tal
+PROGS += test-bgpsec
 
 .for p in ${PROGS}
 REGRESS_TARGETS += run-regress-$p
@@ -31,6 +32,11 @@ run-regress-test-cert: test-cert
        ./test-cert -v ${.CURDIR}/../cer/*.cer
        ./test-cert -vt ${TALARGS:S,,${.CURDIR}/../&,}
 
+SRCS_test-bgpsec=      test-bgpsec.c cert.c cms.c x509.c ip.c as.c io.c \
+                       log.c tal.c validate.c encoding.c
+run-regress-test-bgpsec: test-bgpsec
+       ./test-bgpsec -v ${.CURDIR}/../bgpsec/*.cer
+
 # Provide missing prototypes for OpenSSL
 mft_gen.c: mft.c
        echo '#include <openssl/asn1.h>\n' > $@.tmp

diff --git a/regress/usr.sbin/rpki-client/bgpsec/Vr46VDCUfrRNL9yZAy4mxfEAspQ.cer b/regress/usr.sbin/rpki-client/bgpsec/Vr46VDCUfrRNL9yZAy4mxfEAspQ.cer
new file mode 100644 (file)
index 0000000..5eb4fc0
Binary files /dev/null and b/regress/usr.sbin/rpki-client/bgpsec/Vr46VDCUfrRNL9yZAy4mxfEAspQ.cer differ

diff --git a/regress/usr.sbin/rpki-client/test-bgpsec.c b/regress/usr.sbin/rpki-client/test-bgpsec.c
new file mode 100644 (file)
index 0000000..352335f
--- /dev/null
+++ b/regress/usr.sbin/rpki-client/test-bgpsec.c
@@ -0,0 +1,118 @@
+/*     $Id: test-bgpsec.c,v 1.1 2021/10/05 11:23:16 job Exp $ */
+/*
+ * Copyright (c) 2021 Job Snijders <job@sobornost.net>
+ * 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 <sys/socket.h>
+#include <arpa/inet.h>
+
+#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/x509v3.h>
+
+#include "extern.h"
+
+#include "test-common.c"
+
+int verbose;
+
+static void
+cert_print(const struct cert *p)
+{
+       size_t   i;
+       char     buf1[64], buf2[64];
+       int      sockt;
+
+       assert(p != NULL);
+
+       if (p->crl != NULL)
+               printf("Revocation list: %s\n", p->crl);
+       printf("Subject key identifier: %s\n", pretty_key_id(p->ski));
+       if (p->aki != NULL)
+               printf("Authority key identifier: %s\n", pretty_key_id(p->aki));
+       if (p->aia != NULL)
+               printf("Authority info access: %s\n", p->aia);
+
+       for (i = 0; i < p->asz; i++)
+               switch (p->as[i].type) {
+               case CERT_AS_ID:
+                       printf("%5zu: AS: %"
+                               PRIu32 "\n", i + 1, p->as[i].id);
+                       break;
+               case CERT_AS_RANGE:
+                       printf("%5zu: AS: %"
+                               PRIu32 "--%" PRIu32 "\n", i + 1,
+                               p->as[i].range.min, p->as[i].range.max);
+                       break;
+               default:
+                       printf("%5zu: AS: invalid element", i + 1);
+               }
+}
+
+int
+main(int argc, char *argv[])
+{
+       int              c, i, verb = 0;
+       X509            *xp = NULL;
+       struct cert     *p;
+
+       ERR_load_crypto_strings();
+       OpenSSL_add_all_ciphers();
+       OpenSSL_add_all_digests();
+
+       while ((c = getopt(argc, argv, "v")) != -1)
+               switch (c) {
+               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++) {
+               p = cert_parse(&xp, argv[i]);
+               if (p == NULL)
+                       break;
+               if (verb)
+                       cert_print(p);
+               cert_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;
+}