whitespace spotted during read-thru

diff --git a/usr.sbin/rpki-client/cert.c b/usr.sbin/rpki-client/cert.c
index 00529fa..1db1e5e 100644 (file)
--- a/usr.sbin/rpki-client/cert.c
+++ b/usr.sbin/rpki-client/cert.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cert.c,v 1.81 2022/05/12 10:49:22 tb Exp $ */
+/*     $OpenBSD: cert.c,v 1.82 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2021 Job Snijders <job@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -678,12 +678,12 @@ cert_parse_pre(const char *fn, const unsigned char *der, size_t len)
                }
                if (p.res->ipsz > 0) {
                        warnx("%s: unexpected IP resources in BGPsec cert",
-                          p.fn);
+                           p.fn);
                        goto out;
                }
                if (sia_present) {
                        warnx("%s: unexpected SIA extension in BGPsec cert",
-                          p.fn);
+                           p.fn);
                        goto out;
                }
                break;
@@ -776,7 +776,7 @@ ta_parse(const char *fn, struct cert *p, const unsigned char *pkey,
                warnx("%s: certificate not yet valid", fn);
                goto badcert;
        }
-       if (X509_cmp_current_time(notAfter) != 1)  {
+       if (X509_cmp_current_time(notAfter) != 1) {
                warnx("%s: certificate has expired", fn);
                goto badcert;
        }

diff --git a/usr.sbin/rpki-client/cms.c b/usr.sbin/rpki-client/cms.c
index cd1d6c4..52ace28 100644 (file)
--- a/usr.sbin/rpki-client/cms.c
+++ b/usr.sbin/rpki-client/cms.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cms.c,v 1.17 2022/05/11 16:13:05 tb Exp $ */
+/*     $OpenBSD: cms.c,v 1.18 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -27,10 +27,10 @@
 
 #include "extern.h"
 
-extern ASN1_OBJECT     *cnt_type_oid;
-extern ASN1_OBJECT     *msg_dgst_oid;
-extern ASN1_OBJECT     *sign_time_oid;
-extern ASN1_OBJECT     *bin_sign_time_oid;
+extern ASN1_OBJECT     *cnt_type_oid;
+extern ASN1_OBJECT     *msg_dgst_oid;
+extern ASN1_OBJECT     *sign_time_oid;
+extern ASN1_OBJECT     *bin_sign_time_oid;
 
 /*
  * Parse and validate a self-signed CMS message, where the signing X509

diff --git a/usr.sbin/rpki-client/encoding.c b/usr.sbin/rpki-client/encoding.c
index 023dd68..7c79d98 100644 (file)
--- a/usr.sbin/rpki-client/encoding.c
+++ b/usr.sbin/rpki-client/encoding.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: encoding.c,v 1.12 2022/04/20 15:31:48 tb Exp $  */
+/*     $OpenBSD: encoding.c,v 1.13 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
  *

diff --git a/usr.sbin/rpki-client/http.c b/usr.sbin/rpki-client/http.c
index 7d0afe7..ffdf5d5 100644 (file)
--- a/usr.sbin/rpki-client/http.c
+++ b/usr.sbin/rpki-client/http.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: http.c,v 1.58 2022/05/04 10:17:16 claudio Exp $  */
+/*     $OpenBSD: http.c,v 1.59 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
  * Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>

diff --git a/usr.sbin/rpki-client/ip.c b/usr.sbin/rpki-client/ip.c
index 4bb94e2..b4a813b 100644 (file)
--- a/usr.sbin/rpki-client/ip.c
+++ b/usr.sbin/rpki-client/ip.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip.c,v 1.23 2022/05/13 06:18:21 tb Exp $ */
+/*     $OpenBSD: ip.c,v 1.24 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -27,7 +27,7 @@
 
 #include "extern.h"
 
-#define   PREFIX_SIZE(x)  (((x) + 7) / 8)
+#define        PREFIX_SIZE(x)  (((x) + 7) / 8)
 
 /*
  * Parse an IP address family.

diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c
index 2789ca0..eb8e469 100644 (file)
--- a/usr.sbin/rpki-client/mft.c
+++ b/usr.sbin/rpki-client/mft.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mft.c,v 1.64 2022/05/11 21:19:06 job Exp $ */
+/*     $OpenBSD: mft.c,v 1.65 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -41,7 +41,7 @@ struct        parse {
        int              found_crl;
 };
 
-extern ASN1_OBJECT    *mft_oid;
+extern ASN1_OBJECT     *mft_oid;
 
 /*
  * Convert an ASN1_GENERALIZEDTIME to a struct tm.

diff --git a/usr.sbin/rpki-client/print.c b/usr.sbin/rpki-client/print.c
index 2db36b2..ca0ce5d 100644 (file)
--- a/usr.sbin/rpki-client/print.c
+++ b/usr.sbin/rpki-client/print.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: print.c,v 1.11 2022/05/09 17:02:34 job Exp $ */
+/*     $OpenBSD: print.c,v 1.12 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -36,7 +36,7 @@ pretty_key_id(const char *hex)
        size_t i;
 
        for (i = 0; i < sizeof(buf) && *hex != '\0'; i++) {
-               if  (i % 3 == 2)
+               if (i % 3 == 2)
                        buf[i] = ':';
                else
                        buf[i] = *hex++;

diff --git a/usr.sbin/rpki-client/rrdp_notification.c b/usr.sbin/rpki-client/rrdp_notification.c
index d2a3d26..84bc953 100644 (file)
--- a/usr.sbin/rpki-client/rrdp_notification.c
+++ b/usr.sbin/rpki-client/rrdp_notification.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rrdp_notification.c,v 1.14 2022/02/14 14:46:16 job Exp $ */
+/*     $OpenBSD: rrdp_notification.c,v 1.15 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
@@ -431,7 +431,7 @@ notification_get_next(struct notification_xml *nxml, char *hash, size_t hlen,
                nxml->current->serial = nxml->serial;
                return nxml->snapshot_uri;
        case DELTA:
-               /* first bump serial, then use first delta  */
+               /* first bump serial, then use first delta */
                nxml->current->serial += 1;
                d = TAILQ_FIRST(&nxml->delta_q);
                assert(d->serial == nxml->current->serial);

