X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/ada5514153f5d2935fc82e8c787a12cffa5953d9..d4bb7fded5f9a4b0db99f82e88f22effe94f2ff7:/catcrypt.c

diff --git a/catcrypt.c b/catcrypt.c
index 546b6c3..08fb7e0 100644
--- a/catcrypt.c
+++ b/catcrypt.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: catcrypt.c,v 1.2 2004/05/09 13:03:46 mdw Exp $
+ * $Id$
  *
  * Command-line encryption tool
  *
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -29,6 +29,8 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#define _FILE_OFFSET_BITS 64
+
 #include "config.h"
 
 #include <errno.h>
@@ -50,24 +52,8 @@
 #include "key.h"
 #include "cc.h"
 
-/*----- Utilities ---------------------------------------------------------*/
-
-/* --- @keyreport@ --- *
- *
- * Arguments:   @const char *file@ = filename containing the error
- *              @int line@ = line number in file
- *              @const char *err@ = error text message
- *              @void *p@ = unimportant pointer
- *
- * Returns:     ---
- *
- * Use:         Reports errors during the opening of a key file.
- */
-
-static void keyreport(const char *file, int line, const char *err, void *p)
-{
-  moan("error in keyring `%s' at line `%s': %s", file, line, err);
-}
+#include "ectab.h"
+#include "ptab.h"
 
 /*----- Static variables --------------------------------------------------*/
 
@@ -85,17 +71,17 @@ static const char *keyring = "keyring";
  * the verification key-id if the message is signed.
  *
  * Next comes the key-encapsulation chunk.  This is decrypted in some
- * KEM-specific way to yield a secret hash.  This hash is what is signed if
- * the message is signed.  The hash is expanded using an MGF (or similar) to
- * make a symmetric encryption and MAC key.
+ * KEM-specific way to yield a secret hash.  The hash is expanded using an
+ * MGF (or similar) to make a symmetric encryption and MAC key.
  *
  * If the message is signed, there comes a signature chunk.  The signature is
- * on the secret hash.  This means that the recipient can modify the message
- * and still have a valid signature, so it's not useful for proving things to
- * other people; but it also means that the recipient knows that the message
- * is from someone who knows the hash, which limits the possiblities to (a)
- * whoever encrypted the message (good!) and (b) whoever knows the
- * recipient's private key.
+ * on the header and key-encapsulation chunks, and further output of the MGF.
+ * This means that the recipient can modify the message and still have a
+ * valid signature, so it's not useful for proving things to other people;
+ * but it also means that the recipient knows that the message is from
+ * someone who knows the hash, which limits the possiblities to (a) whoever
+ * encrypted the message (good!) and (b) whoever knows the recipient's
+ * private key.
  *
  * Then come message chunks.  Each one begins with a MAC over an implicit
  * sequence number and the ciphertext.  The final chunk's ciphertext is
