diff options
| author | Leah Neukirchen <leah@vuxu.org> | 2020-04-13 20:57:39 +0200 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2020-04-13 20:57:39 +0200 |
| commit | 6769ad22d2d6c1fd2c996eb98f788148fdf7fbc8 (patch) | |
| tree | 81b3d941fbac74be98617efb5fd0ad99de341925 /src/usr.bin/signify/signify.c | |
| parent | e52db9dae7275c0325cd203fa7039a4a33bf5a7e (diff) | |
| download | outils-6769ad22d2d6c1fd2c996eb98f788148fdf7fbc8.tar.gz outils-6769ad22d2d6c1fd2c996eb98f788148fdf7fbc8.tar.xz outils-6769ad22d2d6c1fd2c996eb98f788148fdf7fbc8.zip | |
cvs update
Diffstat (limited to 'src/usr.bin/signify/signify.c')
| -rw-r--r-- | src/usr.bin/signify/signify.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/usr.bin/signify/signify.c b/src/usr.bin/signify/signify.c index 5c577e8..3a6d476 100644 --- a/src/usr.bin/signify/signify.c +++ b/src/usr.bin/signify/signify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signify.c,v 1.134 2019/12/22 06:37:25 espie Exp $ */ +/* $OpenBSD: signify.c,v 1.135 2020/01/21 12:13:21 tb Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -80,7 +80,7 @@ usage(const char *error) fprintf(stderr, "%s\n", error); fprintf(stderr, "usage:" #ifndef VERIFYONLY - "\t%1$s -C [-q] -p pubkey -x sigfile [file ...]\n" + "\t%1$s -C [-q] [-p pubkey] [-t keytype] -x sigfile [file ...]\n" "\t%1$s -G [-n] [-c comment] -p pubkey -s seckey\n" "\t%1$s -S [-enz] [-x sigfile] -s seckey -m message\n" #endif @@ -728,13 +728,13 @@ verifychecksums(char *msg, int argc, char **argv, int quiet) } static void -check(const char *pubkeyfile, const char *sigfile, int quiet, int argc, - char **argv) +check(const char *pubkeyfile, const char *sigfile, const char *keytype, + int quiet, int argc, char **argv) { unsigned long long msglen; uint8_t *msg; - msg = verifyembedded(pubkeyfile, sigfile, quiet, &msglen, NULL); + msg = verifyembedded(pubkeyfile, sigfile, quiet, &msglen, keytype); verifychecksums((char *)msg, argc, argv, quiet); free(msg); @@ -859,7 +859,7 @@ main(int argc, char **argv) err(1, "pledge"); if (!sigfile) usage("must specify sigfile"); - check(pubkeyfile, sigfile, quiet, argc, argv); + check(pubkeyfile, sigfile, keytype, quiet, argc, argv); return 0; } #endif |