diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-09-10 12:23:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-09-10 12:23:17 +0000 |
| commit | f9b155820957a6aeffd006a8f543e2e8b1c30b81 (patch) | |
| tree | 07b1a28f391bdc3fee32365c7db034ccd3310822 | |
| parent | a52cf33dc0691a2e6f52252bc4788f592676a93f (diff) | |
spaces found during re-read
| -rw-r--r-- | usr.bin/signify/signify.c | 12 | ||||
| -rw-r--r-- | usr.bin/signify/zsig.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/signify/signify.c b/usr.bin/signify/signify.c index f1eb504c7d5..ef58078a92d 100644 --- a/usr.bin/signify/signify.c +++ b/usr.bin/signify/signify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signify.c,v 1.117 2016/09/03 12:21:38 espie Exp $ */ +/* $OpenBSD: signify.c,v 1.118 2016/09/10 12:23:16 deraadt Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -450,7 +450,7 @@ check_keytype(const char *pubkeyfile, const char *keytype) size_t len; char *cmp; int slen; - + len = strlen(pubkeyfile); slen = asprintf(&cmp, "-%s.pub", keytype); if (slen < 0) @@ -560,7 +560,7 @@ struct checksum { char algo[32]; }; -static void * +static void * ecalloc(size_t s1, size_t s2, void *data) { void *p; @@ -691,7 +691,7 @@ check(const char *pubkeyfile, const char *sigfile, int quiet, int argc, } void * -verifyzdata(uint8_t *zdata, unsigned long long zdatalen, +verifyzdata(uint8_t *zdata, unsigned long long zdatalen, const char *filename, const char *pubkeyfile, const char *keytype) { struct sig sig; @@ -701,7 +701,7 @@ verifyzdata(uint8_t *zdata, unsigned long long zdatalen, if (zdatalen < sizeof(sig)) errx(1, "signature too short in %s", filename); - siglen = parseb64file(filename, zdata, &sig, sizeof(sig), + siglen = parseb64file(filename, zdata, &sig, sizeof(sig), sigcomment); readpubkey(pubkeyfile, &pubkey, sigcomment, keytype); zdata += siglen; @@ -864,7 +864,7 @@ main(int argc, char **argv) } else { if (!msgfile) usage("must specify message"); - verify(pubkeyfile, msgfile, sigfile, embedded, + verify(pubkeyfile, msgfile, sigfile, embedded, quiet, keytype); } break; diff --git a/usr.bin/signify/zsig.c b/usr.bin/signify/zsig.c index 4abe30a11f6..d721d8a0597 100644 --- a/usr.bin/signify/zsig.c +++ b/usr.bin/signify/zsig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zsig.c,v 1.11 2016/09/08 16:04:01 espie Exp $ */ +/* $OpenBSD: zsig.c,v 1.12 2016/09/10 12:23:16 deraadt Exp $ */ /* * Copyright (c) 2016 Marc Espie <espie@openbsd.org> * @@ -266,7 +266,7 @@ zsign(const char *seckeyfile, const char *msgfile, const char *sigfile) buffer = xmalloc(bufsize); time(&clock); strftime(date, sizeof date, "%Y-%m-%dT%H:%M:%SZ", gmtime(&clock)); - snprintf(msg, space, + snprintf(msg, space, "date=%s\n" "key=%s\n" "algorithm=SHA512/256\n" |