@@ -142,22 +128,26 @@ err:
 
 static int encrypt(int argc, char *argv[])
 {
-  const char *of = 0, *kn = "ccrypt";
+  const char *fn, *of = 0, *kn = "ccrypt", *skn = 0;
   FILE *ofp = 0;
   FILE *fp = 0;
   const char *ef = "binary";
+  fprogress ff;
   const char *err;
   int i;
-  size_t n;
+  int en;
+  size_t n, chsz;
   dstr d = DSTR_INIT;
   octet *tag, *ct;
   buf b;
   size_t seq;
-  char bb[16384];
+  char bb[65536];
   unsigned f = 0;
   key_file kf;
   key *k;
+  key *sk = 0;
   kem *km;
+  sig *s = 0;
   gcipher *cx, *c;
   gmac *m;
   ghash *h;
@@ -165,47 +155,54 @@ static int encrypt(int argc, char *argv[])
   enc *e;
 
 #define f_bogus 1u
+#define f_nocheck 2u
+#define f_progress 4u
 
   for (;;) {
     static const struct option opt[] = {
       { "key",		OPTF_ARGREQ,	0,	'k' },
+      { "sign-key",	OPTF_ARGREQ,	0,	's' },
       { "armour",	0,		0,	'a' },
       { "armor",	0,		0,	'a' },
-      { "format", 	OPTF_ARGREQ,	0,	'f' },
-      { "output", 	OPTF_ARGREQ,	0,	'o' },
+      { "format",	OPTF_ARGREQ,	0,	'f' },
+      { "output",	OPTF_ARGREQ,	0,	'o' },
+      { "progress",	0,		0,	'p' },
+      { "nocheck",	0,		0,	'C' },
       { 0,		0,		0,	0 }
     };
-    i = mdwopt(argc, argv, "k:af:o:", opt, 0, 0, 0);
+    i = mdwopt(argc, argv, "k:s:af:o:pC", opt, 0, 0, 0);
     if (i < 0) break;
     switch (i) {
       case 'k': kn = optarg; break;
+      case 's': skn = optarg; break;
       case 'a': ef = "pem"; break;
       case 'f': ef = optarg; break;
       case 'o': of = optarg; break;
+      case 'p': f |= f_progress; break;
+      case 'C': f |= f_nocheck; break;
       default: f |= f_bogus; break;
     }
   }
   if (argc - optind > 1 || (f & f_bogus))
-    die(EXIT_FAILURE, "Usage: encrypt [-options] [file]");
+    die(EXIT_FAILURE, "Usage: encrypt [-OPTIONS] [FILE]");
 
-  if (key_open(&kf, keyring, KOPEN_READ, keyreport, 0))
+  if (key_open(&kf, keyring, KOPEN_READ, key_moan, 0))
     die(EXIT_FAILURE, "can't open keyring `%s'", keyring);
   if ((k = key_bytag(&kf, kn)) == 0)
     die(EXIT_FAILURE, "key `%s' not found", kn);
+  if (skn && (sk = key_bytag(&kf, skn)) == 0)
+    die(EXIT_FAILURE, "key `%s' not found", skn);
 
   if ((eo = getenc(ef)) == 0)
     die(EXIT_FAILURE, "encoding `%s' not found", ef);
 
-  if (optind == argc)
+  fn = optind < argc ? argv[optind++] : "-";
+  if (strcmp(fn, "-") == 0)
     fp = stdin;
-  else if (strcmp(argv[optind], "-") == 0) {
-    fp = stdin;
-    optind++;
-  } else if ((fp = fopen(argv[optind], "rb")) == 0) {
+  else if ((fp = fopen(fn, "rb")) == 0) {
     die(EXIT_FAILURE, "couldn't open file `%s': %s",
-	argv[optind], strerror(errno));
-  } else
-    optind++;
+	fn, strerror(errno));
+  }
 
   if (!of || strcmp(of, "-") == 0)
     ofp = stdout;
@@ -214,11 +211,19 @@ static int encrypt(int argc, char *argv[])
 	ofp, strerror(errno));
   }
 
+  dstr_reset(&d);
   key_fulltag(k, &d);
-  e = initenc(eo, ofp, "CATCRYPT ENCRYPTED MESSAGE", 1);
-  km = getkem(k, "ccrypt", 0);
-  if ((err = km->ops->check(km)) != 0)
-    moan("key `%s' fails check: %s", d.buf, err);
+  e = initenc(eo, ofp, "CATCRYPT ENCRYPTED MESSAGE");
+  km = getkem(k, "cckem", 0);
+  if (!(f & f_nocheck) && (err = km->ops->check(km)) != 0)
+    moan("key %s fails check: %s", d.buf, err);
+  if (sk) {
+    dstr_reset(&d);
+    key_fulltag(sk, &d);
+    s = getsig(sk, "ccsig", 1);
+    if ((err = s->ops->check(s)) != 0)
+      moan("key %s fails check: %s", d.buf, err);
+  }
 
   /* --- Build the header chunk --- */
 
@@ -226,7 +231,9 @@ static int encrypt(int argc, char *argv[])
   dstr_ensure(&d, 256);
   buf_init(&b, d.buf, 256);
   buf_putu32(&b, k->id);
+  if (sk) buf_putu32(&b, sk->id);
   assert(BOK(&b));
+  if (s) GH_HASHBUF16(s->h, BBASE(&b), BLEN(&b));
   chunk_write(e, &b);
 
   /* --- Build the KEM chunk --- */
@@ -236,24 +243,46 @@ static int encrypt(int argc, char *argv[])
     die(EXIT_FAILURE, "failed to encapsulate key");
   buf_init(&b, d.buf, d.len);
   BSTEP(&b, d.len);
