X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/64459c9813ec87450978d0f89cf36f5491a08f7a..d4bb7fded5f9a4b0db99f82e88f22effe94f2ff7:/catcrypt.c?ds=sidebyside diff --git a/catcrypt.c b/catcrypt.c index 4e54712..08fb7e0 100644 --- a/catcrypt.c +++ b/catcrypt.c @@ -7,7 +7,7 @@ * (c) 2004 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Catacomb. * @@ -15,12 +15,12 @@ * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. - * + * * Catacomb is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. - * + * * You should have received a copy of the GNU Library General Public * License along with Catacomb; if not, write to the Free * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, @@ -29,6 +29,8 @@ /*----- Header files ------------------------------------------------------*/ +#define _FILE_OFFSET_BITS 64 + #include "config.h" #include @@ -53,25 +55,6 @@ #include "ectab.h" #include "ptab.h" -/*----- 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"; @@ -92,12 +75,13 @@ static const char *keyring = "keyring"; * MGF (or similar) to make a symmetric encryption and MAC key. * * If the message is signed, there comes a signature chunk. The signature is - * on the further output of the MGF. This means that the recipient can - * modify the message and still have a valid signature, so it's not useful - * for proving things to other people; but it also means that the recipient - * knows that the message is from someone who knows the hash, which limits - * the possiblities to (a) whoever encrypted the message (good!) and (b) - * whoever knows the recipient's private key. + * on the header and key-encapsulation chunks, and further output of the MGF. + * This means that the recipient can modify the message and still have a + * valid signature, so it's not useful for proving things to other people; + * but it also means that the recipient knows that the message is from + * someone who knows the hash, which limits the possiblities to (a) whoever + * encrypted the message (good!) and (b) whoever knows the recipient's + * private key. * * Then come message chunks. Each one begins with a MAC over an implicit * sequence number and the ciphertext. The final chunk's ciphertext is @@ -144,19 +128,20 @@ err: static int encrypt(int argc, char *argv[]) { - const char *of = 0, *kn = "ccrypt", *skn = 0; + const char *fn, *of = 0, *kn = "ccrypt", *skn = 0; FILE *ofp = 0; FILE *fp = 0; const char *ef = "binary"; + fprogress ff; const char *err; int i; int en; - size_t n; + size_t n, chsz; dstr d = DSTR_INIT; octet *tag, *ct; buf b; size_t seq; - char bb[16384]; + char bb[65536]; unsigned f = 0; key_file kf; key *k; @@ -170,6 +155,8 @@ static int encrypt(int argc, char *argv[]) enc *e; #define f_bogus 1u +#define f_nocheck 2u +#define f_progress 4u for (;;) { static const struct option opt[] = { @@ -177,11 +164,13 @@ static int encrypt(int argc, char *argv[]) { "sign-key", OPTF_ARGREQ, 0, 's' }, { "armour", 0, 0, 'a' }, { "armor", 0, 0, 'a' }, - { "format", OPTF_ARGREQ, 0, 'f' }, - { "output", OPTF_ARGREQ, 0, 'o' }, + { "format", OPTF_ARGREQ, 0, 'f' }, + { "output", OPTF_ARGREQ, 0, 'o' }, + { "progress", 0, 0, 'p' }, + { "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:pC", opt, 0, 0, 0); if (i < 0) break; switch (i) { case 'k': kn = optarg; break; @@ -189,13 +178,15 @@ static int encrypt(int argc, char *argv[]) case 'a': ef = "pem"; break; case 'f': ef = optarg; break; case 'o': of = optarg; break; + case 'p': f |= f_progress; 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); @@ -205,16 +196,13 @@ static int encrypt(int argc, char *argv[]) if ((eo = getenc(ef)) == 0) die(EXIT_FAILURE, "encoding `%s' not found", ef); - if (optind == argc) - fp = stdin; - else if (strcmp(argv[optind], "-") == 0) { + fn = optind < argc ? argv[optind++] : "-"; + if (strcmp(fn, "-") == 0) fp = stdin; - optind++; - } else if ((fp = fopen(argv[optind], "rb")) == 0) { + else if ((fp = fopen(fn, "rb")) == 0) { die(EXIT_FAILURE, "couldn't open file `%s': %s", - argv[optind], strerror(errno)); - } else - optind++; + fn, strerror(errno)); + } if (!of || strcmp(of, "-") == 0) ofp = stdout; @@ -227,7 +215,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); @@ -245,6 +233,7 @@ static int encrypt(int argc, char *argv[]) buf_putu32(&b, k->id); if (sk) buf_putu32(&b, sk->id); assert(BOK(&b)); + if (s) GH_HASHBUF16(s->h, BBASE(&b), BLEN(&b)); chunk_write(e, &b); /* --- Build the KEM chunk --- */ @@ -254,6 +243,7 @@ static int encrypt(int argc, char *argv[]) die(EXIT_FAILURE, "failed to encapsulate key"); buf_init(&b, d.buf, d.len); BSTEP(&b, d.len); + if (s) GH_HASHBUF16(s->h, BBASE(&b), BLEN(&b)); chunk_write(e, &b); /* --- Write the signature chunk --- */ @@ -267,24 +257,32 @@ static int encrypt(int argc, char *argv[]) buf_init(&b, d.buf, d.len); BSTEP(&b, d.len); chunk_write(e, &b); - } + } /* --- Now do the main crypto --- */ + if (f & f_progress) { + if (fprogress_init(&ff, fn, fp)) { + die(EXIT_FAILURE, "failed to initialize progress display: %s", + strerror(errno)); + } + } + assert(GC_CLASS(c)->blksz <= sizeof(bb)); dstr_ensure(&d, sizeof(bb) + GM_CLASS(m)->hashsz); seq = 0; + chsz = MASK16 - GM_CLASS(m)->hashsz; 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); GC_SETIV(c, bb); } - n = fread(bb, 1, sizeof(bb), fp); + n = fread(bb, 1, chsz, fp); if (!n) break; + if (f & f_progress) fprogress_update(&ff, n); buf_init(&b, d.buf, d.sz); tag = buf_get(&b, GM_CLASS(m)->hashsz); ct = buf_get(&b, n); @@ -307,6 +305,7 @@ static int encrypt(int argc, char *argv[]) /* --- All done --- */ + if (f & f_progress) fprogress_done(&ff); e->ops->encdone(e); GM_DESTROY(m); GC_DESTROY(c); @@ -314,22 +313,26 @@ 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 +#undef f_progress } /*---- Decryption ---------------------------------------------------------*/ static int decrypt(int argc, char *argv[]) { - const char *of = 0; + const char *fn, *of = 0; FILE *ofp = 0, *rfp = 0; FILE *fp = 0; const char *ef = "binary"; + fprogress ff; int i; size_t n; dstr d = DSTR_INIT; @@ -354,6 +357,8 @@ static int decrypt(int argc, char *argv[]) #define f_bogus 1u #define f_buffer 2u +#define f_nocheck 4u +#define f_progress 8u for (;;) { static const struct option opt[] = { @@ -362,19 +367,23 @@ static int decrypt(int argc, char *argv[]) { "buffer", 0, 0, 'b' }, { "verbose", 0, 0, 'v' }, { "quiet", 0, 0, 'q' }, - { "format", OPTF_ARGREQ, 0, 'f' }, - { "output", OPTF_ARGREQ, 0, 'o' }, + { "nocheck", 0, 0, 'C' }, + { "format", OPTF_ARGREQ, 0, 'f' }, + { "output", OPTF_ARGREQ, 0, 'o' }, + { "progress", 0, 0, 'p' }, { 0, 0, 0, 0 } }; - i = mdwopt(argc, argv, "abf:o:qv", opt, 0, 0, 0); + i = mdwopt(argc, argv, "abf:o:pqvC", 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; + case 'p': f |= f_progress; break; default: f |= f_bogus; break; } } @@ -384,47 +393,67 @@ static int decrypt(int argc, char *argv[]) if ((eo = getenc(ef)) == 0) die(EXIT_FAILURE, "encoding `%s' not found", ef); - if (optind == argc) + fn = optind < argc ? argv[optind++] : "-"; + if (strcmp(fn, "-") == 0) fp = stdin; - else if (strcmp(argv[optind], "-") == 0) { - fp = stdin; - optind++; - } else if ((fp = fopen(argv[optind], eo->rmode)) == 0) { + else if ((fp = fopen(fn, eo->rmode)) == 0) { die(EXIT_FAILURE, "couldn't open file `%s': %s", - argv[optind], strerror(errno)); - } else - optind++; + fn, strerror(errno)); + } - 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"); + if (f & f_progress) { + if (fprogress_init(&ff, fn, fp)) { + die(EXIT_FAILURE, "failed to initialize progress display: %s", + strerror(errno)); + } + } + /* --- Read the header chunk --- */ chunk_read(e, &d, &b); + if (f & f_progress) + fprogress_update(&ff, BLEFT(&b)*e->ops->ncook/e->ops->nraw); if (buf_getu32(&b, &id)) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL malformed header: missing keyid\n"); exit(EXIT_FAILURE); } if ((k = key_byid(&kf, id)) == 0) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL key id %08lx not found\n", (unsigned long)id); exit(EXIT_FAILURE); } if (BLEFT(&b)) { if (buf_getu32(&b, &id)) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL malformed header: missing signature keyid\n"); exit(EXIT_FAILURE); } if ((sk = key_byid(&kf, id)) == 0) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL key id %08lx not found\n", (unsigned long)id); exit(EXIT_FAILURE); } } if (BLEFT(&b)) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL malformed header: junk at end\n"); exit(EXIT_FAILURE); } + if (sk) { + s = getsig(sk, "ccsig", 0); + if (!(f & f_nocheck) && verb && (err = s->ops->check(s)) != 0) { + dstr_reset(&d); + key_fulltag(sk, &d); + printf("WARN verification key %s fails check: %s\n", d.buf, err); + } + GH_HASHBUF16(s->h, BBASE(&b), BSZ(&b)); + } /* --- Find the key --- */ @@ -433,35 +462,41 @@ static int decrypt(int argc, char *argv[]) /* --- Read the KEM chunk --- */ chunk_read(e, &d, &b); + if (f & f_progress) + fprogress_update(&ff, BLEFT(&b)*e->ops->ncook/e->ops->nraw); if (setupkem(km, &d, &cx, &c, &m)) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL failed to decapsulate key\n"); exit(EXIT_FAILURE); } + if (s) GH_HASHBUF16(s->h, d.buf, d.len); /* --- Verify the signature, if there is one --- */ if (sk) { - s = getsig(sk, "ccsig", 0); - dstr_reset(&d); - key_fulltag(sk, &d); - if (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); GC_ENCRYPT(cx, 0, d.buf, 1024); GH_HASH(s->h, d.buf, 1024); chunk_read(e, &d, &b); + if (f & f_progress) + fprogress_update(&ff, BLEFT(&b)*e->ops->ncook/e->ops->nraw); if (s->ops->doit(s, &d)) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL signature verification failed\n"); exit(EXIT_FAILURE); } if (verb) { dstr_reset(&d); key_fulltag(sk, &d); + if (f & f_progress) fprogress_clear(&ff); printf("INFO good-signature %s\n", d.buf); } - } else if (verb) + freesig(s); + } else if (verb) { + if (f & f_progress) fprogress_clear(&ff); printf("INFO no-signature\n"); + } /* --- Now decrypt the main body --- */ @@ -471,12 +506,15 @@ static int decrypt(int argc, char *argv[]) } if (!(f & f_buffer)) { if ((ofp = fopen(of, "wb")) == 0) { + if (f & f_progress) fprogress_done(&ff); die(EXIT_FAILURE, "couldn't open file `%s' for output: %s", ofp, strerror(errno)); } rfp = ofp; - } else if ((rfp = tmpfile()) == 0) + } else if ((rfp = tmpfile()) == 0) { + if (f & f_progress) fprogress_done(&ff); die(EXIT_FAILURE, "couldn't create temporary file: %s", strerror(errno)); + } seq = 0; dstr_ensure(&d, GC_CLASS(c)->blksz); @@ -487,29 +525,35 @@ 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 (f & f_progress) + fprogress_update(&ff, BLEFT(&b)*e->ops->ncook/e->ops->nraw); if ((tag = buf_get(&b, GM_CLASS(m)->hashsz)) == 0) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL bad ciphertext chunk: no tag\n"); exit(EXIT_FAILURE); } GH_HASH(h, BCUR(&b), BLEFT(&b)); if (memcmp(tag, GH_DONE(h, 0), GM_CLASS(m)->hashsz) != 0) { + if (f & f_progress) fprogress_done(&ff); if (verb) 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)); if (fwrite(BCUR(&b), 1, BLEFT(&b), rfp) != BLEFT(&b)) { + if (f & f_progress) fprogress_done(&ff); if (verb) printf("FAIL error writing output: %s\n", strerror(errno)); exit(EXIT_FAILURE); } } + if (f & f_progress) fprogress_done(&ff); if (fflush(rfp) || ferror(rfp)) { if (verb) printf("FAIL error writing output: %s\n", strerror(errno)); exit(EXIT_FAILURE); @@ -520,36 +564,43 @@ static int decrypt(int argc, char *argv[]) of, strerror(errno)); } rewind(rfp); + if (f & f_progress) fprogress_init(&ff, "copying buffer", rfp); dstr_reset(&d); dstr_ensure(&d, 65536); if (verb && ofp == stdout) printf("DATA\n"); for (;;) { n = fread(d.buf, 1, d.sz, rfp); if (!n) break; - if (fwrite(d.buf, 1, n, ofp) < n) + if (f & f_progress) fprogress_update(&ff, n); + if (fwrite(d.buf, 1, n, ofp) < n) { + if (f & f_progress) fprogress_done(&ff); die(EXIT_FAILURE, "error writing output: %s", strerror(errno)); + } } + if (f & f_progress) fprogress_done(&ff); if (ferror(rfp) || fclose(rfp)) die(EXIT_FAILURE, "error unbuffering output: %s", strerror(errno)); } - if (ofp && (fflush(ofp) || ferror(ofp) || fclose(ofp))) - die(EXIT_FAILURE, "error writing output: %s", strerror(errno)); e->ops->decdone(e); if (verb && ofp != stdout) printf("OK decrypted successfully\n"); + if (ofp && (fflush(ofp) || ferror(ofp) || fclose(ofp))) + die(EXIT_FAILURE, "error writing output: %s", strerror(errno)); freeenc(e); GC_DESTROY(c); GC_DESTROY(cx); GM_DESTROY(m); freekem(km); - if (of) fclose(ofp); + if (fp != stdin) fclose(fp); key_close(&kf); dstr_destroy(&d); return (0); #undef f_bogus #undef f_buffer +#undef f_nocheck +#undef f_progress } /*----- Main code ---------------------------------------------------------*/ @@ -585,7 +636,7 @@ static cmd cmdtab[] = { CMD_ENCODE, CMD_DECODE, { "encrypt", encrypt, - "encrypt [-a] [-k TAG] [-s TAG] [-f FORMAT]\n\t\ + "encrypt [-apC] [-k TAG] [-s TAG] [-f FORMAT]\n\t\ [-o OUTPUT] [FILE]", "\ Options:\n\ \n\ @@ -594,18 +645,22 @@ 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\ +-p, --progress Show progress on large files.\n\ +-C, --nocheck Don't check the public key.\n\ " }, { "decrypt", decrypt, - "decrypt [-abqv] [-f FORMAT] [-o OUTPUT] [FILE]", "\ + "decrypt [-abpqvC] [-f FORMAT] [-o OUTPUT] [FILE]", "\ Options:\n\ \n\ -a, --armour Same as `-f pem'.\n\ -b, --buffer Buffer output until we're sure we have it all.\n\ -f, --format=FORMAT Decode as FORMAT.\n\ -o, --output=FILE Write output to FILE.\n\ +-p, --progress Show progress on large files.\n\ -q, --quiet Produce fewer messages.\n\ -v, --verbose Produce more verbose messages.\n\ -" }, /* ' emacs is confused */ +-C, --nocheck Don't check the private key.\n\ +" }, { 0, 0, 0 } };