From a1753de66958f53266843bd87c1f0cf605a372b2 Mon Sep 17 00:00:00 2001
From: claudio <claudio@openbsd.org>
Date: Thu, 4 Feb 2021 08:58:19 +0000
Subject: [PATCH] Eventhough most openssl includes include everything try to be
 a bit more explicit about what is used where. Seems to be the least worst
 solution.

---
 usr.sbin/rpki-client/cert.c   | 5 +++--
 usr.sbin/rpki-client/gbr.c    | 4 +++-
 usr.sbin/rpki-client/mft.c    | 4 +++-
 usr.sbin/rpki-client/parser.c | 3 ++-
 usr.sbin/rpki-client/roa.c    | 5 ++++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/rpki-client/cert.c b/usr.sbin/rpki-client/cert.c
index c0fad5ef901..b857b4f541d 100644
--- a/usr.sbin/rpki-client/cert.c
+++ b/usr.sbin/rpki-client/cert.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cert.c,v 1.23 2021/01/29 10:13:16 claudio Exp $ */
+/*	$OpenBSD: cert.c,v 1.24 2021/02/04 08:58:19 claudio Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -27,7 +27,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <openssl/x509v3.h> /* DIST_POINT */
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
 
 #include "extern.h"
 
diff --git a/usr.sbin/rpki-client/gbr.c b/usr.sbin/rpki-client/gbr.c
index 074ef9dc824..550f11e18ba 100644
--- a/usr.sbin/rpki-client/gbr.c
+++ b/usr.sbin/rpki-client/gbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gbr.c,v 1.3 2021/01/29 10:13:16 claudio Exp $ */
+/*	$OpenBSD: gbr.c,v 1.4 2021/02/04 08:58:19 claudio Exp $ */
 /*
  * Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
  *
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <openssl/x509.h>
+
 #include "extern.h"
 
 /*
diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c
index 1f41bfecd03..6e357c3397f 100644
--- a/usr.sbin/rpki-client/mft.c
+++ b/usr.sbin/rpki-client/mft.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mft.c,v 1.24 2021/01/29 10:13:16 claudio Exp $ */
+/*	$OpenBSD: mft.c,v 1.25 2021/02/04 08:58:19 claudio Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -25,7 +25,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <openssl/asn1.h>
 #include <openssl/sha.h>
+#include <openssl/x509.h>
 
 #include "extern.h"
 
diff --git a/usr.sbin/rpki-client/parser.c b/usr.sbin/rpki-client/parser.c
index ab64f9dd872..4a73db495a0 100644
--- a/usr.sbin/rpki-client/parser.c
+++ b/usr.sbin/rpki-client/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.2 2021/02/04 08:13:57 claudio Exp $ */
+/*	$OpenBSD: parser.c,v 1.3 2021/02/04 08:58:19 claudio Exp $ */
 /*
  * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -32,6 +32,7 @@
 
 #include <openssl/asn1.h>
 #include <openssl/err.h>
+#include <openssl/evp.h>
 #include <openssl/x509.h>
 
 #include "extern.h"
diff --git a/usr.sbin/rpki-client/roa.c b/usr.sbin/rpki-client/roa.c
index 24a615ce40d..0b9e61d5483 100644
--- a/usr.sbin/rpki-client/roa.c
+++ b/usr.sbin/rpki-client/roa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: roa.c,v 1.12 2021/01/29 10:13:16 claudio Exp $ */
+/*	$OpenBSD: roa.c,v 1.13 2021/02/04 08:58:19 claudio Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -23,6 +23,9 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+
 #include "extern.h"
 
 /*
-- 
2.20.1