Add regress for geofeed

4 files changed, 84 insertions, 2 deletions

diff --git a/regress/usr.sbin/rpki-client/Makefile.inc b/regress/usr.sbin/rpki-client/Makefile.inc
index 9a690df0c30..efa343371b2 100644
--- 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
index 00000000000..4e31e2e4664
--- /dev/null
+++ b/regress/usr.sbin/rpki-client/geofeed/geofeed-rfc9092.csv
@@ -0,0 +1,39 @@
+192.0.2.0/24,US,WA,Seattle,

+# RPKI Signature: 192.0.2.0 - 192.0.2.255

+# MIIGjwYJKoZIhvcNAQcCoIIGgDCCBnwCAQMxDTALBglghkgBZQMEAgEwDQYLKoZ

+# IhvcNAQkQAS+gggSpMIIEpTCCA42gAwIBAgIUJ605QIPX8rW5m4Zwx3WyuW7hZu

+# QwDQYJKoZIhvcNAQELBQAwMzExMC8GA1UEAxMoM0FDRTJDRUY0RkIyMUI3RDExR

+# TNFMTg0RUZDMUUyOTdCMzc3ODY0MjAeFw0yMTA1MjAxNjA1NDVaFw0yMjAzMTYx

+# NjA1NDVaMDMxMTAvBgNVBAMTKDkxNDY1MkEzQkQ1MUMxNDQyNjAxOTg4ODlGNUM

+# 0NUFCRjA1M0ExODcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCycT

+# QrOb/qB2W3i3Ki8PhA/DEWyii2TgGo9pgCwO9lsIRI6Zb/k+aSiWWP9kSczlcQg

+# tPCVwr62hTQZCIowBN0BL0cK0/5k1imJdi5qdM3nvKswM8CnoR11vB8pQFwruZm

+# r5xphXRvE+mzuJVLgu2V1upmBXuWloeymudh6WWJ+GDjwPXO3RiXBejBrOFNXha

+# FLe08y4DPfr/S/tXJOBm7QzQptmbPLYtGfprYu45liFFqqP94UeLpISfXd36AKG

+# zqTFCcc3EW9l5UFE1MFLlnoEogqtoLoKABt0IkOFGKeC/EgeaBdWLe469ddC9rQ

+# ft5w6g6cmxG+aYDdIEB34zrAgMBAAGjggGvMIIBqzAdBgNVHQ4EFgQUkUZSo71R

+# wUQmAZiIn1xFq/BToYcwHwYDVR0jBBgwFoAUOs4s70+yG30R4+GE78Hil7N3hkI

+# wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCB4AwGAYDVR0gAQH/BA4wDDAKBg

+# grBgEFBQcOAjBhBgNVHR8EWjBYMFagVKBShlByc3luYzovL3Jwa2kuZXhhbXBsZ

+# S5uZXQvcmVwb3NpdG9yeS8zQUNFMkNFRjRGQjIxQjdEMTFFM0UxODRFRkMxRTI5

+# N0IzNzc4NjQyLmNybDBsBggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUHJzeW5

+# jOi8vcnBraS5leGFtcGxlLm5ldC9yZXBvc2l0b3J5LzNBQ0UyQ0VGNEZCMjFCN0

+# QxMUUzRTE4NEVGQzFFMjk3QjM3Nzg2NDIuY2VyMBkGCCsGAQUFBwEHAQH/BAowC

+# DAGBAIAAQUAMEUGCCsGAQUFBwELBDkwNzA1BggrBgEFBQcwDYYpaHR0cHM6Ly9y

+# cmRwLmV4YW1wbGUubmV0L25vdGlmaWNhdGlvbi54bWwwDQYJKoZIhvcNAQELBQA

+# DggEBAEjC98gVp0Mb7uiKaHylP0453mtJ+AkN07fsK/qGw/e90DJv7cp1hvjj4u

+# y3sgf7PJQ7cKNGrgybq/lE0jce+ARgVjbi2BrzZsWAnB846Snwsktw6cenaif6A

