/* -*-c-*-
*
- * $Id: dsig.c,v 1.8 2004/04/04 19:42:59 mdw Exp $
+ * $Id$
*
* Verify signatures on distribuitions of files
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: dsig.c,v $
- * Revision 1.8 2004/04/04 19:42:59 mdw
- * Add set -e.
- *
- * Revision 1.7 2001/02/23 09:04:17 mdw
- * Add new hash functions. Provide full help for subcommands. Run the
- * hash function over parts of the header in a canonical order.
- *
- * Revision 1.6 2000/12/06 20:33:27 mdw
- * Make flags be macros rather than enumerations, to ensure that they're
- * unsigned.
- *
- * Revision 1.5 2000/10/08 12:12:09 mdw
- * Shut up some warnings.
- *
- * Revision 1.4 2000/08/04 23:23:44 mdw
- * Various <ctype.h> fixes.
- *
- * Revision 1.3 2000/07/15 20:53:23 mdw
- * More hash functions. Bug fix in getstring.
- *
- * Revision 1.2 2000/07/01 11:27:22 mdw
- * Use new PKCS#1 padding functions rather than rolling by hand.
- *
- * Revision 1.1 2000/06/17 10:54:29 mdw
- * Program to generate and verify signatures on multiple files.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include "config.h"
#include <mLib/sub.h>
#include "getdate.h"
-#include "grand.h"
+#include "rand.h"
#include "ghash.h"
#include "key.h"
#include "key-data.h"
#include "noise.h"
-
-#include "dsa.h"
-#include "rsa.h"
-#include "pkcs1.h"
-
-/*----- Digital signature algorithm ---------------------------------------*/
-
-static int dsasign(key *k, const void *m, size_t msz, dstr *d)
-{
- dsa_priv dp;
- key_packstruct ks[DSA_PRIVFETCHSZ];
- key_packdef *kp;
- size_t sz;
- octet *p;
- int e;
-
- kp = key_fetchinit(dsa_privfetch, ks, &dp);
- if ((e = key_fetch(kp, k)) != 0) {
- key_fetchdone(kp);
- return (e);
- }
- sz = mp_octets(dp.dp.q);
- if (sz < msz)
- die(EXIT_FAILURE, "hash function too wide for this signing key");
- DENSURE(d, sz * 2);
- p = (octet *)d->buf + d->len;
- rand_get(RAND_GLOBAL, p, sz);
- dsa_sign(&dp.dp, dp.x, m, msz, p, sz, p, sz, p + sz, sz);
- d->len += sz * 2;
- key_fetchdone(kp);
- return (0);
-}
-
-static int dsaverify(key *k, const void *m, size_t msz,
- const void *s, size_t ssz)
-{
- dsa_pub dp;
- key_packstruct ks[DSA_PUBFETCHSZ];
- key_packdef *kp;
- size_t sz;
- const octet *p = s;
- int e;
-
- kp = key_fetchinit(dsa_pubfetch, ks, &dp);
- if ((e = key_fetch(kp, k)) != 0) {
- key_fetchdone(kp);
- return (e);
- }
- sz = ssz / 2;
- e = dsa_verify(&dp.dp, dp.y, m, msz, p, sz, p + sz, sz);
- key_fetchdone(kp);
- return (e);
-}
-
-/*----- RSA signing -------------------------------------------------------*/
-
-static int rsasign(key *k, const void *m, size_t msz, dstr *d)
-{
- rsa_priv rp;
- rsa_privctx rpc;
- pkcs1 pk = { 0, 0, 0 };
- key_packstruct ks[RSA_PRIVFETCHSZ];
- key_packdef *kp;
- int e;
-
- kp = key_fetchinit(rsa_privfetch, ks, &rp);
- if ((e = key_fetch(kp, k)) != 0) {
- key_fetchdone(kp);
- return (e);
- }
- rsa_privcreate(&rpc, &rp, &rand_global);
- if (rsa_sign(&rpc, m, msz, d, pkcs1_sigencode, &pk) < 0)
- die(EXIT_FAILURE, "internal error in rsasign (key too small?)");
- rsa_privdestroy(&rpc);
- key_fetchdone(kp);
- return (0);
-}
-
-static int rsaverify(key *k, const void *m, size_t msz,
- const void *s, size_t ssz)
-{
- rsa_pub rp;
- rsa_pubctx rpc;
- pkcs1 pk = { 0, 0, 0 };
- key_packstruct ks[RSA_PUBFETCHSZ];
- key_packdef *kp;
- int ok = 0;
- dstr d = DSTR_INIT;
- int e;
-
- kp = key_fetchinit(rsa_pubfetch, ks, &rp);
- if ((e = key_fetch(kp, k)) != 0) {
- key_fetchdone(kp);
- return (e);
- }
- rsa_pubcreate(&rpc, &rp);
- if (rsa_verify(&rpc, s, ssz, &d, pkcs1_sigdecode, &pk) > 0 &&
- msz == d.len && memcmp(d.buf, m, msz) == 0)
- ok = 1;
- dstr_destroy(&d);
- rsa_pubdestroy(&rpc);
- key_fetchdone(kp);
- return (ok);
-}
-
-/*----- Algorithm choice --------------------------------------------------*/
-
-typedef struct sig {
- const char *name;
- const char *type;
- int (*sign)(key */*k*/, const void */*m*/, size_t /*msz*/, dstr */*d*/);
- int (*verify)(key */*k*/, const void */*m*/, size_t /*msz*/,
- const void */*s*/, size_t /*ssz*/);
-} sig;
-
-static sig sigtab[] = {
- { "dsa", "dsig-dsa", dsasign, dsaverify },
- { "rsa", "dsig-rsa", rsasign, rsaverify },
- { 0, 0, 0 }
-};
-
-/* --- @gethash@ --- *
- *
- * Arguments: @const char *name@ = pointer to name string
- *
- * Returns: Pointer to appropriate hash class.
- *
- * Use: Chooses a hash function by name.
- */
-
-static const gchash *gethash(const char *name)
-{
- const gchash *const *g, *gg = 0;
- size_t sz = strlen(name);
- for (g = ghashtab; *g; g++) {
- if (strncmp(name, (*g)->name, sz) == 0) {
- if ((*g)->name[sz] == 0) {
- gg = *g;
- break;
- } else if (gg)
- return (0);
- else
- gg = *g;
- }
- }
- return (gg);
-}
-
-/* --- @getsig@ --- *
- *
- * Arguments: @const char *name@ = pointer to name string
- *
- * Returns: Pointer to appropriate signature type.
- *
- * Use: Chooses a signature algorithm by name.
- */
-
-static sig *getsig(const char *name)
-{
- sig *s, *ss = 0;
- size_t sz = strlen(name);
- for (s = sigtab; s->name; s++) {
- if (strncmp(name, s->name, sz) == 0) {
- if (s->name[sz] == 0) {
- ss = s;
- break;
- } else if (ss)
- return (0);
- else
- ss = s;
- }
- }
- return (ss);
-}
+#include "cc.h"
/*----- Data formatting ---------------------------------------------------*/
/* --- Block tags --- */
T_IDENT = 0, /* An identifying marker */
- T_SIGALG, /* Signature algorithm used */
- T_HASHALG, /* Hash algorithm used */
T_KEYID, /* Key identifier */
T_BEGIN, /* Begin hashing here */
T_COMMENT = T_BEGIN, /* A textual comment */
/* --- Name translation table --- */
static const char *tagtab[] = {
- "ident:", "sigalg:", "hashalg:", "keyid:",
+ "ident:", "keyid:",
"comment:", "date:", "expires:", "file:",
"signature:",
0
case T_IDENT:
case T_COMMENT:
- case T_SIGALG:
- case T_HASHALG:
if (getstring(fp, &b->d, bin))
return (E_EOF);
break;
DPUTC(d, b->tag);
switch (b->tag) {
case T_IDENT:
- case T_SIGALG:
- case T_HASHALG:
case T_COMMENT:
DPUTD(d, &b->d);
DPUTC(d, 0);
case T_DATE:
case T_EXPIRE:
DENSURE(d, 8);
- STORE32(d->buf + d->len, ((b->t & ~MASK32) >> 16) >> 16);
- STORE32(d->buf + d->len + 4, b->t);
+ if (b->t == KEXP_FOREVER) {
+ STORE32(d->buf + d->len, 0xffffffff);
+ STORE32(d->buf + d->len + 4, 0xffffffff);
+ } else {
+ STORE32(d->buf + d->len, ((b->t & ~MASK32) >> 16) >> 16);
+ STORE32(d->buf + d->len + 4, b->t);
+ }
d->len += 8;
break;
case T_KEYID:
putc(' ', fp);
switch (b->tag) {
case T_IDENT:
- case T_SIGALG:
- case T_HASHALG:
case T_COMMENT:
putstring(fp, b->d.buf, 0);
break;
dstr d = DSTR_INIT;
blob(b, &d);
if (h)
- h->ops->hash(h, d.buf, d.len);
+ GH_HASH(h, d.buf, d.len);
if (fp && bin)
fwrite(d.buf, d.len, 1, fp);
}
static int fhash(const gchash *c, const char *file, void *b)
{
FILE *fp = fopen(file, "rb");
- ghash *h = c->init();
+ ghash *h = GH_INIT(c);
char buf[4096];
size_t sz;
int rc = 0;
if (!fp)
return (-1);
while ((sz = fread(buf, 1, sizeof(buf), fp)) > 0)
- h->ops->hash(h, buf, sz);
+ GH_HASH(h, buf, sz);
if (ferror(fp))
rc = -1;
- h->ops->done(h, b);
- h->ops->destroy(h);
+ GH_DONE(h, b);
+ GH_DESTROY(h);
fclose(fp);
return (rc);
}
sz--;
if (!sz)
break;
-/* putc(' ', fp); */
}
}
#define f_bogus 4u
unsigned f = 0;
- const char *kt = 0;
- const char *ki = 0;
+ const char *ki = "dsig";
key_file kf;
key *k;
- const sig *s = sigtab;
- const gchash *gch = &rmd160;
- ghash *h;
+ sig *s;
time_t exp = KEXP_EXPIRE;
unsigned verb = 0;
const char *ifile = 0;
const char *ofile = 0;
const char *c = 0;
+ const char *err;
FILE *ifp, *ofp;
dstr d = DSTR_INIT;
block b;
{ "binary", 0, 0, 'b' },
{ "verbose", 0, 0, 'v' },
{ "quiet", 0, 0, 'q' },
- { "algorithm", OPTF_ARGREQ, 0, 'a' },
- { "hash", OPTF_ARGREQ, 0, 'h' },
{ "comment", OPTF_ARGREQ, 0, 'c' },
{ "file", OPTF_ARGREQ, 0, 'f' },
{ "output", OPTF_ARGREQ, 0, 'o' },
- { "keytype", OPTF_ARGREQ, 0, 't' },
- { "keyid", OPTF_ARGREQ, 0, 'i' },
- { "key", OPTF_ARGREQ, 0, 'i' },
+ { "key", OPTF_ARGREQ, 0, 'k' },
{ "expire", OPTF_ARGREQ, 0, 'e' },
{ 0, 0, 0, 0 }
};
- int i = mdwopt(argc, argv, "+0vqb a:h:c: f:o: t:i:k:e:", opts, 0, 0, 0);
+ int i = mdwopt(argc, argv, "+0vqb" "c:" "f:o:" "k:e:", opts, 0, 0, 0);
if (i < 0)
break;
switch (i) {
if (verb > 0)
verb--;
break;
- case 'a':
- if ((s = getsig(optarg)) == 0) {
- die(EXIT_FAILURE, "unknown or ambiguous signature algorithm `%s'",
- optarg);
- }
- break;
- case 'h':
- if ((gch = gethash(optarg)) == 0) {
- die(EXIT_FAILURE, "unknown or ambiguous hash function `%s'",
- optarg);
- }
- break;
case 'c':
c = optarg;
break;
case 'o':
ofile = optarg;
break;
- case 't':
- kt = optarg;
- break;
- case 'i':
case 'k':
ki = optarg;
break;
}
}
if (optind != argc || (f & f_bogus))
- die(EXIT_FAILURE, "Usage: sign [-options]");
+ die(EXIT_FAILURE, "Usage: sign [-OPTIONS]");
/* --- Locate the signing key --- */
if (key_open(&kf, keyring, KOPEN_WRITE, keyreport, 0))
die(EXIT_FAILURE, "couldn't open keyring `%s'", keyring);
- if (ki) {
- if ((k = key_bytag(&kf, ki)) == 0)
- die(EXIT_FAILURE, "couldn't find key `%s'", ki);
- } else {
- if (!kt)
- kt = s->type;
- if ((k = key_bytype(&kf, kt)) == 0)
- die(EXIT_FAILURE, "no appropriate key of type `%s'", kt);
- }
+ if ((k = key_bytag(&kf, ki)) == 0)
+ die(EXIT_FAILURE, "couldn't find key `%s'", ki);
key_fulltag(k, &d);
if (exp == KEXP_FOREVER && k->exp != KEXP_FOREVER) {
die(EXIT_FAILURE, "key `%s' expires: can't create nonexpiring signature",
d.buf);
}
+ s = getsig(k, "dsig", 1);
+
+ /* --- Check the key --- */
+
+ if ((err = s->ops->check(s)) != 0)
+ moan("key `%s' fails check: %s", d.buf, err);
/* --- Open files --- */
ofile, strerror(errno));
}
- h = gch->init();
-
/* --- Emit the start of the output --- */
binit(&b); b.tag = T_IDENT;
dstr_putf(&b.d, "%s, Catacomb version " VERSION, QUIS);
bemit(&b, ofp, 0, f & f_bin);
- breset(&b); b.tag = T_SIGALG; DPUTS(&b.d, s->name);
- bemit(&b, ofp, h, f & f_bin);
-
- breset(&b); b.tag = T_HASHALG; DPUTS(&b.d, gch->name);
- bemit(&b, ofp, h, f & f_bin);
-
breset(&b); b.tag = T_KEYID; b.k = k->id;
- bemit(&b, ofp, h, f & f_bin);
+ bemit(&b, ofp, 0, f & f_bin);
/* --- Start hashing, and emit the datestamps and things --- */
{
time_t now = time(0);
- breset(&b); b.tag = T_DATE; b.t = now; bemit(&b, ofp, h, f & f_bin);
+ breset(&b); b.tag = T_DATE; b.t = now; bemit(&b, ofp, s->h, f & f_bin);
if (exp == KEXP_EXPIRE)
exp = now + 86400 * 28;
- breset(&b); b.tag = T_EXPIRE; b.t = exp; bemit(&b, ofp, h, f & f_bin);
+ breset(&b); b.tag = T_EXPIRE; b.t = exp; bemit(&b, ofp, s->h, f & f_bin);
if (c) {
breset(&b); b.tag = T_COMMENT; DPUTS(&b.d, c);
- bemit(&b, ofp, h, f & f_bin);
+ bemit(&b, ofp, s->h, f & f_bin);
}
if (!(f & f_bin))
if (getstring(ifp, &b.d, f & f_raw))
break;
b.tag = T_FILE;
- DENSURE(&b.b, h->ops->c->hashsz);
- if (fhash(gch, b.d.buf, b.b.buf)) {
+ DENSURE(&b.b, GH_CLASS(s->h)->hashsz);
+ if (fhash(GH_CLASS(s->h), b.d.buf, b.b.buf)) {
moan("Error reading `%s': %s", b.d.buf, strerror(errno));
f |= f_bogus;
} else {
- b.b.len += h->ops->c->hashsz;
+ b.b.len += GH_CLASS(s->h)->hashsz;
if (verb) {
fhex(stderr, b.b.buf, b.b.len);
fprintf(stderr, " %s\n", b.d.buf);
}
- bemit(&b, ofp, h, f & f_bin);
+ bemit(&b, ofp, s->h, f & f_bin);
}
}
if (!(f & f_bogus)) {
breset(&b);
b.tag = T_SIGNATURE;
- DENSURE(&b.d, h->ops->c->hashsz);
- h->ops->done(h, b.d.buf);
- if ((e = s->sign(k, b.d.buf, h->ops->c->hashsz, &b.b)) != 0) {
+ if ((e = s->ops->doit(s, &b.b)) != 0) {
moan("error creating signature: %s", key_strerror(e));
f |= f_bogus;
}
/* --- Tidy up at the end --- */
+ freesig(s);
bdestroy(&b);
if (ifile)
fclose(ifp);
unsigned verb = 1;
key_file kf;
key *k = 0;
- sig *s = sigtab;
- const gchash *gch = &rmd160;
+ sig *s;
dstr d = DSTR_INIT;
- ghash *h = 0;
+ const char *err;
FILE *fp;
block b;
int e;
argc -= optind;
argv += optind;
if ((f & f_bogus) || argc > 1)
- die(EXIT_FAILURE, "Usage: verify [-qv] [file]");
+ die(EXIT_FAILURE, "Usage: verify [-qv] [FILE]");
/* --- Open the key file, and start reading the input file --- */
/* --- Read the introductory matter --- */
binit(&b);
- for (;;) {
+ for (;;) {
breset(&b);
e = bget(&b, fp, f & f_bin);
if (e < 0)
- die(EXIT_FAILURE, "error reading packet: %s\n", errtab[-e]);
+ die(EXIT_FAILURE, "error reading packet: %s", errtab[-e]);
if (e >= T_BEGIN)
break;
switch (e) {
if (verb > 2)
printf("INFO ident: `%s'\n", b.d.buf);
break;
- case T_SIGALG:
- if ((s = getsig(b.d.buf)) == 0) {
- if (verb)
- printf("FAIL unknown signature algorithm `%s'\n", b.d.buf);
- exit(EXIT_FAILURE);
- }
- if (verb > 2)
- printf("INFO signature algorithm: %s\n", s->name);
- break;
- case T_HASHALG:
- if ((gch = gethash(b.d.buf)) == 0) {
- if (verb)
- printf("FAIL unknown hash function `%s'\n", b.d.buf);
- exit(EXIT_FAILURE);
- }
- if (verb > 2)
- printf("INFO hash function algorithm: %s\n", gch->name);
- break;
case T_KEYID:
if ((k = key_byid(&kf, b.k)) == 0) {
if (verb)
/* --- Initialize the hash function and start reading hashed packets --- */
- h = gch->init();
-
if (!k) {
if (verb)
puts("FAIL no keyid packet found");
exit(EXIT_FAILURE);
}
- {
- block bb;
- binit(&bb);
- breset(&bb); bb.tag = T_SIGALG; DPUTS(&bb.d, s->name);
- bemit(&bb, 0, h, 0);
- breset(&bb); bb.tag = T_HASHALG; DPUTS(&bb.d, gch->name);
- bemit(&bb, 0, h, 0);
- breset(&bb); bb.tag = T_KEYID; bb.k = k->id;
- bemit(&bb, 0, h, 0);
- bdestroy(&bb);
- }
+ s = getsig(k, "dsig", 0);
+ if (verb && (err = s->ops->check(s)) != 0)
+ printf("WARN public key fails check: %s", err);
for (;;) {
switch (e) {
case T_COMMENT:
if (verb > 1)
printf("INFO comment: `%s'\n", b.d.buf);
- bemit(&b, 0, h, 0);
+ bemit(&b, 0, s->h, 0);
break;
case T_DATE:
if (verb > 2) {
timestring(b.t, &b.d);
printf("INFO date: %s\n", b.d.buf);
}
- bemit(&b, 0, h, 0);
+ bemit(&b, 0, s->h, 0);
break;
case T_EXPIRE: {
time_t now = time(0);
- if (b.t < now) {
+ if (b.t != KEXP_FOREVER && b.t < now) {
if (verb > 1)
puts("BAD signature has expired");
f |= f_bogus;
timestring(b.t, &b.d);
printf("INFO expires: %s\n", b.d.buf);
}
- bemit(&b, 0, h, 0);
+ bemit(&b, 0, s->h, 0);
} break;
case T_FILE:
DRESET(&d);
- DENSURE(&d, gch->hashsz);
- if (fhash(gch, b.d.buf, d.buf)) {
+ DENSURE(&d, GH_CLASS(s->h)->hashsz);
+ if (fhash(GH_CLASS(s->h), b.d.buf, d.buf)) {
if (verb > 1) {
printf("BAD error reading file `%s': %s\n",
b.d.buf, strerror(errno));
}
f |= f_bogus;
- } else if (b.b.len != gch->hashsz ||
+ } else if (b.b.len != GH_CLASS(s->h)->hashsz ||
memcmp(d.buf, b.b.buf, b.b.len) != 0) {
if (verb > 1)
printf("BAD file `%s' has incorrect hash\n", b.d.buf);
fhex(stdout, b.b.buf, b.b.len);
printf(" %s\n", b.d.buf);
}
- bemit(&b, 0, h, 0);
+ bemit(&b, 0, s->h, 0);
break;
case T_SIGNATURE:
- DRESET(&b.d);
- DENSURE(&b.d, h->ops->c->hashsz);
- b.d.len += h->ops->c->hashsz;
- h->ops->done(h, b.d.buf);
- e = s->verify(k, b.d.buf, b.d.len, b.b.buf, b.b.len);
- if (e != 1) {
- if (verb > 1) {
- if (e < 0) {
- printf("BAD error unpacking key: %s\n", key_strerror(e));
- } else
- puts("BAD bad signature");
- }
+ if (s->ops->doit(s, &b.b)) {
+ if (verb > 1)
+ puts("BAD bad signature");
f |= f_bogus;
} else if (verb > 2)
puts("INFO good signature");
done:
bdestroy(&b);
dstr_destroy(&d);
+ freesig(s);
key_close(&kf);
if (fp != stdin)
fclose(fp);
/*----- Main code ---------------------------------------------------------*/
-typedef struct cmd {
- const char *name;
- int (*func)(int /*argc*/, char */*argv*/[]);
- const char *usage;
- const char *help;
-} cmd;
+#define LISTS(LI) \
+ LI("Lists", list, \
+ listtab[i].name, listtab[i].name) \
+ LI("Signature schemes", sig, \
+ sigtab[i].name, sigtab[i].name) \
+ LI("Hash functions", hash, \
+ ghashtab[i], ghashtab[i]->name)
+
+MAKELISTTAB(listtab, LISTS)
+
+int cmd_show(int argc, char *argv[])
+{
+ return (displaylists(listtab, argv + 1));
+}
+
+static int cmd_help(int, char **);
static cmd cmdtab[] = {
-/* { "manifest", manifest, */
-/* "manifest [-0] [-o output]" }, */
+ { "help", cmd_help, "help [COMMAND...]" },
+ { "show", cmd_show, "show [ITEM...]" },
{ "sign", sign,
- "sign [-options]\n\
- [-0bqv] [-a alg] [-h hash] [-t keytype] [-i keyid]\n\
- [-e expire] [-f file] [-o output]", "\
+ "sign [-0bqv] [-c COMMENT] [-k TAG] [-e EXPIRE]\n\t\
+[-f FILE] [-o OUTPUT]",
+ "\
Options:\n\
\n\
-0, --null Read null-terminated filenames from stdin.\n\
-b, --binary Produce a binary output file.\n\
-q, --quiet Produce fewer messages while working.\n\
-v, --verbose Produce more messages while working.\n\
--a, --algorithm=SIGALG Use the SIGALG signature algorithm.\n\
--h, --hash=HASHASL Use the HASHALG message digest algorithm.\n\
-c, --comment=COMMENT Include COMMENT in the output file.\n\
-f, --file=FILE Read filenames to hash from FILE.\n\
-o, --output=FILE Write the signed result to FILE.\n\
--t, --keytype=TYPE Use a key with type TYPE to do the signing.\n\
--i, --keyid=ID Use the key with the given ID to do the signing.\n\
+-k, --key=TAG Use a key named by TAG.\n\
-e, --expire=TIME The signature should expire after TIME.\n\
" },
{ "verify", verify,
- "verify [-qv] [file]", "\
+ "verify [-qv] [FILE]", "\
Options:\n\
\n\
-q, --quiet Produce fewer messages while working.\n\
{ 0, 0, 0 }
};
-/* --- @findcmd@ --- *
- *
- * Arguments: @const char *name@ = a command name
- *
- * Returns: Pointer to the command structure.
- *
- * Use: Looks up a command by name. If the command isn't found, an
- * error is reported and the program is terminated.
- */
-
-static cmd *findcmd(const char *name)
+static int cmd_help(int argc, char **argv)
{
- cmd *c, *chosen = 0;
- size_t sz = strlen(name);
-
- for (c = cmdtab; c->name; c++) {
- if (strncmp(name, c->name, sz) == 0) {
- if (c->name[sz] == 0) {
- chosen = c;
- break;
- } else if (chosen)
- die(EXIT_FAILURE, "ambiguous command name `%s'", name);
- else
- chosen = c;
- }
- }
- if (!chosen)
- die(EXIT_FAILURE, "unknown command name `%s'", name);
- return (chosen);
+ sc_help(cmdtab, stdout, argv + 1);
+ return (0);
}
-static void version(FILE *fp)
+void version(FILE *fp)
{
pquis(fp, "$, Catacomb version " VERSION "\n");
}
static void usage(FILE *fp)
{
- pquis(fp, "Usage: $ [-k keyring] command [args]\n");
+ pquis(fp, "Usage: $ [-k KEYRING] COMMAND [ARGS]\n");
}
-static void help(FILE *fp, char **argv)
+void help_global(FILE *fp)
{
- cmd *c;
-
- if (*argv) {
- c = findcmd(*argv);
- fprintf(fp, "Usage: %s [-k keyring] %s\n", QUIS, c->usage);
- if (c->help) {
- fputc('\n', fp);
- fputs(c->help, fp);
- }
- } else {
- version(fp);
- fputc('\n', fp);
- usage(fp);
- fputs("\n\
+ usage(fp);
+ fputs("\n\
Create and verify signatures on lists of files.\n\
-\n", fp);
- for (c = cmdtab; c->name; c++)
- fprintf(fp, "%s\n", c->usage);
- }
+\n\
+Global command-line options:\n\
+\n\
+-h, --help [COMMAND...] Show this help message, or help for COMMANDs.\n\
+-v, --version Show program version number.\n\
+-u, --usage Show a terse usage message.\n\
+\n\
+-k, --keyring=FILE Read keys from FILE.\n",
+ fp);
}
/* --- @main@ --- *
break;
switch (i) {
case 'h':
- help(stdout, argv + optind);
+ sc_help(cmdtab, stdout, argv + optind);
exit(0);
break;
case 'v':
/* --- Dispatch to the correct subcommand handler --- */
- return (findcmd(argv[0])->func(argc, argv));
+ return (findcmd(cmdtab, argv[0])->cmd(argc, argv));
#undef f_bogus
}
projects / u / mdw / catacomb / blobdiff