diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-10-05 14:48:59 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-10-05 14:48:59 +0000 |
| commit | 21c6d333369608e06896eace6a8845268dc1c055 (patch) | |
| tree | 8dba769b0a001b36fc8b33dddd50b4f38d011267 | |
| parent | cc03147f0f995862f2fcd8043493f0b48b843b0a (diff) | |
combining an assignment and *two* tests in one conditional is a bit much.
pull things apart.
reported by espie in a separate complaint. :)
| -rw-r--r-- | usr.bin/signify/signify.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/usr.bin/signify/signify.c b/usr.bin/signify/signify.c index ca9aa0b3e90..ca232af7501 100644 --- a/usr.bin/signify/signify.c +++ b/usr.bin/signify/signify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signify.c,v 1.122 2016/09/27 02:13:27 tedu Exp $ */ +/* $OpenBSD: signify.c,v 1.123 2016/10/05 14:48:58 tedu Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -327,8 +327,8 @@ generate(const char *pubkeyfile, const char *seckeyfile, int rounds, explicit_bzero(digest, sizeof(digest)); explicit_bzero(xorkey, sizeof(xorkey)); - if ((nr = snprintf(commentbuf, sizeof(commentbuf), "%s secret key", - comment)) == -1 || nr >= sizeof(commentbuf)) + nr = snprintf(commentbuf, sizeof(commentbuf), "%s secret key", comment); + if (nr == -1 || nr >= sizeof(commentbuf)) errx(1, "comment too long"); writekeyfile(seckeyfile, commentbuf, &enckey, sizeof(enckey), O_EXCL, 0600); @@ -336,8 +336,8 @@ generate(const char *pubkeyfile, const char *seckeyfile, int rounds, memcpy(pubkey.pkalg, PKALG, 2); memcpy(pubkey.keynum, keynum, KEYNUMLEN); - if ((nr = snprintf(commentbuf, sizeof(commentbuf), "%s public key", - comment)) == -1 || nr >= sizeof(commentbuf)) + nr = snprintf(commentbuf, sizeof(commentbuf), "%s public key", comment); + if (nr == -1 || nr >= sizeof(commentbuf)) errx(1, "comment too long"); writekeyfile(pubkeyfile, commentbuf, &pubkey, sizeof(pubkey), O_EXCL, 0666); @@ -367,12 +367,14 @@ createsig(const char *seckeyfile, const char *msgfile, uint8_t *msg, keyname = seckeyfile; else keyname++; - if ((nr = snprintf(sigcomment, sizeof(sigcomment), VERIFYWITH "%.*s.pub", - (int)strlen(keyname) - 4, keyname)) == -1 || nr >= sizeof(sigcomment)) + nr = snprintf(sigcomment, sizeof(sigcomment), + VERIFYWITH "%.*s.pub", (int)strlen(keyname) - 4, keyname); + if (nr == -1 || nr >= sizeof(sigcomment)) errx(1, "comment too long"); } else { - if ((nr = snprintf(sigcomment, sizeof(sigcomment), "signature from %s", - comment)) == -1 || nr >= sizeof(sigcomment)) + nr = snprintf(sigcomment, sizeof(sigcomment), + "signature from %s", comment); + if (nr == -1 || nr >= sizeof(sigcomment)) errx(1, "comment too long"); } @@ -827,8 +829,9 @@ main(int argc, char **argv) int nr; if (strcmp(msgfile, "-") == 0) usage("must specify sigfile with - message"); - if ((nr = snprintf(sigfilebuf, sizeof(sigfilebuf), "%s.sig", - msgfile)) == -1 || nr >= sizeof(sigfilebuf)) + nr = snprintf(sigfilebuf, sizeof(sigfilebuf), + "%s.sig", msgfile); + if (nr == -1 || nr >= sizeof(sigfilebuf)) errx(1, "path too long"); sigfile = sigfilebuf; } |