+  if (s) GH_HASHBUF16(s->h, BBASE(&b), BLEN(&b));
   chunk_write(e, &b);
 
+  /* --- Write the signature chunk --- */
+
+  if (s) {
+    GC_ENCRYPT(cx, 0, bb, 1024);
+    GH_HASH(s->h, bb, 1024);
+    dstr_reset(&d);
+    if ((en = s->ops->doit(s, &d)) != 0)
+      die(EXIT_FAILURE, "error creating signature: %s", key_strerror(en));
+    buf_init(&b, d.buf, d.len);
+    BSTEP(&b, d.len);
+    chunk_write(e, &b);
+  }
+
   /* --- Now do the main crypto --- */
 
+  if (f & f_progress) {
+    if (fprogress_init(&ff, fn, fp)) {
+      die(EXIT_FAILURE, "failed to initialize progress display: %s",
+	  strerror(errno));
+    }
+  }
+
   assert(GC_CLASS(c)->blksz <= sizeof(bb));
   dstr_ensure(&d, sizeof(bb) + GM_CLASS(m)->hashsz);
   seq = 0;
+  chsz = MASK16 - GM_CLASS(m)->hashsz;
   for (;;) {
     h = GM_INIT(m);
-    STORE32(bb, seq);
-    GH_HASH(h, bb, 4);
+    GH_HASHU32(h, seq);
     seq++;
     if (GC_CLASS(c)->blksz) {
       GC_ENCRYPT(cx, 0, bb, GC_CLASS(c)->blksz);
       GC_SETIV(c, bb);
     }
-    n = fread(bb, 1, sizeof(bb), fp);
+    n = fread(bb, 1, chsz, fp);
     if (!n) break;
+    if (f & f_progress) fprogress_update(&ff, n);
     buf_init(&b, d.buf, d.sz);
     tag = buf_get(&b, GM_CLASS(m)->hashsz);
     ct = buf_get(&b, n);
@@ -276,36 +305,45 @@ static int encrypt(int argc, char *argv[])
 
   /* --- All done --- */
 
+  if (f & f_progress) fprogress_done(&ff);
   e->ops->encdone(e);
   GM_DESTROY(m);
   GC_DESTROY(c);
   GC_DESTROY(cx);
   freeenc(e);
+  if (s) freesig(s);
   freekem(km);
+  if (fp != stdin) fclose(fp);
   if (of) fclose(ofp);
   key_close(&kf);
   dstr_destroy(&d);
   return (0);
 
 #undef f_bogus
+#undef f_nocheck
+#undef f_progress
 }
 
 /*---- Decryption ---------------------------------------------------------*/
 
 static int decrypt(int argc, char *argv[])
 {
-  const char *of = 0;
-  FILE *ofp = 0;
+  const char *fn, *of = 0;
+  FILE *ofp = 0, *rfp = 0;
   FILE *fp = 0;
   const char *ef = "binary";
+  fprogress ff;
   int i;
+  size_t n;
   dstr d = DSTR_INIT;
   buf b;
   key_file kf;
   size_t seq;
   uint32 id;
   key *k;
+  key *sk = 0;
   kem *km;
+  sig *s = 0;
   gcipher *cx;
   gcipher *c;
   ghash *h;
@@ -313,76 +351,169 @@ static int decrypt(int argc, char *argv[])
   octet *tag;
   unsigned f = 0;
   const encops *eo;
+  const char *err;
+  int verb = 1;
   enc *e;
 
 #define f_bogus 1u
+#define f_buffer 2u
+#define f_nocheck 4u
+#define f_progress 8u
 
   for (;;) {
     static const struct option opt[] = {
       { "armour",	0,		0,	'a' },
       { "armor",	0,		0,	'a' },
-      { "format", 	OPTF_ARGREQ,	0,	'f' },
-      { "output", 	OPTF_ARGREQ,	0,	'o' },
+      { "buffer",	0,		0,	'b' },
+      { "verbose",	0,		0,	'v' },
+      { "quiet",	0,		0,	'q' },
+      { "nocheck",	0,		0,	'C' },
+      { "format",	OPTF_ARGREQ,	0,	'f' },
+      { "output",	OPTF_ARGREQ,	0,	'o' },
+      { "progress",	0,		0,	'p' },
       { 0,		0,		0,	0 }
     };
-    i = mdwopt(argc, argv, "af:o:", opt, 0, 0, 0);
+    i = mdwopt(argc, argv, "abf:o:pqvC", opt, 0, 0, 0);
     if (i < 0) break;
     switch (i) {
       case 'a': ef = "pem"; break;
+      case 'b': f |= f_buffer; break;
+      case 'v': verb++; break;
+      case 'q': if (verb) verb--; break;
+      case 'C': f |= f_nocheck; break;
       case 'f': ef = optarg; break;
       case 'o': of = optarg; break;
+      case 'p': f |= f_progress; break;
       default: f |= f_bogus; break;
     }
   }
   if (argc - optind > 1 || (f & f_bogus))
-    die(EXIT_FAILURE, "Usage: decrypt [-options] [file]");
+    die(EXIT_FAILURE, "Usage: decrypt [-OPTIONS] [FILE]");
 
   if ((eo = getenc(ef)) == 0)
     die(EXIT_FAILURE, "encoding `%s' not found", ef);
 
-  if (optind == argc)
-    fp = stdin;
-  else if (strcmp(argv[optind], "-") == 0) {
+  fn = optind < argc ? argv[optind++] : "-";
+  if (strcmp(fn, "-") == 0)
     fp = stdin;
-    optind++;
-  } else if ((fp = fopen(argv[optind], eo->rmode)) == 0) {
+  else if ((fp = fopen(fn, eo->rmode)) == 0) {
     die(EXIT_FAILURE, "couldn't open file `%s': %s",
-	argv[optind], strerror(errno));
-  } else
-    optind++;
+	fn, strerror(errno));
+  }
 
