diff options
author | Leah Neukirchen <leah@vuxu.org> | 2022-10-21 17:32:11 +0200 |
---|---|---|
committer | Leah Neukirchen <leah@vuxu.org> | 2022-10-21 17:32:11 +0200 |
commit | 17fe9a598f40a0007dd4e0c099ca16b2ebb0c602 (patch) | |
tree | 15129f5760b39e9d12c3426906c2ba041bff71e9 /src/usr.bin/signify/signify.c | |
parent | de119323e70076edb77781fbe4e96013cae5a934 (diff) | |
download | outils-17fe9a598f40a0007dd4e0c099ca16b2ebb0c602.tar.gz outils-17fe9a598f40a0007dd4e0c099ca16b2ebb0c602.tar.xz outils-17fe9a598f40a0007dd4e0c099ca16b2ebb0c602.zip |
cvs update
Diffstat (limited to 'src/usr.bin/signify/signify.c')
-rw-r--r-- | src/usr.bin/signify/signify.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/usr.bin/signify/signify.c b/src/usr.bin/signify/signify.c index 3a6d476..0178063 100644 --- a/src/usr.bin/signify/signify.c +++ b/src/usr.bin/signify/signify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signify.c,v 1.135 2020/01/21 12:13:21 tb Exp $ */ +/* $OpenBSD: signify.c,v 1.136 2022/08/26 00:24:56 kn Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -764,13 +764,14 @@ verifyzdata(uint8_t *zdata, unsigned long long zdatalen, int main(int argc, char **argv) { - const char *pubkeyfile = NULL, *seckeyfile = NULL, *msgfile = NULL, - *sigfile = NULL; + const char *pubkeyfile = NULL, *msgfile = NULL, *sigfile = NULL; char sigfilebuf[PATH_MAX]; - const char *comment = "signify"; char *keytype = NULL; - int ch; +#ifndef VERIFYONLY + const char *seckeyfile = NULL, *comment = "signify"; int none = 0; +#endif + int ch; int embedded = 0; int quiet = 0; int gzip = 0; @@ -803,6 +804,15 @@ main(int argc, char **argv) usage(NULL); verb = SIGN; break; + case 'c': + comment = optarg; + break; + case 'n': + none = 1; + break; + case 's': + seckeyfile = optarg; + break; case 'z': gzip = 1; break; @@ -812,27 +822,18 @@ main(int argc, char **argv) usage(NULL); verb = VERIFY; break; - case 'c': - comment = optarg; - break; case 'e': embedded = 1; break; case 'm': msgfile = optarg; break; - case 'n': - none = 1; - break; case 'p': pubkeyfile = optarg; break; case 'q': quiet = 1; break; - case 's': - seckeyfile = optarg; - break; case 't': keytype = optarg; break; |