+# ww6q00NspAepMBd2Vg/9sKFvOwJFVOgNcqiQiXP5rGJPWBcOMv52a/7adjfXwpn

+# OijiTOgMloQGmC2TPZpydZKjlxEATdFEQssa33xDnlpp+/r9xuNVYRtRcC36oWr

+# aVA3jzN6F6rDE8r8xs3ylISVz6JeCQ4YRYwbMsjjc/tiJLM7ZYxIe5IrYz1ZtN6

+# n/SEssJAswRIgps2EhCt/HS2xAmGCOhgUxggGqMIIBpgIBA4AUkUZSo71RwUQmA

+# ZiIn1xFq/BToYcwCwYJYIZIAWUDBAIBoGswGgYJKoZIhvcNAQkDMQ0GCyqGSIb3

+# DQEJEAEvMBwGCSqGSIb3DQEJBTEPFw0yMTA1MjAxNjI4MzlaMC8GCSqGSIb3DQE

+# JBDEiBCAr4vKeUvHJINsE0YQwUMxoo48qrOU+iPuFbQR8qX3BFjANBgkqhkiG9w

+# 0BAQEFAASCAQB85HsCBrU3EcVOcf4nC6Z3jrOjT+fVlyTDAObF6GTNWgrxe7jSA

+# Inyf51UzuIGqhVY3sQiiXbdWcVYtPb4118KvyeXh8A/HLp4eeAJntl9D3igt38M

+# o84q5pf9pTQXx3hbsm51ilpOip/TKVMqzE42s6OPox3M0+6eKH3/vBKnw1s1ayM

+# 0MUnPDTBfZL3JJEGPWfIZHEcrypevbqR7Jjsz5vp0qyF2D9v+w+nyhZOPmuePm7

+# YqLyOw/E99PVBs9uI+hmBiCz/BK2Z3VRjrrlrUU+49eldSTkZ2sJyhCbbV2Ufgi

+# S2FOquAgJzjilyN3BDQLV8Rp9cGh0PpVslKH2na

+# End Signature: 192.0.2.0 - 192.0.2.255

diff --git a/regress/usr.sbin/rpki-client/geofeed/geofeed.csv b/regress/usr.sbin/rpki-client/geofeed/geofeed.csv
new file mode 100644
index 00000000000..85df4f2d16d
--- /dev/null
+++ b/regress/usr.sbin/rpki-client/geofeed/geofeed.csv
@@ -0,0 +1,36 @@
+2001:67c:208c::/48,NL,NL-NH,Amsterdam,

+# RPKI Signature: 2001:67c:208c::/48

+# MIIGBQYJKoZIhvcNAQcCoIIF9jCCBfICAQMxDTALBglghkgBZQMEAgEwDQYLKoZI

+# hvcNAQkQAS+gggQfMIIEGzCCAwOgAwIBAgIBBjANBgkqhkiG9w0BAQsFADAzMTEw

+# LwYDVQQDEyhjYWE4MDVkYmFjMzY0NzQ5YjliMTE1NTkwYWI2ZWYwZjk3MGNkYmQ4

+# MB4XDTIyMTEyNTE2MzQ1MloXDTIzMTEyNTE2MzQ1MlowDTELMAkGA1UEAwwCRUUw

+# ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDgZwc2RJ+SHPC7F5YCwgGw

+# k8vrLmdqiWBSjFGsXAPBaT6tfApYOn9yBu8d220TjjxDcA2phJBWWo+XqJhXHTDP

+# VmU6I6AakU3GTWAK/eGg1B3RykAlHgbJqMu5xC3WzrF8SEy+tWGZ1A7RjNi+RLfE

+# y2bnoLMp0mqHFfeB02oYJYdTxD4H5tCPnElSf5VumQDXYgtjjI68tTvCNn+7/GWp

+# qzFiFWFKJkJC/3ME3K98oPOB+9dvkKrY8t6ulE7n3N7ov3oxn7+ScXvATr7BjMbt