-  if (key_open(&kf, keyring, KOPEN_READ, keyreport, 0))
+  if (key_open(&kf, keyring, KOPEN_READ, key_moan, 0))
     die(EXIT_FAILURE, "can't open keyring `%s'", keyring);
 
-  e = initenc(eo, fp, "CATCRYPT ENCRYPTED MESSAGE", 0);
+  e = initdec(eo, fp, checkbdry, "CATCRYPT ENCRYPTED MESSAGE");
+
+  if (f & f_progress) {
+    if (fprogress_init(&ff, fn, fp)) {
+      die(EXIT_FAILURE, "failed to initialize progress display: %s",
+	  strerror(errno));
+    }
+  }
 
   /* --- Read the header chunk --- */
 
   chunk_read(e, &d, &b);
-  if (buf_getu32(&b, &id))
-    die(EXIT_FAILURE, "malformed header: missing keyid");
-  if (BLEFT(&b))
-    die(EXIT_FAILURE, "malformed header: junk at end");
+  if (f & f_progress)
+    fprogress_update(&ff, BLEFT(&b)*e->ops->ncook/e->ops->nraw);
+  if (buf_getu32(&b, &id)) {
+    if (f & f_progress) fprogress_done(&ff);
+    if (verb) printf("FAIL malformed header: missing keyid\n");
+    exit(EXIT_FAILURE);
+  }
+  if ((k = key_byid(&kf, id)) == 0) {
+    if (f & f_progress) fprogress_done(&ff);
+    if (verb) printf("FAIL key id %08lx not found\n", (unsigned long)id);
+    exit(EXIT_FAILURE);
+  }
+  if (BLEFT(&b)) {
+    if (buf_getu32(&b, &id)) {
+      if (f & f_progress) fprogress_done(&ff);
+      if (verb) printf("FAIL malformed header: missing signature keyid\n");
+      exit(EXIT_FAILURE);
+    }
+    if ((sk = key_byid(&kf, id)) == 0) {
+      if (f & f_progress) fprogress_done(&ff);
+      if (verb) printf("FAIL key id %08lx not found\n", (unsigned long)id);
+      exit(EXIT_FAILURE);
+    }
+  }
+  if (BLEFT(&b)) {
+    if (f & f_progress) fprogress_done(&ff);
+    if (verb) printf("FAIL malformed header: junk at end\n");
+    exit(EXIT_FAILURE);
+  }
+  if (sk) {
+    s = getsig(sk, "ccsig", 0);
+    if (!(f & f_nocheck) && verb && (err = s->ops->check(s)) != 0) {
+      dstr_reset(&d);
+      key_fulltag(sk, &d);
+      printf("WARN verification key %s fails check: %s\n", d.buf, err);
+    }
+    GH_HASHBUF16(s->h, BBASE(&b), BSZ(&b));
+  }
 
   /* --- Find the key --- */
 
