X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/373641eaacc86b56715a2ebf0b603fce25c16051..HEAD:/progs/catcrypt.c

diff --git a/progs/catcrypt.c b/progs/catcrypt.c
index 72c77807..e4d974aa 100644
--- a/progs/catcrypt.c
+++ b/progs/catcrypt.c
@@ -38,6 +38,7 @@
 
 #include <mLib/base64.h>
 #include <mLib/dstr.h>
+#include <mLib/macros.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 #include <mLib/report.h>
@@ -51,6 +52,7 @@
 #include "key.h"
 #include "cc.h"
 
+#include "gaead.h"
 #include "ectab.h"
 #include "ptab.h"
 
@@ -193,14 +195,14 @@ static int encrypt(int argc, char *argv[])
     die(EXIT_FAILURE, "encoding `%s' not found", ef);
 
   fn = optind < argc ? argv[optind++] : "-";
-  if (strcmp(fn, "-") == 0)
+  if (STRCMP(fn, ==, "-"))
     fp = stdin;
   else if ((fp = fopen(fn, "rb")) == 0) {
     die(EXIT_FAILURE, "couldn't open file `%s': %s",
 	fn, strerror(errno));
   }
 
-  if (!of || strcmp(of, "-") == 0)
+  if (!of || STRCMP(of, ==, "-"))
     ofp = stdout;
   else if ((ofp = fopen(of, eo->wmode)) == 0) {
     die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
@@ -365,7 +367,7 @@ static int decrypt(int argc, char *argv[])
     die(EXIT_FAILURE, "encoding `%s' not found", ef);
 
   fn = optind < argc ? argv[optind++] : "-";
-  if (strcmp(fn, "-") == 0)
+  if (STRCMP(fn, ==, "-"))
     fp = stdin;
   else if ((fp = fopen(fn, eo->rmode)) == 0) {
     die(EXIT_FAILURE, "couldn't open file `%s': %s",
@@ -471,7 +473,7 @@ static int decrypt(int argc, char *argv[])
 
   /* --- Now decrypt the main body --- */
 
-  if (!of || strcmp(of, "-") == 0) {
+  if (!of || STRCMP(of, ==, "-")) {
     ofp = stdout;
     f |= f_buffer;
   }
@@ -572,6 +574,8 @@ static int decrypt(int argc, char *argv[])
      enctab[i].name, enctab[i].name)					\
   LI("Symmetric encryption algorithms", cipher,				\
      gciphertab[i], gciphertab[i]->name)				\
+  LI("Authenticated encryption schemes", aead,				\
+     gaeadtab[i], gaeadtab[i]->name)					\
   LI("Hash functions", hash,						\
      ghashtab[i], ghashtab[i]->name)					\
   LI("Message authentication codes", mac,				\