diff options
-rw-r--r-- | usr.sbin/rpki-client/as.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/cert.c | 3 | ||||
-rw-r--r-- | usr.sbin/rpki-client/crl.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/extern.h | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/io.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/ip.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/log.c | 3 | ||||
-rw-r--r-- | usr.sbin/rpki-client/mft.c | 3 | ||||
-rw-r--r-- | usr.sbin/rpki-client/output-bgpd.c | 3 | ||||
-rw-r--r-- | usr.sbin/rpki-client/output-bird.c | 3 | ||||
-rw-r--r-- | usr.sbin/rpki-client/output-csv.c | 3 | ||||
-rw-r--r-- | usr.sbin/rpki-client/output-json.c | 3 | ||||
-rw-r--r-- | usr.sbin/rpki-client/output.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/roa.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/rsync.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/tal.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/validate.c | 4 | ||||
-rw-r--r-- | usr.sbin/rpki-client/x509.c | 3 |
18 files changed, 20 insertions, 44 deletions
diff --git a/usr.sbin/rpki-client/as.c b/usr.sbin/rpki-client/as.c index 4377873ccd1..a8f0383305b 100644 --- a/usr.sbin/rpki-client/as.c +++ b/usr.sbin/rpki-client/as.c @@ -1,4 +1,4 @@ -/* $OpenBSD: as.c,v 1.5 2019/11/27 17:18:24 deraadt Exp $ */ +/* $OpenBSD: as.c,v 1.6 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -25,8 +25,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> - #include "extern.h" /* diff --git a/usr.sbin/rpki-client/cert.c b/usr.sbin/rpki-client/cert.c index e9a19f32b3e..1f9eb524a3e 100644 --- a/usr.sbin/rpki-client/cert.c +++ b/usr.sbin/rpki-client/cert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cert.c,v 1.17 2020/07/28 07:35:04 claudio Exp $ */ +/* $OpenBSD: cert.c,v 1.18 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -26,7 +26,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> #include <openssl/x509v3.h> /* DIST_POINT */ #include "extern.h" diff --git a/usr.sbin/rpki-client/crl.c b/usr.sbin/rpki-client/crl.c index 0c9e20f29a4..bf0e05496b1 100644 --- a/usr.sbin/rpki-client/crl.c +++ b/usr.sbin/rpki-client/crl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crl.c,v 1.8 2020/04/02 09:16:43 claudio Exp $ */ +/* $OpenBSD: crl.c,v 1.9 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -26,8 +26,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> - #include "extern.h" X509_CRL * diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h index 9173cb0ada6..be7df639310 100644 --- a/usr.sbin/rpki-client/extern.h +++ b/usr.sbin/rpki-client/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.33 2020/09/12 10:02:01 claudio Exp $ */ +/* $OpenBSD: extern.h,v 1.34 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -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 */ diff --git a/usr.sbin/rpki-client/io.c b/usr.sbin/rpki-client/io.c index 3bbf8b96532..e8155c44b72 100644 --- a/usr.sbin/rpki-client/io.c +++ b/usr.sbin/rpki-client/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.8 2019/11/29 05:09:50 benno Exp $ */ +/* $OpenBSD: io.c,v 1.9 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -25,8 +25,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/x509.h> - #include "extern.h" void diff --git a/usr.sbin/rpki-client/ip.c b/usr.sbin/rpki-client/ip.c index c0af1ed23b5..de1f1df5e42 100644 --- a/usr.sbin/rpki-client/ip.c +++ b/usr.sbin/rpki-client/ip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip.c,v 1.12 2020/04/16 14:39:44 claudio Exp $ */ +/* $OpenBSD: ip.c,v 1.13 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -25,8 +25,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> - #include "extern.h" #define PREFIX_SIZE(x) (((x) + 7) / 8) diff --git a/usr.sbin/rpki-client/log.c b/usr.sbin/rpki-client/log.c index f7fdb03ebac..662bd4678dc 100644 --- a/usr.sbin/rpki-client/log.c +++ b/usr.sbin/rpki-client/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.5 2019/11/29 05:14:11 benno Exp $ */ +/* $OpenBSD: log.c,v 1.6 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -21,7 +21,6 @@ #include <stdint.h> #include <openssl/err.h> -#include <openssl/ssl.h> #include "extern.h" diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c index fb5163dbd25..e370cd9a065 100644 --- a/usr.sbin/rpki-client/mft.c +++ b/usr.sbin/rpki-client/mft.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mft.c,v 1.15 2020/06/30 12:52:44 job Exp $ */ +/* $OpenBSD: mft.c,v 1.16 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -24,7 +24,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> #include <openssl/sha.h> #include "extern.h" diff --git a/usr.sbin/rpki-client/output-bgpd.c b/usr.sbin/rpki-client/output-bgpd.c index a60cb5dafa5..ebe955d6581 100644 --- a/usr.sbin/rpki-client/output-bgpd.c +++ b/usr.sbin/rpki-client/output-bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output-bgpd.c,v 1.17 2020/04/28 13:41:35 deraadt Exp $ */ +/* $OpenBSD: output-bgpd.c,v 1.18 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -16,7 +16,6 @@ */ #include <stdlib.h> -#include <openssl/ssl.h> #include "extern.h" diff --git a/usr.sbin/rpki-client/output-bird.c b/usr.sbin/rpki-client/output-bird.c index 78bf5bfbb93..0d0ce3d5e29 100644 --- a/usr.sbin/rpki-client/output-bird.c +++ b/usr.sbin/rpki-client/output-bird.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output-bird.c,v 1.9 2020/04/28 15:03:39 deraadt Exp $ */ +/* $OpenBSD: output-bird.c,v 1.10 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org> * Copyright (c) 2020 Robert Scheck <robert@fedoraproject.org> @@ -17,7 +17,6 @@ */ #include <stdlib.h> -#include <openssl/ssl.h> #include "extern.h" diff --git a/usr.sbin/rpki-client/output-csv.c b/usr.sbin/rpki-client/output-csv.c index 22147397068..be899a0f876 100644 --- a/usr.sbin/rpki-client/output-csv.c +++ b/usr.sbin/rpki-client/output-csv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output-csv.c,v 1.7 2020/04/28 13:41:35 deraadt Exp $ */ +/* $OpenBSD: output-csv.c,v 1.8 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org> * @@ -16,7 +16,6 @@ */ #include <stdlib.h> -#include <openssl/ssl.h> #include "extern.h" diff --git a/usr.sbin/rpki-client/output-json.c b/usr.sbin/rpki-client/output-json.c index 452b7672bb0..1c6738a6e59 100644 --- a/usr.sbin/rpki-client/output-json.c +++ b/usr.sbin/rpki-client/output-json.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output-json.c,v 1.12 2020/05/03 20:24:02 deraadt Exp $ */ +/* $OpenBSD: output-json.c,v 1.13 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org> * @@ -19,7 +19,6 @@ #include <unistd.h> #include <time.h> #include <netdb.h> -#include <openssl/ssl.h> #include "extern.h" diff --git a/usr.sbin/rpki-client/output.c b/usr.sbin/rpki-client/output.c index af97b2be371..a3643d76140 100644 --- a/usr.sbin/rpki-client/output.c +++ b/usr.sbin/rpki-client/output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output.c,v 1.16 2020/05/14 20:49:04 job Exp $ */ +/* $OpenBSD: output.c,v 1.17 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Theo de Raadt <deraadt@openbsd.org> * @@ -27,8 +27,6 @@ #include <unistd.h> #include <time.h> -#include <openssl/x509v3.h> - #include "extern.h" char *outputdir; diff --git a/usr.sbin/rpki-client/roa.c b/usr.sbin/rpki-client/roa.c index 830ebead240..8d73bc9fb37 100644 --- a/usr.sbin/rpki-client/roa.c +++ b/usr.sbin/rpki-client/roa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: roa.c,v 1.8 2019/11/29 05:14:11 benno Exp $ */ +/* $OpenBSD: roa.c,v 1.9 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -23,8 +23,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> - #include "extern.h" /* diff --git a/usr.sbin/rpki-client/rsync.c b/usr.sbin/rpki-client/rsync.c index 73a60e0df61..7b85180b047 100644 --- a/usr.sbin/rpki-client/rsync.c +++ b/usr.sbin/rpki-client/rsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsync.c,v 1.8 2020/09/12 10:02:01 claudio Exp $ */ +/* $OpenBSD: rsync.c,v 1.9 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -29,8 +29,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> - #include "extern.h" /* diff --git a/usr.sbin/rpki-client/tal.c b/usr.sbin/rpki-client/tal.c index 53a95f9cb45..e9b7df4a692 100644 --- a/usr.sbin/rpki-client/tal.c +++ b/usr.sbin/rpki-client/tal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tal.c,v 1.18 2020/04/11 15:52:24 deraadt Exp $ */ +/* $OpenBSD: tal.c,v 1.19 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -25,8 +25,6 @@ #include <stdlib.h> #include <string.h> -#include <openssl/x509.h> - #include "extern.h" /* diff --git a/usr.sbin/rpki-client/validate.c b/usr.sbin/rpki-client/validate.c index 8b324bcb0cd..88a9c6bb827 100644 --- a/usr.sbin/rpki-client/validate.c +++ b/usr.sbin/rpki-client/validate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: validate.c,v 1.10 2019/11/29 05:16:54 benno Exp $ */ +/* $OpenBSD: validate.c,v 1.11 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -26,8 +26,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> - #include "extern.h" static void diff --git a/usr.sbin/rpki-client/x509.c b/usr.sbin/rpki-client/x509.c index ee93e919d1b..d14a4ac5550 100644 --- a/usr.sbin/rpki-client/x509.c +++ b/usr.sbin/rpki-client/x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.c,v 1.13 2019/11/29 05:00:24 benno Exp $ */ +/* $OpenBSD: x509.c,v 1.14 2020/09/12 15:46:48 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -25,7 +25,6 @@ #include <string.h> #include <unistd.h> -#include <openssl/ssl.h> #include <openssl/x509v3.h> #include "extern.h" |