-  if ((k = key_byid(&kf, id)) == 0)
-    die(EXIT_FAILURE, "key id %08lx not found", (unsigned long)id);
-  km = getkem(k, "ccrypt", 1);
+  km = getkem(k, "cckem", 1);
 
   /* --- Read the KEM chunk --- */
 
   chunk_read(e, &d, &b);
-  if (setupkem(km, &d, &cx, &c, &m))
-    die(EXIT_FAILURE, "failed to decapsulate key");
+  if (f & f_progress)
+    fprogress_update(&ff, BLEFT(&b)*e->ops->ncook/e->ops->nraw);
+  if (setupkem(km, &d, &cx, &c, &m)) {
+    if (f & f_progress) fprogress_done(&ff);
+    if (verb) printf("FAIL failed to decapsulate key\n");
+    exit(EXIT_FAILURE);
+  }
+  if (s) GH_HASHBUF16(s->h, d.buf, d.len);
+
+  /* --- Verify the signature, if there is one --- */
+
+  if (sk) {
+    dstr_reset(&d);
+    dstr_ensure(&d, 1024);
+    GC_ENCRYPT(cx, 0, d.buf, 1024);
+    GH_HASH(s->h, d.buf, 1024);
+    chunk_read(e, &d, &b);
+    if (f & f_progress)
+      fprogress_update(&ff, BLEFT(&b)*e->ops->ncook/e->ops->nraw);
+    if (s->ops->doit(s, &d)) {
+      if (f & f_progress) fprogress_done(&ff);
+      if (verb) printf("FAIL signature verification failed\n");
+      exit(EXIT_FAILURE);
+    }
+    if (verb) {
+      dstr_reset(&d);
+      key_fulltag(sk, &d);
+      if (f & f_progress) fprogress_clear(&ff);
+      printf("INFO good-signature %s\n", d.buf);
+    }
+    freesig(s);
+  } else if (verb) {
+    if (f & f_progress) fprogress_clear(&ff);
+    printf("INFO no-signature\n");
+  }
 
   /* --- Now decrypt the main body --- */
 
-  if (!of || strcmp(of, "-") == 0)
+  if (!of || strcmp(of, "-") == 0) {
     ofp = stdout;
-  else if ((ofp = fopen(of, "wb")) == 0) {
-    die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
-	ofp, strerror(errno));
+    f |= f_buffer;
+  }
+  if (!(f & f_buffer)) {
+    if ((ofp = fopen(of, "wb")) == 0) {
+      if (f & f_progress) fprogress_done(&ff);
+      die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
+	  ofp, strerror(errno));
+    }
+    rfp = ofp;
+  } else if ((rfp = tmpfile()) == 0) {
+    if (f & f_progress) fprogress_done(&ff);
+    die(EXIT_FAILURE, "couldn't create temporary file: %s", strerror(errno));
   }
 
   seq = 0;
@@ -394,291 +525,175 @@ static int decrypt(int argc, char *argv[])
       GC_SETIV(c, d.buf);
     }
     h = GM_INIT(m);
-    STORE32(d.buf, seq);
-    GH_HASH(h, d.buf, 4);
+    GH_HASHU32(h, seq);
     seq++;
     chunk_read(e, &d, &b);
-    if ((tag = buf_get(&b, GM_CLASS(m)->hashsz)) == 0)
-      die(EXIT_FAILURE, "bad ciphertext chunk: no tag");
+    if (f & f_progress)
+      fprogress_update(&ff, BLEFT(&b)*e->ops->ncook/e->ops->nraw);
+    if ((tag = buf_get(&b, GM_CLASS(m)->hashsz)) == 0) {
+      if (f & f_progress) fprogress_done(&ff);
+      if (verb) printf("FAIL bad ciphertext chunk: no tag\n");
+      exit(EXIT_FAILURE);
+    }
     GH_HASH(h, BCUR(&b), BLEFT(&b));
