* (c) 2004 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of Catacomb.
*
* 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,
#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";
* 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
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;
enc *e;
#define f_bogus 1u
+#define f_nocheck 2u
for (;;) {
static const struct option opt[] = {
{ "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' },
+ { "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;
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);
dstr_reset(&d);
key_fulltag(k, &d);
- e = initenc(eo, ofp, "CATCRYPT ENCRYPTED MESSAGE", 1);
+ e = initenc(eo, ofp, "CATCRYPT ENCRYPTED MESSAGE");
km = getkem(k, "cckem", 0);
- if ((err = km->ops->check(km)) != 0)
- moan("key `%s' fails check: %s", d.buf, err);
+ if (!(f & f_nocheck) && (err = km->ops->check(km)) != 0)
+ moan("key %s fails check: %s", d.buf, err);
if (sk) {
dstr_reset(&d);
key_fulltag(sk, &d);
s = getsig(sk, "ccsig", 1);
if ((err = s->ops->check(s)) != 0)
- moan("key `%s' fails check: %s", d.buf, err);
+ moan("key %s fails check: %s", d.buf, err);
}
/* --- Build the header chunk --- */
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 --- */
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 --- */
buf_init(&b, d.buf, d.len);
BSTEP(&b, d.len);
chunk_write(e, &b);
- }
+ }
/* --- Now do the main crypto --- */
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;
buf_init(&b, d.buf, d.sz);
tag = buf_get(&b, GM_CLASS(m)->hashsz);
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 ---------------------------------------------------------*/
static int decrypt(int argc, char *argv[])
{
const char *of = 0;
- FILE *ofp = 0;
+ FILE *ofp = 0, *rfp = 0;
FILE *fp = 0;
const char *ef = "binary";
int i;
+ size_t n;
dstr d = DSTR_INIT;
buf b;
key_file kf;
enc *e;
#define f_bogus 1u
+#define f_buffer 2u
+#define f_nocheck 4u
for (;;) {
static const struct option opt[] = {
{ "armour", 0, 0, 'a' },
{ "armor", 0, 0, 'a' },
+ { "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' },
{ 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;
} 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 = initenc(eo, fp, "CATCRYPT ENCRYPTED MESSAGE", 0);
+ e = initdec(eo, fp, checkbdry, "CATCRYPT ENCRYPTED MESSAGE");
/* --- Read the header chunk --- */
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 --- */
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);
if (verb) {
dstr_reset(&d);
key_fulltag(sk, &d);
- printf("INFO good signature from %s\n", d.buf);
+ printf("INFO good-signature %s\n", d.buf);
}
+ freesig(s);
} else if (verb)
- printf("INFO no signature packet\n");
+ printf("INFO no-signature\n");
/* --- Now decrypt the main body --- */
if (!of || strcmp(of, "-") == 0) {
ofp = stdout;
- if (verb) printf("DATA\n");
- } else if ((ofp = fopen(of, "wb")) == 0) {
- die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
- ofp, strerror(errno));
+ f |= f_buffer;
}
+ if (!(f & f_buffer)) {
+ if ((ofp = fopen(of, "wb")) == 0) {
+ die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
+ ofp, strerror(errno));
+ }
+ rfp = ofp;
+ } else if ((rfp = tmpfile()) == 0)
+ die(EXIT_FAILURE, "couldn't create temporary file: %s", strerror(errno));
seq = 0;
dstr_ensure(&d, GC_CLASS(c)->blksz);
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) {
- if (verb) printf("%sFAIL bad ciphertext chunk: no tag\n",
- ofp == stdout ? "\n" : "");
+ 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 (verb)
- printf("%sFAIL bad ciphertext chunk: authentication failure\n",
- ofp == stdout ? "\n" : "");
+ 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), ofp) != BLEFT(&b)) {
- if (verb) printf("%sFAIL error writing output: %s\n",
- ofp == stdout ? "\n" : "", strerror(errno));
+ if (fwrite(BCUR(&b), 1, BLEFT(&b), rfp) != BLEFT(&b)) {
+ if (verb) printf("FAIL error writing output: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
}
- if (fflush(ofp) || ferror(ofp)) {
- if (verb) printf("%sFAIL error writing output: %s\n",
- ofp == stdout ? "\n" : "", strerror(errno));
+ if (fflush(rfp) || ferror(rfp)) {
+ if (verb) printf("FAIL error writing output: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
+ if (f & f_buffer) {
+ if (!ofp && (ofp = fopen(of, "wb")) == 0) {
+ die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
+ of, strerror(errno));
+ }
+ rewind(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)
+ die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
+ }
+ 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)
GC_DESTROY(cx);
GM_DESTROY(m);
freekem(km);
+ if (fp != stdin) fclose(fp);
if (of) fclose(ofp);
key_close(&kf);
dstr_destroy(&d);
return (0);
#undef f_bogus
-}
-
-/*----- Test code ---------------------------------------------------------*/
-
-static int encode(int argc, char *argv[])
-{
- const char *of = 0;
- FILE *ofp = 0;
- FILE *fp = 0;
- const char *ef = "binary";
- const char *bd = "MESSAGE";
- int i;
- size_t n;
- char buf[4096];
- unsigned f = 0;
- const encops *eo;
- enc *e;
-
-#define f_bogus 1u
-
- for (;;) {
- static const struct option opt[] = {
- { "format", OPTF_ARGREQ, 0, 'f' },
- { "boundary", OPTF_ARGREQ, 0, 'b' },
- { "output", OPTF_ARGREQ, 0, 'o' },
- { 0, 0, 0, 0 }
- };
- i = mdwopt(argc, argv, "f:b:o:", opt, 0, 0, 0);
- if (i < 0) break;
- switch (i) {
- case 'f': ef = optarg; break;
- case 'b': bd = optarg; break;
- case 'o': of = optarg; break;
- default: f |= f_bogus; break;
- }
- }
- if (argc - optind > 1 || (f & f_bogus))
- die(EXIT_FAILURE, "Usage: encode [-OPTIONS] [FILE]");
-
- if ((eo = getenc(ef)) == 0)
- die(EXIT_FAILURE, "encoding `%s' not found", ef);
-
- if (optind == argc)
- fp = stdin;
- else if (strcmp(argv[optind], "-") == 0) {
- fp = stdin;
- optind++;
- } else if ((fp = fopen(argv[optind], "rb")) == 0) {
- die(EXIT_FAILURE, "couldn't open file `%s': %s",
- argv[optind], strerror(errno));
- } else
- optind++;
-
- if (!of || strcmp(of, "-") == 0)
- ofp = stdout;
- else if ((ofp = fopen(of, eo->wmode)) == 0) {
- die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
- ofp, strerror(errno));
- }
-
- e = initenc(eo, ofp, bd, 1);
-
- do {
- n = fread(buf, 1, sizeof(buf), fp);
- if (e->ops->write(e, buf, n))
- die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
- } while (n == sizeof(buf));
- e->ops->encdone(e);
- freeenc(e);
- return (0);
-
-#undef f_bogus
-}
-
-static int decode(int argc, char *argv[])
-{
- const char *of = 0;
- FILE *ofp = 0;
- FILE *fp = 0;
- const char *ef = "binary";
- const char *bd = 0;
- int i;
- char buf[4096];
- unsigned f = 0;
- const encops *eo;
- enc *e;
-
-#define f_bogus 1u
-
- for (;;) {
- static const struct option opt[] = {
- { "format", OPTF_ARGREQ, 0, 'f' },
- { "boundary", OPTF_ARGREQ, 0, 'b' },
- { "output", OPTF_ARGREQ, 0, 'o' },
- { 0, 0, 0, 0 }
- };
- i = mdwopt(argc, argv, "f:b:o:", opt, 0, 0, 0);
- if (i < 0) break;
- switch (i) {
- case 'f': ef = optarg; break;
- case 'b': bd = optarg; break;
- case 'o': of = optarg; break;
- default: f |= f_bogus; break;
- }
- }
- if (argc - optind > 1 || (f & f_bogus))
- die(EXIT_FAILURE, "Usage: decode [-OPTIONS] [FILE]");
-
- if ((eo = getenc(ef)) == 0)
- die(EXIT_FAILURE, "encoding `%s' not found", ef);
-
- if (optind == argc)
- fp = stdin;
- else if (strcmp(argv[optind], "-") == 0) {
- fp = stdin;
- optind++;
- } else if ((fp = fopen(argv[optind], eo->rmode)) == 0) {
- die(EXIT_FAILURE, "couldn't open file `%s': %s",
- argv[optind], strerror(errno));
- } else
- optind++;
-
- if (!of || strcmp(of, "-") == 0)
- ofp = stdout;
- else if ((ofp = fopen(of, "wb")) == 0) {
- die(EXIT_FAILURE, "couldn't open file `%s' for output: %s",
- ofp, strerror(errno));
- }
-
- e = initenc(eo, fp, bd, 0);
-
- do {
- if ((i = e->ops->read(e, buf, sizeof(buf))) < 0)
- die(EXIT_FAILURE, "error reading input: %s", strerror(errno));
- if (fwrite(buf, 1, i, ofp) < i)
- die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
- } while (i == sizeof(buf));
- e->ops->decdone(e);
- freeenc(e);
- return (0);
-
-#undef f_bogus
+#undef f_buffer
+#undef f_nocheck
}
/*----- Main code ---------------------------------------------------------*/
static cmd cmdtab[] = {
{ "help", cmd_help, "help [COMMAND...]" },
{ "show", cmd_show, "show [ITEM...]" },
- { "encode", encode,
- "encode [-f FORMAT] [-b LABEL] [-o OUTPUT] [FILE]",
- "\
-Options:\n\
-\n\
--f, --format=FORMAT Encode to FORMAT.\n\
--b, --boundary=LABEL PEM boundary is LABEL.\n\
--o, --output=FILE Write output to FILE.\n\
-" },
- { "decode", decode,
- "decode [-f FORMAT] [-b LABEL] [-o OUTPUT] [FILE]",
- "\
-Options:\n\
-\n\
--f, --format=FORMAT Decode from FORMAT.\n\
--b, --boundary=LABEL PEM boundary is LABEL.\n\
--o, --output=FILE Write output to FILE.\n\
-" },
+ 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\
-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 [-aqv] [-f FORMAT] [-o OUTPUT] [FILE]", "\
+ "decrypt [-abqvC] [-f FORMAT] [-o OUTPUT] [FILE]", "\
Options:\n\
\n\
-a, --armour Same as `-f pem'.\n\
--v, --verbose Produce more verbose messages.\n\
--q, --quiet Produce fewer messages.\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\
-" },
+-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 }
};
projects / u / mdw / catacomb / blobdiff