diff --git a/usr.sbin/rpki-client/rsc.c b/usr.sbin/rpki-client/rsc.c
index 48b2b7a..9561547 100644 (file)
--- a/usr.sbin/rpki-client/rsc.c
+++ b/usr.sbin/rpki-client/rsc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rsc.c,v 1.2 2022/05/10 07:41:37 tb Exp $ */
+/*     $OpenBSD: rsc.c,v 1.3 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2022 Job Snijders <job@fastly.com>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -381,12 +381,12 @@ rsc_parse_aslist(struct parse *p, const unsigned char *d, size_t dsz)
 static int
 rsc_parse_ipaddrfamitem(struct parse *p, const ASN1_OCTET_STRING *os)
 {
-       ASN1_OCTET_STRING       *aos = NULL;
+       ASN1_OCTET_STRING       *aos = NULL;
        IPAddressOrRange        *aor = NULL;
        int                      tag;
-       const unsigned char     *cnt = os->data;
+       const unsigned char     *cnt = os->data;
        long                     cntsz;
-       const unsigned char     *d;
+       const unsigned char     *d;
        struct cert_ip           ip;
        int                      rc = 0;
 

diff --git a/usr.sbin/rpki-client/validate.c b/usr.sbin/rpki-client/validate.c
index 5b71609..8070a77 100644 (file)
--- a/usr.sbin/rpki-client/validate.c
+++ b/usr.sbin/rpki-client/validate.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: validate.c,v 1.35 2022/05/12 10:53:59 tb Exp $ */
+/*     $OpenBSD: validate.c,v 1.36 2022/05/15 15:00:53 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -493,17 +493,17 @@ valid_rsc(const char *fn, struct auth *a, struct rsc *rsc)
                switch (rsc->ips[i].type) {
                case CERT_IP_RANGE:
                        ip_addr_print(&rsc->ips[i].range.min,
-                          rsc->ips[i].afi, buf1, sizeof(buf1));
+                           rsc->ips[i].afi, buf1, sizeof(buf1));
                        ip_addr_print(&rsc->ips[i].range.max,
-                          rsc->ips[i].afi, buf2, sizeof(buf2));
+                           rsc->ips[i].afi, buf2, sizeof(buf2));
                        warnx("%s: RSC ResourceBlock: uncovered IP Range: "
-                          "%s--%s", fn, buf1, buf2);
+                           "%s--%s", fn, buf1, buf2);
                        break;
                case CERT_IP_ADDR:
                        ip_addr_print(&rsc->ips[i].ip,
-                          rsc->ips[i].afi, buf1, sizeof(buf1));
+                           rsc->ips[i].afi, buf1, sizeof(buf1));
                        warnx("%s: RSC ResourceBlock: uncovered IP: "
-                          "%s", fn, buf1);
+                           "%s", fn, buf1);
                        break;
                default:
                        break;