-    if (memcmp(tag, GH_DONE(h, 0), GM_CLASS(m)->hashsz) != 0)
-      die(EXIT_FAILURE, "bad ciphertext chunk: authentication failure");
+    if (memcmp(tag, GH_DONE(h, 0), GM_CLASS(m)->hashsz) != 0) {
+      if (f & f_progress) fprogress_done(&ff);
+      if (verb)
+	printf("FAIL bad ciphertext chunk: authentication failure\n");
+      exit(EXIT_FAILURE);
+    }
+    GH_DESTROY(h);
     if (!BLEFT(&b))
       break;
     GC_DECRYPT(c, BCUR(&b), BCUR(&b), BLEFT(&b));
-    if (fwrite(BCUR(&b), 1, BLEFT(&b), ofp) != BLEFT(&b))
-      die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
+    if (fwrite(BCUR(&b), 1, BLEFT(&b), rfp) != BLEFT(&b)) {
+      if (f & f_progress) fprogress_done(&ff);
+      if (verb) printf("FAIL error writing output: %s\n", strerror(errno));
+      exit(EXIT_FAILURE);
+    }
+  }
+
+  if (f & f_progress) fprogress_done(&ff);
+  if (fflush(rfp) || ferror(rfp)) {
+    if (verb) printf("FAIL error writing output: %s\n", strerror(errno));
+    exit(EXIT_FAILURE);
+  }
+  if (f & f_buffer) {
+    if (!ofp && (ofp = fopen(of, "wb")) == 0) {
+      die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
+	  of, strerror(errno));
+    }
+    rewind(rfp);
+    if (f & f_progress) fprogress_init(&ff, "copying buffer", rfp);
+    dstr_reset(&d);
+    dstr_ensure(&d, 65536);
+    if (verb && ofp == stdout) printf("DATA\n");
+    for (;;) {
+      n = fread(d.buf, 1, d.sz, rfp);
+      if (!n) break;
+      if (f & f_progress) fprogress_update(&ff, n);
+      if (fwrite(d.buf, 1, n, ofp) < n) {
+	if (f & f_progress) fprogress_done(&ff);
+	die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
+      }
+    }
+    if (f & f_progress) fprogress_done(&ff);
+    if (ferror(rfp) || fclose(rfp))
+      die(EXIT_FAILURE, "error unbuffering output: %s", strerror(errno));
   }
 
-  if (fflush(ofp) || ferror(ofp))
-    die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
-    
   e->ops->decdone(e);
+  if (verb && ofp != stdout)
+    printf("OK decrypted successfully\n");
+  if (ofp && (fflush(ofp) || ferror(ofp) || fclose(ofp)))
+      die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
   freeenc(e);
   GC_DESTROY(c);
   GC_DESTROY(cx);
   GM_DESTROY(m);
   freekem(km);
-  if (of) fclose(ofp);
+  if (fp != stdin) fclose(fp);
   key_close(&kf);
   dstr_destroy(&d);
   return (0);
 
 #undef f_bogus
+#undef f_buffer
+#undef f_nocheck
+#undef f_progress
 }
 
