Deploy the new <ctype.h> and `foocmp' macros from mLib.

[catacomb] / progs / cc-kem.c

diff --git a/progs/cc-kem.c b/progs/cc-kem.c
index 9159ade..36dfdb3 100644 (file)
--- a/progs/cc-kem.c
+++ b/progs/cc-kem.c
@@ -33,6 +33,7 @@
 
 #include <mLib/alloc.h>
 #include <mLib/dstr.h>
+#include <mLib/macros.h>
 #include <mLib/report.h>
 #include <mLib/sub.h>
 
@@ -210,12 +211,12 @@ static bulk *naclbox_init(key *k, const char *calg, const char *halg)
   key_fulltag(k, &t);
 
   if ((q = key_getattr(0, k, "cipher")) != 0) calg = q;
-  if (!calg || strcmp(calg, "salsa20") == 0) aec = &salsa20_naclbox;
-  else if (strcmp(calg, "salsa20/12") == 0) aec = &salsa2012_naclbox;
-  else if (strcmp(calg, "salsa20/8") == 0) aec = &salsa208_naclbox;
-  else if (strcmp(calg, "chacha20") == 0) aec = &chacha20_naclbox;
-  else if (strcmp(calg, "chacha12") == 0) aec = &chacha12_naclbox;
-  else if (strcmp(calg, "chacha8") == 0) aec = &chacha8_naclbox;
+  if (!calg || STRCMP(calg, ==, "salsa20")) aec = &salsa20_naclbox;
+  else if (STRCMP(calg, ==, "salsa20/12")) aec = &salsa2012_naclbox;
+  else if (STRCMP(calg, ==, "salsa20/8")) aec = &salsa208_naclbox;
+  else if (STRCMP(calg, ==, "chacha20")) aec = &chacha20_naclbox;
+  else if (STRCMP(calg, ==, "chacha12")) aec = &chacha12_naclbox;
+  else if (STRCMP(calg, ==, "chacha8")) aec = &chacha8_naclbox;
   else {
     die(EXIT_FAILURE,
        "unknown or inappropriate encryption scheme `%s' in key `%s'",
@@ -866,7 +867,7 @@ kem *getkem(key *k, const char *app, int wantpriv, bulk **bc)
   if ((q = key_getattr(0, k, "kem")) != 0) {
     dstr_puts(&d, q);
     p = d.buf;
-  } else if (strncmp(k->type, app, n) == 0 && k->type[n] == '-') {
+  } else if (STRNCMP(k->type, ==, app, n) && k->type[n] == '-') {
     dstr_puts(&d, k->type);
     p = d.buf + n + 1;
   } else
@@ -897,7 +898,7 @@ kem *getkem(key *k, const char *app, int wantpriv, bulk **bc)
   /* --- Instantiate the KEM --- */
 
   for (kt = kemtab; kt->name; kt++) {
-    if (strcmp(kt->name, kalg) == 0)
+    if (STRCMP(kt->name, ==, kalg))
       goto k_found;
   }
   die(EXIT_FAILURE, "key encapsulation mechanism `%s' not found in key `%s'",
@@ -934,10 +935,10 @@ k_found:;
     bt = bulktab;
   else {
     for (bt = bulktab, bo = 0; bt->name; bt++) {
-      if (strcmp(balg, bt->name) == 0)
+      if (STRCMP(balg, ==, bt->name))
        { balg = 0; goto b_found; }
       n = strlen(bt->name);
-      if (strncmp(balg, bt->name, n) == 0 && balg[n] == '-')
+      if (STRNCMP(balg, ==, bt->name, n) && balg[n] == '-')
        { balg += n + 1; goto b_found; }
     }
     bt = bulktab;