Add regress for geofeed

diff --git a/regress/usr.sbin/rpki-client/Makefile.inc b/regress/usr.sbin/rpki-client/Makefile.inc
index 9a690df..efa3433 100644 (file)
--- a/regress/usr.sbin/rpki-client/Makefile.inc
+++ b/regress/usr.sbin/rpki-client/Makefile.inc
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile.inc,v 1.26 2022/11/02 12:56:38 job Exp $
+# $OpenBSD: Makefile.inc,v 1.27 2022/11/26 12:09:34 job Exp $
 
 .PATH:         ${.CURDIR}/../../../../usr.sbin/rpki-client
 
 PROGS += test-ip
 PROGS += test-cert
 PROGS += test-gbr
+PROGS += test-geofeed
 PROGS += test-mft
 PROGS += test-roa
 PROGS += test-rsc
@@ -56,6 +57,11 @@ SRCS_test-gbr+=      test-gbr.c gbr.c cms.c x509.c ip.c io.c log.c \
 run-regress-test-gbr: test-gbr
        ./test-gbr -v ${.CURDIR}/../gbr/*.gbr
 
+SRCS_test-geofeed+=    test-geofeed.c geofeed.c cms.c x509.c ip.c io.c log.c \
+               encoding.c print.c validate.c as.c cert.c mft.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 dummy.c x509.c
 run-regress-test-tal: test-tal

diff --git a/regress/usr.sbin/rpki-client/geofeed/geofeed-rfc9092.csv b/regress/usr.sbin/rpki-client/geofeed/geofeed-rfc9092.csv
new file mode 100644 (file)
index 0000000..4e31e2e
--- /dev/null
+++ b/regress/usr.sbin/rpki-client/geofeed/geofeed-rfc9092.csv
@@ -0,0 +1,39 @@
+192.0.2.0/24,US,WA,Seattle,\r
+# RPKI Signature: 192.0.2.0 - 192.0.2.255\r
+# MIIGjwYJKoZIhvcNAQcCoIIGgDCCBnwCAQMxDTALBglghkgBZQMEAgEwDQYLKoZ\r
+# IhvcNAQkQAS+gggSpMIIEpTCCA42gAwIBAgIUJ605QIPX8rW5m4Zwx3WyuW7hZu\r
+# QwDQYJKoZIhvcNAQELBQAwMzExMC8GA1UEAxMoM0FDRTJDRUY0RkIyMUI3RDExR\r
+# TNFMTg0RUZDMUUyOTdCMzc3ODY0MjAeFw0yMTA1MjAxNjA1NDVaFw0yMjAzMTYx\r
+# NjA1NDVaMDMxMTAvBgNVBAMTKDkxNDY1MkEzQkQ1MUMxNDQyNjAxOTg4ODlGNUM\r
+# 0NUFCRjA1M0ExODcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCycT\r
+# QrOb/qB2W3i3Ki8PhA/DEWyii2TgGo9pgCwO9lsIRI6Zb/k+aSiWWP9kSczlcQg\r
+# tPCVwr62hTQZCIowBN0BL0cK0/5k1imJdi5qdM3nvKswM8CnoR11vB8pQFwruZm\r
+# r5xphXRvE+mzuJVLgu2V1upmBXuWloeymudh6WWJ+GDjwPXO3RiXBejBrOFNXha\r
+# FLe08y4DPfr/S/tXJOBm7QzQptmbPLYtGfprYu45liFFqqP94UeLpISfXd36AKG\r
+# zqTFCcc3EW9l5UFE1MFLlnoEogqtoLoKABt0IkOFGKeC/EgeaBdWLe469ddC9rQ\r
+# ft5w6g6cmxG+aYDdIEB34zrAgMBAAGjggGvMIIBqzAdBgNVHQ4EFgQUkUZSo71R\r
+# wUQmAZiIn1xFq/BToYcwHwYDVR0jBBgwFoAUOs4s70+yG30R4+GE78Hil7N3hkI\r
+# wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwGAYDVR0gAQH/BA4wDDAKBg\r
+# grBgEFBQcOAjBhBgNVHR8EWjBYMFagVKBShlByc3luYzovL3Jwa2kuZXhhbXBsZ\r
+# S5uZXQvcmVwb3NpdG9yeS8zQUNFMkNFRjRGQjIxQjdEMTFFM0UxODRFRkMxRTI5\r
+# N0IzNzc4NjQyLmNybDBsBggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUHJzeW5\r
+# jOi8vcnBraS5leGFtcGxlLm5ldC9yZXBvc2l0b3J5LzNBQ0UyQ0VGNEZCMjFCN0\r
+# QxMUUzRTE4NEVGQzFFMjk3QjM3Nzg2NDIuY2VyMBkGCCsGAQUFBwEHAQH/BAowC\r
+# DAGBAIAAQUAMEUGCCsGAQUFBwELBDkwNzA1BggrBgEFBQcwDYYpaHR0cHM6Ly9y\r
+# cmRwLmV4YW1wbGUubmV0L25vdGlmaWNhdGlvbi54bWwwDQYJKoZIhvcNAQELBQA\r
+# DggEBAEjC98gVp0Mb7uiKaHylP0453mtJ+AkN07fsK/qGw/e90DJv7cp1hvjj4u\r
+# y3sgf7PJQ7cKNGrgybq/lE0jce+ARgVjbi2BrzZsWAnB846Snwsktw6cenaif6A\r
+# ww6q00NspAepMBd2Vg/9sKFvOwJFVOgNcqiQiXP5rGJPWBcOMv52a/7adjfXwpn\r
+# OijiTOgMloQGmC2TPZpydZKjlxEATdFEQssa33xDnlpp+/r9xuNVYRtRcC36oWr\r
+# aVA3jzN6F6rDE8r8xs3ylISVz6JeCQ4YRYwbMsjjc/tiJLM7ZYxIe5IrYz1ZtN6\r
+# n/SEssJAswRIgps2EhCt/HS2xAmGCOhgUxggGqMIIBpgIBA4AUkUZSo71RwUQmA\r
+# ZiIn1xFq/BToYcwCwYJYIZIAWUDBAIBoGswGgYJKoZIhvcNAQkDMQ0GCyqGSIb3\r
+# DQEJEAEvMBwGCSqGSIb3DQEJBTEPFw0yMTA1MjAxNjI4MzlaMC8GCSqGSIb3DQE\r
+# JBDEiBCAr4vKeUvHJINsE0YQwUMxoo48qrOU+iPuFbQR8qX3BFjANBgkqhkiG9w\r
+# 0BAQEFAASCAQB85HsCBrU3EcVOcf4nC6Z3jrOjT+fVlyTDAObF6GTNWgrxe7jSA\r
+# Inyf51UzuIGqhVY3sQiiXbdWcVYtPb4118KvyeXh8A/HLp4eeAJntl9D3igt38M\r
+# o84q5pf9pTQXx3hbsm51ilpOip/TKVMqzE42s6OPox3M0+6eKH3/vBKnw1s1ayM\r
+# 0MUnPDTBfZL3JJEGPWfIZHEcrypevbqR7Jjsz5vp0qyF2D9v+w+nyhZOPmuePm7\r
+# YqLyOw/E99PVBs9uI+hmBiCz/BK2Z3VRjrrlrUU+49eldSTkZ2sJyhCbbV2Ufgi\r
+# S2FOquAgJzjilyN3BDQLV8Rp9cGh0PpVslKH2na\r
+# End Signature: 192.0.2.0 - 192.0.2.255\r

diff --git a/regress/usr.sbin/rpki-client/geofeed/geofeed.csv b/regress/usr.sbin/rpki-client/geofeed/geofeed.csv
new file mode 100644 (file)
index 0000000..85df4f2
--- /dev/null
+++ b/regress/usr.sbin/rpki-client/geofeed/geofeed.csv
@@ -0,0 +1,36 @@
+2001:67c:208c::/48,NL,NL-NH,Amsterdam,\r
+# RPKI Signature: 2001:67c:208c::/48\r
+# MIIGBQYJKoZIhvcNAQcCoIIF9jCCBfICAQMxDTALBglghkgBZQMEAgEwDQYLKoZI\r
+# hvcNAQkQAS+gggQfMIIEGzCCAwOgAwIBAgIBBjANBgkqhkiG9w0BAQsFADAzMTEw\r
+# LwYDVQQDEyhjYWE4MDVkYmFjMzY0NzQ5YjliMTE1NTkwYWI2ZWYwZjk3MGNkYmQ4\r
+# MB4XDTIyMTEyNTE2MzQ1MloXDTIzMTEyNTE2MzQ1MlowDTELMAkGA1UEAwwCRUUw\r
+# ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDgZwc2RJ+SHPC7F5YCwgGw\r
+# k8vrLmdqiWBSjFGsXAPBaT6tfApYOn9yBu8d220TjjxDcA2phJBWWo+XqJhXHTDP\r
+# VmU6I6AakU3GTWAK/eGg1B3RykAlHgbJqMu5xC3WzrF8SEy+tWGZ1A7RjNi+RLfE\r
+# y2bnoLMp0mqHFfeB02oYJYdTxD4H5tCPnElSf5VumQDXYgtjjI68tTvCNn+7/GWp\r
+# qzFiFWFKJkJC/3ME3K98oPOB+9dvkKrY8t6ulE7n3N7ov3oxn7+ScXvATr7BjMbt\r
+# mfSytn5T7mxXlZ5hxqowC5rMV19EwhYBp+5bFQSCienO0FN3c/YI5GMLqBhxIBGH\r
+# AgMBAAGjggFeMIIBWjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFNQFNNtWpk2i\r
+# 7U3vranBMdoZVtynMB8GA1UdIwQYMBaAFMqoBdusNkdJubEVWQq27w+XDNvYMBgG\r
+# A1UdIAEB/wQOMAwwCgYIKwYBBQUHDgIwIgYIKwYBBQUHAQcBAf8EEzARMA8EAgAC\r
+# MAkDBwAgAQZ8IIwwZAYIKwYBBQUHAQEEWDBWMFQGCCsGAQUFBzAChkhyc3luYzov\r
+# L3Jwa2kucmlwZS5uZXQvcmVwb3NpdG9yeS9ERUZBVUxUL3lxZ0YyNncyUjBtNXNS\r
+# VlpDcmJ2RDVjTTI5Zy5jZXIwZAYDVR0fBF0wWzBZoFegVYZTcnN5bmM6Ly9jaGxv\r
+# ZS5zb2Jvcm5vc3QubmV0L3Jwa2kvUklQRS1ubGpvYnNuaWpkZXJzL3lxZ0YyNncy\r
+# UjBtNXNSVlpDcmJ2RDVjTTI5Zy5jcmwwDQYJKoZIhvcNAQELBQADggEBAIqqnvwt\r
+# 70twEMn+MRE3n04EblCVUwzuzqzqmXBpkBP7zzalxEV8ZCttA9elmlQRiVqHifvt\r
+# uAbNC2KLGk6zsoBY/uF9xtkmvgGBurb/loxDJB+pBsUlZRMuOUwiroE3gM5QGZA9\r
+# LlYUWrye/elz+3OYW8sgnCoUX4M/r8KhssUg0K6KAruaSU0mYqPH0cxb9QHtvKXf\r
+# sLeY+ZZXjkxJT4r7zFNl1dERGnWFn8TiBTjgaEHn0fLpCL6B4/n+/t3aOatSSRFg\r
+# S6FkCX3OuID/AQfGvHvAiyKrN0EnNHSC6k2i89/knnEc+jh8DNc5KNrON6JaJdPB\r
+# qoJVySMmJ2Z4d6gxggGqMIIBpgIBA4AU1AU021amTaLtTe+tqcEx2hlW3KcwCwYJ\r
+# YIZIAWUDBAIBoGswGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEvMBwGCSqGSIb3\r
+# DQEJBTEPFw0yMjExMjUxNjM0NTVaMC8GCSqGSIb3DQEJBDEiBCCY9XhRYzvj+pM/\r
+# b0lZoc+ZapOfmX5IuOFoPcym0ogh6DANBgkqhkiG9w0BAQEFAASCAQBBXMygxOhJ\r
+# 3vNbzXAhO1V+SOufTEaQFI7yQgCdcejOGGz+KtuDuYJ6ztRE1zxozZohIfiSNi3F\r
+# P16CGIYenhriv/+cz99XEMO5lkDf4HshcNrQ7dK0Lpjizl7jAvSwBgAefBB5SSvl\r
+# FscUsZtU4z45O1JmgQjBWxOej/7RE3dUsUUWuty+iv8rd/fhq7oJOyCyg8OIbJry\r
+# PCp+TEPKOfBRjhoHrVKvh/NZ+MdWOHK1DqvIt9w7usbgbV8oykLiR3bWSnPsDScA\r
+# dtA7GD/yDwqWgpSZsYyMK5axs/96/Np6S3sl3qwF197RLQk1l9Vw6O87cwupUYqY\r
+# IH26+87V6d29\r
+# End Signature: 2001:67c:208c::/48\r

diff --git a/regress/usr.sbin/rpki-client/openssl11/Makefile b/regress/usr.sbin/rpki-client/openssl11/Makefile
index 0888d93..1eff1fd 100644 (file)
--- a/regress/usr.sbin/rpki-client/openssl11/Makefile
+++ b/regress/usr.sbin/rpki-client/openssl11/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2022/11/08 13:01:53 tb Exp $
+# $OpenBSD: Makefile,v 1.16 2022/11/26 12:09:34 job Exp $
 
 LDADD +=       -Wl,-rpath,/usr/local/lib/eopenssl11 -L/usr/local/lib/eopenssl11
 CFLAGS +=      -I${.CURDIR}/ -I/usr/local/include/eopenssl11/
@@ -24,6 +24,7 @@ SRCS_test-mft =               ${LIBCRYPTO_COMPAT}
 SRCS_test-roa =                ${LIBCRYPTO_COMPAT}
 SRCS_test-cert =       ${LIBCRYPTO_COMPAT}
 SRCS_test-gbr =                ${LIBCRYPTO_COMPAT}
+SRCS_test-geofeed=     ${LIBCRYPTO_COMPAT}
 SRCS_test-tal =                ${LIBCRYPTO_COMPAT}
 SRCS_test-bgpsec =     ${LIBCRYPTO_COMPAT}
 SRCS_test-rrdp =       ${LIBCRYPTO_COMPAT}