-/*----- Test code ---------------------------------------------------------*/
-
-static int encode(int argc, char *argv[])
-{
-  const char *of = 0;
-  FILE *ofp = 0;
-  FILE *fp = 0;
-  const char *ef = "binary";
-  const char *bd = "MESSAGE";
-  int i;
-  size_t n;
-  char buf[4096];
-  unsigned f = 0;
-  const encops *eo;
-  enc *e;
-
-#define f_bogus 1u
-
-  for (;;) {
-    static const struct option opt[] = {
-      { "format", 	OPTF_ARGREQ,	0,	'f' },
-      { "boundary", 	OPTF_ARGREQ,	0,	'b' },
-      { "output", 	OPTF_ARGREQ,	0,	'o' },
-      { 0,		0,		0,	0 }
-    };
-    i = mdwopt(argc, argv, "f:b:o:", opt, 0, 0, 0);
-    if (i < 0) break;
-    switch (i) {
-      case 'f': ef = optarg; break;
-      case 'b': bd = optarg; break;
-      case 'o': of = optarg; break;
-      default: f |= f_bogus; break;
-    }
-  }
-  if (argc - optind > 1 || (f & f_bogus))
-    die(EXIT_FAILURE, "Usage: encode [-options] [file]");
-
-  if ((eo = getenc(ef)) == 0)
-    die(EXIT_FAILURE, "encoding `%s' not found", ef);
-
-  if (optind == argc)
-    fp = stdin;
-  else if (strcmp(argv[optind], "-") == 0) {
-    fp = stdin;
-    optind++;
-  } else if ((fp = fopen(argv[optind], "rb")) == 0) {
-    die(EXIT_FAILURE, "couldn't open file `%s': %s",
-	argv[optind], strerror(errno));
-  } else
-    optind++;
-
-  if (!of || strcmp(of, "-") == 0)
-    ofp = stdout;
-  else if ((ofp = fopen(of, eo->wmode)) == 0) {
-    die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
-	ofp, strerror(errno));
-  }
-
-  e = initenc(eo, ofp, bd, 1);
-
-  do {
-    n = fread(buf, 1, sizeof(buf), fp);
-    if (e->ops->write(e, buf, n))
-      die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
-  } while (n == sizeof(buf));
-  e->ops->encdone(e);
-  freeenc(e);
-  return (0);
-
-#undef f_bogus
-}
+/*----- Main code ---------------------------------------------------------*/
 
-static int decode(int argc, char *argv[])
+#define LISTS(LI)							\
+  LI("Lists", list,							\
+     listtab[i].name, listtab[i].name)					\
+  LI("Key-encapsulation mechanisms", kem,				\
+     kemtab[i].name, kemtab[i].name)					\
+  LI("Signature schemes", sig,						\
+     sigtab[i].name, sigtab[i].name)					\
+  LI("Encodings", enc,							\
+     enctab[i].name, enctab[i].name)					\
+  LI("Symmetric encryption algorithms", cipher,				\
+     gciphertab[i], gciphertab[i]->name)				\
+  LI("Hash functions", hash,						\
+     ghashtab[i], ghashtab[i]->name)					\
+  LI("Message authentication codes", mac,				\
+     gmactab[i], gmactab[i]->name)
+
+MAKELISTTAB(listtab, LISTS)
+
+int cmd_show(int argc, char *argv[])
 {
-  const char *of = 0;
-  FILE *ofp = 0;
-  FILE *fp = 0;
-  const char *ef = "binary";
-  const char *bd = 0;
-  int i;
-  char buf[4096];
-  unsigned f = 0;
-  const encops *eo;
-  enc *e;
-
-#define f_bogus 1u
-
-  for (;;) {
-    static const struct option opt[] = {
-      { "format", 	OPTF_ARGREQ,	0,	'f' },
-      { "boundary", 	OPTF_ARGREQ,	0,	'b' },
-      { "output", 	OPTF_ARGREQ,	0,	'o' },
-      { 0,		0,		0,	0 }
-    };
-    i = mdwopt(argc, argv, "f:b:o:", opt, 0, 0, 0);
-    if (i < 0) break;
-    switch (i) {
-      case 'f': ef = optarg; break;
-      case 'b': bd = optarg; break;
-      case 'o': of = optarg; break;
-      default: f |= f_bogus; break;
-    }
-  }
-  if (argc - optind > 1 || (f & f_bogus))
-    die(EXIT_FAILURE, "Usage: decode [-options] [file]");
-
-  if ((eo = getenc(ef)) == 0)
-    die(EXIT_FAILURE, "encoding `%s' not found", ef);
-
-  if (optind == argc)
-    fp = stdin;
-  else if (strcmp(argv[optind], "-") == 0) {
-    fp = stdin;
-    optind++;
-  } else if ((fp = fopen(argv[optind], eo->rmode)) == 0) {
-    die(EXIT_FAILURE, "couldn't open file `%s': %s",
-	argv[optind], strerror(errno));
-  } else
-    optind++;
-
-  if (!of || strcmp(of, "-") == 0)
-    ofp = stdout;
-  else if ((ofp = fopen(of, "wb")) == 0) {
-    die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
-	ofp, strerror(errno));
-  }
-
-  e = initenc(eo, fp, bd, 0);
-
-  do {
-    if ((i = e->ops->read(e, buf, sizeof(buf))) < 0)
-      die(EXIT_FAILURE, "error reading input: %s", strerror(errno));
-    if (fwrite(buf, 1, i, ofp) < i)
-      die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
-  } while (i == sizeof(buf));
-  e->ops->decdone(e);
-  freeenc(e);
-  return (0);
-
-#undef f_bogus
+  return (displaylists(listtab, argv + 1));
 }
 
