diff options
| author | Christian Neukirchen <chneukirchen@gmail.com> | 2016-09-15 15:39:35 +0200 |
|---|---|---|
| committer | Christian Neukirchen <chneukirchen@gmail.com> | 2016-09-15 15:39:35 +0200 |
| commit | 4b8f49b998ee2f1420d45669bc3a4a515482cc9f (patch) | |
| tree | 374e08696eefa6a0e536fc8e649627fe7100cf61 /src/usr.bin/signify | |
| parent | 947c1f5ffaef0e77137486442be480874ff1fb1c (diff) | |
| download | outils-4b8f49b998ee2f1420d45669bc3a4a515482cc9f.tar.gz outils-4b8f49b998ee2f1420d45669bc3a4a515482cc9f.tar.xz outils-4b8f49b998ee2f1420d45669bc3a4a515482cc9f.zip | |
cvs update
Diffstat (limited to 'src/usr.bin/signify')
| -rw-r--r-- | src/usr.bin/signify/signify.c | 12 | ||||
| -rw-r--r-- | src/usr.bin/signify/zsig.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/usr.bin/signify/signify.c b/src/usr.bin/signify/signify.c index dd9a0dc..268a403 100644 --- a/src/usr.bin/signify/signify.c +++ b/src/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> * @@ -452,7 +452,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) @@ -562,7 +562,7 @@ struct checksum { char algo[32]; }; -static void * +static void * ecalloc(size_t s1, size_t s2, void *data) { void *p; @@ -693,7 +693,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; @@ -703,7 +703,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; @@ -866,7 +866,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/src/usr.bin/signify/zsig.c b/src/usr.bin/signify/zsig.c index 4abe30a..d721d8a 100644 --- a/src/usr.bin/signify/zsig.c +++ b/src/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" |