X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/fa54fe1eda6977fc8aef0c154f8483e351e20bdd..990dafb1c3a66076a1b3d66b901395ebc24de277:/catcrypt.c diff --git a/catcrypt.c b/catcrypt.c index 08fbb53..fdb8473 100644 --- a/catcrypt.c +++ b/catcrypt.c @@ -55,23 +55,6 @@ /*----- 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); -} - /*----- Static variables --------------------------------------------------*/ static const char *keyring = "keyring"; @@ -170,6 +153,7 @@ static int encrypt(int argc, char *argv[]) enc *e; #define f_bogus 1u +#define f_nocheck 2u for (;;) { static const struct option opt[] = { @@ -179,9 +163,10 @@ static int encrypt(int argc, char *argv[]) { "armor", 0, 0, 'a' }, { "format", OPTF_ARGREQ, 0, 'f' }, { "output", OPTF_ARGREQ, 0, 'o' }, + { "nocheck", 0, 0, 'C' }, { 0, 0, 0, 0 } }; - i = mdwopt(argc, argv, "k:s:af:o:", opt, 0, 0, 0); + i = mdwopt(argc, argv, "k:s:af:o:C", opt, 0, 0, 0); if (i < 0) break; switch (i) { case 'k': kn = optarg; break; @@ -189,13 +174,14 @@ static int encrypt(int argc, char *argv[]) case 'a': ef = "pem"; break; case 'f': ef = optarg; break; case 'o': of = optarg; 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]"); - 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); @@ -227,7 +213,7 @@ static int encrypt(int argc, char *argv[]) key_fulltag(k, &d); e = initenc(eo, ofp, "CATCRYPT ENCRYPTED MESSAGE"); km = getkem(k, "cckem", 0); - if ((err = km->ops->check(km)) != 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); @@ -276,8 +262,7 @@ static int encrypt(int argc, char *argv[]) seq = 0; 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); @@ -314,12 +299,14 @@ static int encrypt(int argc, char *argv[]) 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 } /*---- Decryption ---------------------------------------------------------*/ @@ -354,6 +341,7 @@ static int decrypt(int argc, char *argv[]) #define f_bogus 1u #define f_buffer 2u +#define f_nocheck 4u for (;;) { static const struct option opt[] = { @@ -362,17 +350,19 @@ static int decrypt(int argc, char *argv[]) { "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' }, { 0, 0, 0, 0 } }; - i = mdwopt(argc, argv, "af:o:qv", opt, 0, 0, 0); + i = mdwopt(argc, argv, "abf:o:qvC", 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; default: f |= f_bogus; break; @@ -395,7 +385,7 @@ static int decrypt(int argc, char *argv[]) } else optind++; - 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 = initdec(eo, fp, checkbdry, "CATCRYPT ENCRYPTED MESSAGE"); @@ -444,7 +434,7 @@ static int decrypt(int argc, char *argv[]) s = getsig(sk, "ccsig", 0); dstr_reset(&d); key_fulltag(sk, &d); - if (verb && (err = s->ops->check(s)) != 0) + if (!(f & f_nocheck) && verb && (err = s->ops->check(s)) != 0) printf("WARN verification key %s fails check: %s\n", d.buf, err); dstr_reset(&d); dstr_ensure(&d, 1024); @@ -460,6 +450,7 @@ static int decrypt(int argc, char *argv[]) key_fulltag(sk, &d); printf("INFO good-signature %s\n", d.buf); } + freesig(s); } else if (verb) printf("INFO no-signature\n"); @@ -487,8 +478,7 @@ 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) { @@ -501,6 +491,7 @@ static int decrypt(int argc, char *argv[]) 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)); @@ -522,7 +513,7 @@ static int decrypt(int argc, char *argv[]) rewind(rfp); dstr_reset(&d); dstr_ensure(&d, 65536); - if (ofp == stdout) printf("DATA\n"); + if (verb && ofp == stdout) printf("DATA\n"); for (;;) { n = fread(d.buf, 1, d.sz, rfp); if (!n) break; @@ -543,6 +534,7 @@ static int decrypt(int argc, char *argv[]) GC_DESTROY(cx); GM_DESTROY(m); freekem(km); + if (fp != stdin) fclose(fp); if (of) fclose(ofp); key_close(&kf); dstr_destroy(&d); @@ -550,6 +542,7 @@ static int decrypt(int argc, char *argv[]) #undef f_bogus #undef f_buffer +#undef f_nocheck } /*----- Main code ---------------------------------------------------------*/ @@ -585,7 +578,7 @@ static cmd cmdtab[] = { CMD_ENCODE, CMD_DECODE, { "encrypt", encrypt, - "encrypt [-a] [-k TAG] [-s TAG] [-f FORMAT]\n\t\ + "encrypt [-aC] [-k TAG] [-s TAG] [-f FORMAT]\n\t\ [-o OUTPUT] [FILE]", "\ Options:\n\ \n\ @@ -594,9 +587,10 @@ Options:\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\ +-C, --nocheck Don't check the public key.\n\ " }, { "decrypt", decrypt, - "decrypt [-abqv] [-f FORMAT] [-o OUTPUT] [FILE]", "\ + "decrypt [-abqvC] [-f FORMAT] [-o OUTPUT] [FILE]", "\ Options:\n\ \n\ -a, --armour Same as `-f pem'.\n\ @@ -605,6 +599,7 @@ Options:\n\ -o, --output=FILE Write output to FILE.\n\ -q, --quiet Produce fewer messages.\n\ -v, --verbose Produce more verbose messages.\n\ +-C, --nocheck Don't check the private key.\n\ " }, /* ' emacs is confused */ { 0, 0, 0 } };