-/*----- Main code ---------------------------------------------------------*/
-
-typedef struct cmd {
-  const char *name;
-  int (*func)(int /*argc*/, char */*argv*/[]);
-  const char *usage;
-  const char *help;
-} cmd;
+static int cmd_help(int, char **);
 
 static cmd cmdtab[] = {
-  { "encode", encode,
-    "encode [-f format] [-b label] [-o output] [file]",
-    "\
-Options:\n\
-\n\
--f, --format=FORMAT	Encode to FORMAT.\n\
--b, --boundary=LABEL	PEM boundary is LABEL.\n\
--o, --output=FILE	Write output to FILE.\n\
-" },
-  { "decode", decode,
-    "decode [-f format] [-b label] [-o output] [file]",
-    "\
-Options:\n\
-\n\
--f, --format=FORMAT	Decode from FORMAT.\n\
--b, --boundary=LABEL	PEM boundary is LABEL.\n\
--o, --output=FILE	Write output to FILE.\n\
-" },
+  { "help", cmd_help, "help [COMMAND...]" },
+  { "show", cmd_show, "show [ITEM...]" },
+  CMD_ENCODE,
+  CMD_DECODE,
   { "encrypt", encrypt,
-    "encrypt [-a] [-k tag] [f format]] [-o output] [file]",
-    "\
+    "encrypt [-apC] [-k TAG] [-s TAG] [-f FORMAT]\n\t\
+[-o OUTPUT] [FILE]", "\
 Options:\n\
 \n\
 -a, --armour		Same as `-f pem'.\n\
 -f, --format=FORMAT	Encode as FORMAT.\n\
--k, --key=TAG		Use public key named by TAG.\n\
+-k, --key=TAG		Use public encryption key named by TAG.\n\
+-s, --sign-key=TAG	Use private signature key named by TAG.\n\
 -o, --output=FILE	Write output to FILE.\n\
+-p, --progress		Show progress on large files.\n\
+-C, --nocheck		Don't check the public key.\n\
 " },
   { "decrypt", decrypt,
-    "decrypt [-t] [-o output] [file]", "\
+    "decrypt [-abpqvC] [-f FORMAT] [-o OUTPUT] [FILE]", "\
 Options:\n\
 \n\
--t, --text		Read PEM-encoded input.\n\
+-a, --armour		Same as `-f pem'.\n\
+-b, --buffer		Buffer output until we're sure we have it all.\n\
+-f, --format=FORMAT	Decode as FORMAT.\n\
 -o, --output=FILE	Write output to FILE.\n\
+-p, --progress		Show progress on large files.\n\
+-q, --quiet		Produce fewer messages.\n\
+-v, --verbose		Produce more verbose messages.\n\
+-C, --nocheck		Don't check the private key.\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\
 Encrypt and decrypt 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@ --- *
@@ -688,8 +703,7 @@ Encrypt and decrypt files.\n\
  *
  * Returns:	Zero if successful, nonzero otherwise.
  *
- * Use:		Signs or verifies signatures on lists of files.  Useful for
- *		ensuring that a distribution is unmolested.
+ * Use:		Encrypts or decrypts files.
  */
 
 int main(int argc, char *argv[])
@@ -720,7 +734,7 @@ int main(int argc, char *argv[])
       break;
     switch (i) {
       case 'h':
-	help(stdout, argv + optind);
+	sc_help(cmdtab, stdout, argv + optind);
 	exit(0);
 	break;
       case 'v':
@@ -749,7 +763,7 @@ int main(int argc, char *argv[])
 
   /* --- Dispatch to the correct subcommand handler --- */
 
-  return (findcmd(argv[0])->func(argc, argv));
+  return (findcmd(cmdtab, argv[0])->cmd(argc, argv));
 
 #undef f_bogus
 }