diff options
| author |   djm <djm@openbsd.org> | 2020-04-03 05:48:57 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-04-03 05:48:57 +0000 |
| commit | 1c55d2a53ee4aec1b0291b8901ccfd55936a0d89 (patch) | |
| tree | 6b746e492e90954112e9894af8cdf31a3effaaa8 | |
| parent | Temporarily remove tests for '%C' since the hash contains the local (diff) | |
| download | wireguard-openbsd-1c55d2a53ee4aec1b0291b8901ccfd55936a0d89.tar.xz wireguard-openbsd-1c55d2a53ee4aec1b0291b8901ccfd55936a0d89.zip | |
avoid another compiler warning spotted in -portable
| -rw-r--r-- | usr.bin/ssh/krl.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/ssh/krl.c b/usr.bin/ssh/krl.c index 7402e6252c5..9a0f6981137 100644 --- a/usr.bin/ssh/krl.c +++ b/usr.bin/ssh/krl.c @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: krl.c,v 1.49 2020/04/03 04:43:24 djm Exp $ */ +/* $OpenBSD: krl.c,v 1.50 2020/04/03 05:48:57 djm Exp $ */ #include <sys/types.h> #include <sys/tree.h> @@ -1368,7 +1368,8 @@ krl_dump(struct ssh_krl *krl, FILE *f) /* Try to print in a KRL spec-compatible format */ format_timestamp(krl->generated_date, timestamp, sizeof(timestamp)); - fprintf(f, "# KRL version %llu\n", krl->krl_version); + fprintf(f, "# KRL version %llu\n", + (unsigned long long)krl->krl_version); fprintf(f, "# Generated at %s\n", timestamp); if (krl->comment != NULL && *krl->comment != '\0') { r = INT_MAX; @@ -1425,11 +1426,13 @@ krl_dump(struct ssh_krl *krl, FILE *f) free(fp); } RB_FOREACH(rs, revoked_serial_tree, &rc->revoked_serials) { - if (rs->lo == rs->hi) - fprintf(f, "serial: %llu\n", rs->lo); - else { + if (rs->lo == rs->hi) { + fprintf(f, "serial: %llu\n", + (unsigned long long)rs->lo); + } else { fprintf(f, "serial: %llu-%llu\n", - rs->lo, rs->hi); + (unsigned long long)rs->lo, + (unsigned long long)rs->hi); } } RB_FOREACH(rki, revoked_key_id_tree, &rc->revoked_key_ids) { |