Re: rpki-client cleanup includes
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 - 1.5
> +++ as.c 12 Sep 2020 15:02:20 -
> @@ -25,8 +25,6 @@
> #include
> #include
>
> -#include
> -
> #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.c28 Jul 2020 07:35:04 - 1.17
> +++ cert.c12 Sep 2020 15:02:20 -
> @@ -26,7 +26,6 @@
> #include
> #include
>
> -#include
> #include /* 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 - 1.8
> +++ crl.c 12 Sep 2020 15:02:20 -
> @@ -26,8 +26,6 @@
> #include
> #include
>
> -#include
> -
> #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 - 1.33
> +++ extern.h 12 Sep 2020 15:02:20 -
> @@ -20,6 +20,8 @@
> #include
> #include
>
> +#include
> +
> 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 - 1.8
> +++ io.c 12 Sep 2020 15:02:20 -
> @@ -25,8 +25,6 @@
> #include
> #include
>
> -#include
> -
> #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 - 1.12
> +++ ip.c 12 Sep 2020 15:02:20 -
> @@ -25,8 +25,6 @@
> #include
> #include
>
> -#include
> -
> #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 - 1.5
> +++ log.c 12 Sep 2020 15:02:20 -
> @@ -21,7 +21,6 @@
> #include
>
> #include
> -#include
>
> #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 - 1.15
> +++ mft.c 12 Sep 2020 15:02:20 -
> @@ -24,7 +24,6 @@
> #include
> #include
>
> -#include
> #include
>
> #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 - 1.17
> +++ output-bgpd.c 12 Sep 2020 15:02:20 -
> @@ -16,7 +16,6 @@
> */
>
> #include
> -#include
>
> #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 - 1.9
> +++ output-bird.c 12 Sep 2020 15:02:20 -
> @@ -17,7 +17,6 @@
> */
>
> #include
> -#include
>
> #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 - 1.7
> +++ output-csv.c 12 Sep 2020 15:02:20 -
> @@ -16,7 +16,6 @@
> */
>
> #include
> -#include
>
> #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 - 1.12
>
rpki-client cleanup includes
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.c27 Nov 2019 17:18:24 - 1.5
+++ as.c12 Sep 2020 15:02:20 -
@@ -25,8 +25,6 @@
#include
#include
-#include
-
#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 - 1.17
+++ cert.c 12 Sep 2020 15:02:20 -
@@ -26,7 +26,6 @@
#include
#include
-#include
#include /* 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 - 1.8
+++ crl.c 12 Sep 2020 15:02:20 -
@@ -26,8 +26,6 @@
#include
#include
-#include
-
#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.h12 Sep 2020 10:02:01 - 1.33
+++ extern.h12 Sep 2020 15:02:20 -
@@ -20,6 +20,8 @@
#include
#include
+#include
+
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.c29 Nov 2019 05:09:50 - 1.8
+++ io.c12 Sep 2020 15:02:20 -
@@ -25,8 +25,6 @@
#include
#include
-#include
-
#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.c16 Apr 2020 14:39:44 - 1.12
+++ ip.c12 Sep 2020 15:02:20 -
@@ -25,8 +25,6 @@
#include
#include
-#include
-
#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 - 1.5
+++ log.c 12 Sep 2020 15:02:20 -
@@ -21,7 +21,6 @@
#include
#include
-#include
#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 - 1.15
+++ mft.c 12 Sep 2020 15:02:20 -
@@ -24,7 +24,6 @@
#include
#include
-#include
#include
#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 - 1.17
+++ output-bgpd.c 12 Sep 2020 15:02:20 -
@@ -16,7 +16,6 @@
*/
#include
-#include
#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 - 1.9
+++ output-bird.c 12 Sep 2020 15:02:20 -
@@ -17,7 +17,6 @@
*/
#include
-#include
#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.c28 Apr 2020 13:41:35 - 1.7
+++ output-csv.c12 Sep 2020 15:02:20 -
@@ -16,7 +16,6 @@
*/
#include
-#include
#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 - 1.12
+++ output-json.c 12 Sep 2020 15:02:20 -
@@ -19,7 +19,6 @@
#include
#include
#include
-#include
#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.c14 May 2020 20:49:04 - 1.16
+++ output.c
