ok beck@
On Sat, Sep 12, 2020 at 05:42:39PM +0200, Claudio Jeker wrote:
> extern.h uses stuff from openssl/x509.h so put that include in there
> and remove all the various other openssl includes in other files that
> actually don't need x509 functions.
>
> --
> :wq Claudio
>
> Index: as.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/as.c,v
> retrieving revision 1.5
> diff -u -p -r1.5 as.c
> --- as.c 27 Nov 2019 17:18:24 -0000 1.5
> +++ as.c 12 Sep 2020 15:02:20 -0000
> @@ -25,8 +25,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> -
> #include "extern.h"
>
> /*
> Index: cert.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/cert.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 cert.c
> --- cert.c 28 Jul 2020 07:35:04 -0000 1.17
> +++ cert.c 12 Sep 2020 15:02:20 -0000
> @@ -26,7 +26,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> #include <openssl/x509v3.h> /* DIST_POINT */
>
> #include "extern.h"
> Index: crl.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/crl.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 crl.c
> --- crl.c 2 Apr 2020 09:16:43 -0000 1.8
> +++ crl.c 12 Sep 2020 15:02:20 -0000
> @@ -26,8 +26,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> -
> #include "extern.h"
>
> X509_CRL *
> Index: extern.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/extern.h,v
> retrieving revision 1.33
> diff -u -p -r1.33 extern.h
> --- extern.h 12 Sep 2020 10:02:01 -0000 1.33
> +++ extern.h 12 Sep 2020 15:02:20 -0000
> @@ -20,6 +20,8 @@
> #include <sys/tree.h>
> #include <sys/time.h>
>
> +#include <openssl/x509.h>
> +
> enum cert_as_type {
> CERT_AS_ID, /* single identifier */
> CERT_AS_INHERIT, /* inherit from parent */
> Index: io.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/io.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 io.c
> --- io.c 29 Nov 2019 05:09:50 -0000 1.8
> +++ io.c 12 Sep 2020 15:02:20 -0000
> @@ -25,8 +25,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/x509.h>
> -
> #include "extern.h"
>
> void
> Index: ip.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/ip.c,v
> retrieving revision 1.12
> diff -u -p -r1.12 ip.c
> --- ip.c 16 Apr 2020 14:39:44 -0000 1.12
> +++ ip.c 12 Sep 2020 15:02:20 -0000
> @@ -25,8 +25,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> -
> #include "extern.h"
>
> #define PREFIX_SIZE(x) (((x) + 7) / 8)
> Index: log.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/log.c,v
> retrieving revision 1.5
> diff -u -p -r1.5 log.c
> --- log.c 29 Nov 2019 05:14:11 -0000 1.5
> +++ log.c 12 Sep 2020 15:02:20 -0000
> @@ -21,7 +21,6 @@
> #include <stdint.h>
>
> #include <openssl/err.h>
> -#include <openssl/ssl.h>
>
> #include "extern.h"
>
> Index: mft.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/mft.c,v
> retrieving revision 1.15
> diff -u -p -r1.15 mft.c
> --- mft.c 30 Jun 2020 12:52:44 -0000 1.15
> +++ mft.c 12 Sep 2020 15:02:20 -0000
> @@ -24,7 +24,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> #include <openssl/sha.h>
>
> #include "extern.h"
> Index: output-bgpd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/output-bgpd.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 output-bgpd.c
> --- output-bgpd.c 28 Apr 2020 13:41:35 -0000 1.17
> +++ output-bgpd.c 12 Sep 2020 15:02:20 -0000
> @@ -16,7 +16,6 @@
> */
>
> #include <stdlib.h>
> -#include <openssl/ssl.h>
>
> #include "extern.h"
>
> Index: output-bird.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/output-bird.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 output-bird.c
> --- output-bird.c 28 Apr 2020 15:03:39 -0000 1.9
> +++ output-bird.c 12 Sep 2020 15:02:20 -0000
> @@ -17,7 +17,6 @@
> */
>
> #include <stdlib.h>
> -#include <openssl/ssl.h>
>
> #include "extern.h"
>
> Index: output-csv.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/output-csv.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 output-csv.c
> --- output-csv.c 28 Apr 2020 13:41:35 -0000 1.7
> +++ output-csv.c 12 Sep 2020 15:02:20 -0000
> @@ -16,7 +16,6 @@
> */
>
> #include <stdlib.h>
> -#include <openssl/ssl.h>
>
> #include "extern.h"
>
> Index: output-json.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/output-json.c,v
> retrieving revision 1.12
> diff -u -p -r1.12 output-json.c
> --- output-json.c 3 May 2020 20:24:02 -0000 1.12
> +++ output-json.c 12 Sep 2020 15:02:20 -0000
> @@ -19,7 +19,6 @@
> #include <unistd.h>
> #include <time.h>
> #include <netdb.h>
> -#include <openssl/ssl.h>
>
> #include "extern.h"
>
> Index: output.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/output.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 output.c
> --- output.c 14 May 2020 20:49:04 -0000 1.16
> +++ output.c 12 Sep 2020 15:02:20 -0000
> @@ -27,8 +27,6 @@
> #include <unistd.h>
> #include <time.h>
>
> -#include <openssl/x509v3.h>
> -
> #include "extern.h"
>
> char *outputdir;
> Index: roa.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/roa.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 roa.c
> --- roa.c 29 Nov 2019 05:14:11 -0000 1.8
> +++ roa.c 12 Sep 2020 15:02:20 -0000
> @@ -23,8 +23,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> -
> #include "extern.h"
>
> /*
> Index: rsync.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/rsync.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 rsync.c
> --- rsync.c 12 Sep 2020 10:02:01 -0000 1.8
> +++ rsync.c 12 Sep 2020 15:02:20 -0000
> @@ -29,8 +29,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> -
> #include "extern.h"
>
> /*
> Index: tal.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/tal.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 tal.c
> --- tal.c 11 Apr 2020 15:52:24 -0000 1.18
> +++ tal.c 12 Sep 2020 15:02:20 -0000
> @@ -25,8 +25,6 @@
> #include <stdlib.h>
> #include <string.h>
>
> -#include <openssl/x509.h>
> -
> #include "extern.h"
>
> /*
> Index: validate.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/validate.c,v
> retrieving revision 1.10
> diff -u -p -r1.10 validate.c
> --- validate.c 29 Nov 2019 05:16:54 -0000 1.10
> +++ validate.c 12 Sep 2020 15:02:20 -0000
> @@ -26,8 +26,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> -
> #include "extern.h"
>
> static void
> Index: x509.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/rpki-client/x509.c,v
> retrieving revision 1.13
> diff -u -p -r1.13 x509.c
> --- x509.c 29 Nov 2019 05:00:24 -0000 1.13
> +++ x509.c 12 Sep 2020 15:02:20 -0000
> @@ -25,7 +25,6 @@
> #include <string.h>
> #include <unistd.h>
>
> -#include <openssl/ssl.h>
> #include <openssl/x509v3.h>
>
> #include "extern.h"
>