+# mfSytn5T7mxXlZ5hxqowC5rMV19EwhYBp+5bFQSCienO0FN3c/YI5GMLqBhxIBGH

+# AgMBAAGjggFeMIIBWjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0OBBYEFNQFNNtWpk2i

+# 7U3vranBMdoZVtynMB8GA1UdIwQYMBaAFMqoBdusNkdJubEVWQq27w+XDNvYMBgG

+# A1UdIAEB/wQOMAwwCgYIKwYBBQUHDgIwIgYIKwYBBQUHAQcBAf8EEzARMA8EAgAC

+# MAkDBwAgAQZ8IIwwZAYIKwYBBQUHAQEEWDBWMFQGCCsGAQUFBzAChkhyc3luYzov

+# L3Jwa2kucmlwZS5uZXQvcmVwb3NpdG9yeS9ERUZBVUxUL3lxZ0YyNncyUjBtNXNS

+# VlpDcmJ2RDVjTTI5Zy5jZXIwZAYDVR0fBF0wWzBZoFegVYZTcnN5bmM6Ly9jaGxv

+# ZS5zb2Jvcm5vc3QubmV0L3Jwa2kvUklQRS1ubGpvYnNuaWpkZXJzL3lxZ0YyNncy

+# UjBtNXNSVlpDcmJ2RDVjTTI5Zy5jcmwwDQYJKoZIhvcNAQELBQADggEBAIqqnvwt

+# 70twEMn+MRE3n04EblCVUwzuzqzqmXBpkBP7zzalxEV8ZCttA9elmlQRiVqHifvt

+# uAbNC2KLGk6zsoBY/uF9xtkmvgGBurb/loxDJB+pBsUlZRMuOUwiroE3gM5QGZA9

+# LlYUWrye/elz+3OYW8sgnCoUX4M/r8KhssUg0K6KAruaSU0mYqPH0cxb9QHtvKXf

+# sLeY+ZZXjkxJT4r7zFNl1dERGnWFn8TiBTjgaEHn0fLpCL6B4/n+/t3aOatSSRFg

+# S6FkCX3OuID/AQfGvHvAiyKrN0EnNHSC6k2i89/knnEc+jh8DNc5KNrON6JaJdPB

+# qoJVySMmJ2Z4d6gxggGqMIIBpgIBA4AU1AU021amTaLtTe+tqcEx2hlW3KcwCwYJ

+# YIZIAWUDBAIBoGswGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEvMBwGCSqGSIb3

+# DQEJBTEPFw0yMjExMjUxNjM0NTVaMC8GCSqGSIb3DQEJBDEiBCCY9XhRYzvj+pM/

+# b0lZoc+ZapOfmX5IuOFoPcym0ogh6DANBgkqhkiG9w0BAQEFAASCAQBBXMygxOhJ

+# 3vNbzXAhO1V+SOufTEaQFI7yQgCdcejOGGz+KtuDuYJ6ztRE1zxozZohIfiSNi3F

+# P16CGIYenhriv/+cz99XEMO5lkDf4HshcNrQ7dK0Lpjizl7jAvSwBgAefBB5SSvl

+# FscUsZtU4z45O1JmgQjBWxOej/7RE3dUsUUWuty+iv8rd/fhq7oJOyCyg8OIbJry

+# PCp+TEPKOfBRjhoHrVKvh/NZ+MdWOHK1DqvIt9w7usbgbV8oykLiR3bWSnPsDScA

+# dtA7GD/yDwqWgpSZsYyMK5axs/96/Np6S3sl3qwF197RLQk1l9Vw6O87cwupUYqY

+# IH26+87V6d29

+# End Signature: 2001:67c:208c::/48

diff --git a/regress/usr.sbin/rpki-client/openssl11/Makefile b/regress/usr.sbin/rpki-client/openssl11/Makefile
index 0888d9354aa..1eff1fd37ec 100644
--- 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}