diff options
| author | Christian Neukirchen <chneukirchen@gmail.com> | 2016-01-22 18:43:14 +0100 |
|---|---|---|
| committer | Christian Neukirchen <chneukirchen@gmail.com> | 2016-01-22 18:43:14 +0100 |
| commit | 372fdabc1fcb5eda5a90a05da3d9f9b3b5857ba5 (patch) | |
| tree | 6bb3109b362610f3024cff3e42a946d154737f20 /src/usr.bin/signify | |
| parent | 193f150ac3a87fad164b3911bb69280b0728f6f1 (diff) | |
| download | outils-372fdabc1fcb5eda5a90a05da3d9f9b3b5857ba5.tar.gz outils-372fdabc1fcb5eda5a90a05da3d9f9b3b5857ba5.tar.xz outils-372fdabc1fcb5eda5a90a05da3d9f9b3b5857ba5.zip | |
cvs update
Diffstat (limited to 'src/usr.bin/signify')
| -rw-r--r-- | src/usr.bin/signify/signify.1 | 8 | ||||
| -rw-r--r-- | src/usr.bin/signify/signify.c | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/usr.bin/signify/signify.1 b/src/usr.bin/signify/signify.1 index 12fd9be..dbf2ea5 100644 --- a/src/usr.bin/signify/signify.1 +++ b/src/usr.bin/signify/signify.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signify.1,v 1.31 2015/07/14 23:30:02 florian Exp $ +.\" $OpenBSD: signify.1,v 1.33 2016/01/06 23:14:05 benno Exp $ .\" .\"Copyright (c) 2013 Marc Espie <espie@openbsd.org> .\"Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> @@ -14,7 +14,7 @@ .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: July 14 2015 $ +.Dd $Mdocdate: January 6 2016 $ .Dt SIGNIFY 1 .Os .Sh NAME @@ -148,12 +148,12 @@ Verify a release directory containing .Pa SHA256.sig and a full set of release files: .Bd -literal -offset indent -compact -$ signify -C -p /etc/signify/openbsd-58-base.pub -x SHA256.sig +$ signify -C -p /etc/signify/openbsd-60-base.pub -x SHA256.sig .Ed .Pp Verify a bsd.rd before an upgrade: .Bd -literal -offset indent -compact -$ signify -C -p /etc/signify/openbsd-58-base.pub -x SHA256.sig bsd.rd +$ signify -C -p /etc/signify/openbsd-60-base.pub -x SHA256.sig bsd.rd .Ed .Sh SEE ALSO .Xr fw_update 1 , diff --git a/src/usr.bin/signify/signify.c b/src/usr.bin/signify/signify.c index 3bc4c6c..a4cb84a 100644 --- a/src/usr.bin/signify/signify.c +++ b/src/usr.bin/signify/signify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signify.c,v 1.104 2015/11/02 22:01:10 bluhm Exp $ */ +/* $OpenBSD: signify.c,v 1.105 2015/12/04 11:05:22 tedu Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -367,7 +367,7 @@ sign(const char *seckeyfile, const char *msgfile, const char *sigfile, SHA512Update(&ctx, enckey.seckey, sizeof(enckey.seckey)); SHA512Final(digest, &ctx); if (memcmp(enckey.checksum, digest, sizeof(enckey.checksum)) != 0) - errx(1, "incorrect passphrase"); + errx(1, "incorrect passphrase"); explicit_bzero(digest, sizeof(digest)); msg = readmsg(msgfile, &msglen); @@ -559,9 +559,8 @@ verifychecksum(struct checksum *c, int quiet) } else { errx(1, "can't handle algorithm %s", c->algo); } - if (strcmp(c->hash, buf) != 0) { + if (strcmp(c->hash, buf) != 0) return 0; - } if (!quiet) printf("%s: OK\n", c->file); return 1; |