X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/e45700ebb66e5b1d810f2f6f82ff356e0ff7ac41..16efd15b675c87d22a4fd9fb12d7bb26f2a36031:/dsig.c diff --git a/dsig.c b/dsig.c index a1e945d..a34cca2 100644 --- a/dsig.c +++ b/dsig.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: dsig.c,v 1.5 2000/10/08 12:12:09 mdw Exp $ + * $Id: dsig.c,v 1.6 2000/12/06 20:33:27 mdw Exp $ * * Verify signatures on distribuitions of files * @@ -30,6 +30,10 @@ /*----- Revision history --------------------------------------------------* * * $Log: dsig.c,v $ + * 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. * @@ -876,11 +880,9 @@ static void fhex(FILE *fp, const void *p, size_t sz) static int sign(int argc, char *argv[]) { - enum { - f_raw = 1, - f_bin = 2, - f_bogus = 4 - }; +#define f_raw 1u +#define f_bin 2u +#define f_bogus 4u unsigned f = 0; const char *kt = 0; @@ -1118,17 +1120,19 @@ static int sign(int argc, char *argv[]) if (f & f_bogus) die(EXIT_FAILURE, "error(s) occurred while creating signature"); return (EXIT_SUCCESS); + +#undef f_raw +#undef f_bin +#undef f_bogus } /*----- Signature verification --------------------------------------------*/ static int verify(int argc, char *argv[]) { - enum { - f_bogus = 1, - f_bin = 2, - f_ok = 4 - }; +#define f_bogus 1u +#define f_bin 2u +#define f_ok 4u unsigned f = 0; unsigned verb = 1; @@ -1347,6 +1351,10 @@ done: puts("OK signature verified"); } return (f & f_bogus ? EXIT_FAILURE : EXIT_SUCCESS); + +#undef f_bogus +#undef f_bin +#undef f_ok } /*----- Main code ---------------------------------------------------------*/ @@ -1409,9 +1417,7 @@ int main(int argc, char *argv[]) cmd *c = 0, *cc = 0; size_t n; - enum { - f_bogus = 1 - }; +#define f_bogus 1u /* --- Initialize the library --- */ @@ -1479,6 +1485,8 @@ int main(int argc, char *argv[]) if (!cc) die(EXIT_FAILURE, "unknown command `%s'", argv[0]); return (cc->func(argc, argv)); + +#undef f_bogus } /*----- That's all, folks -------------------------------------------------*/