catcrypt: Implement symmetric key-encapsulation and signature schemes.

[u/mdw/catacomb] / mkphrase.c

diff --git a/mkphrase.c b/mkphrase.c
index 2d1ea1b..3a26ed9 100644 (file)
--- a/mkphrase.c
+++ b/mkphrase.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mkphrase.c,v 1.2 2000/12/06 20:33:27 mdw Exp $
+ * $Id$
  *
  * Generate passphrases from word lists
  *
@@ -27,19 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mkphrase.c,v $
- * Revision 1.2  2000/12/06 20:33:27  mdw
- * Make flags be macros rather than enumerations, to ensure that they're
- * unsigned.
- *
- * Revision 1.1  2000/08/06 10:50:55  mdw
- * (mkphrase): New program for generating random passphrases with measured
- * strength.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -287,7 +274,7 @@ static void version(FILE *fp)
 static void usage(FILE *fp)
 {
   pquis(fp, "\
-Usage: $ [-p] [-b bits] [-g gen] [-n count] [-r [min-]max] wordlist...\n\
+Usage: $ [-p] [-b BITS] [-g GEN] [-n COUNT] [-r [MIN-]MAX] WORDLIST...\n\
 ");
 }
 
@@ -420,7 +407,7 @@ int main(int argc, char *argv[])
   ctx = ops->init();
   while (*argv) {
     if (strcmp(*argv, "-") == 0)
-      ops->scan(ctx, stdin);
+      ops->scan(stdin, ctx);
     else {
       FILE *fp = fopen(*argv, "r");
       if (!fp) {