progs/key.c: Use `HASH' rather than `HASHALG' to denote a hash-function name.
[catacomb] / progs / key.c
CommitLineData
d03ab969 1/* -*-c-*-
2 *
d03ab969 3 * Simple key manager program
4 *
252c122d 5 * (c) 1999 Straylight/Edgeware
d03ab969 6 */
7
45c0fd36 8/*----- Licensing notice --------------------------------------------------*
d03ab969 9 *
10 * This file is part of Catacomb.
11 *
12 * Catacomb is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU Library General Public License as
14 * published by the Free Software Foundation; either version 2 of the
15 * License, or (at your option) any later version.
45c0fd36 16 *
d03ab969 17 * Catacomb is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU Library General Public License for more details.
45c0fd36 21 *
d03ab969 22 * You should have received a copy of the GNU Library General Public
23 * License along with Catacomb; if not, write to the Free
24 * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
25 * MA 02111-1307, USA.
26 */
27
d03ab969 28/*----- Header files ------------------------------------------------------*/
29
cd6eca43
MW
30#define _FILE_OFFSET_BITS 64
31
d03ab969 32#include "config.h"
33
58507325 34#include <ctype.h>
d03ab969 35#include <errno.h>
36#include <stdio.h>
37#include <stdlib.h>
38#include <string.h>
39#include <time.h>
40
2b4be81b 41#include <mLib/codec.h>
16810bbd 42#include <mLib/base32.h>
252c122d 43#include <mLib/base64.h>
16810bbd 44#include <mLib/hex.h>
141c1284 45#include <mLib/macros.h>
d03ab969 46#include <mLib/mdwopt.h>
47#include <mLib/quis.h>
48#include <mLib/report.h>
49#include <mLib/sub.h>
50
51#include <noise.h>
52#include <rand.h>
53
3688eb75 54#include "bintab.h"
252c122d 55#include "bbs.h"
052b36d0 56#include "dh.h"
252c122d 57#include "dsa.h"
34e4f738 58#include "dsarand.h"
1ba83484 59#include "ec.h"
60#include "ec-keys.h"
61#include "ectab.h"
252c122d 62#include "fibrand.h"
d03ab969 63#include "getdate.h"
3688eb75 64#include "gfreduce.h"
d03ab969 65#include "key.h"
252c122d 66#include "mp.h"
8de0fc89 67#include "mpint.h"
252c122d 68#include "mpmont.h"
69#include "mprand.h"
70#include "mptext.h"
71#include "pgen.h"
3563e365 72#include "ptab.h"
252c122d 73#include "rsa.h"
fc2d44af 74#include "x25519.h"
643eb1bb 75#include "x448.h"
d56fd9d1 76#include "ed25519.h"
c578d5d8 77#include "ed448.h"
d03ab969 78
c65df279 79#include "cc.h"
34e4f738 80#include "sha-mgf.h"
81#include "sha256-mgf.h"
82#include "sha224-mgf.h"
83#include "sha384-mgf.h"
84#include "sha512-mgf.h"
85#include "tiger-mgf.h"
86#include "rmd128-mgf.h"
87#include "rmd160-mgf.h"
88#include "rmd256-mgf.h"
89#include "rmd320-mgf.h"
90#include "md5-mgf.h"
91#include "dsarand.h"
92
d03ab969 93/*----- Handy global state ------------------------------------------------*/
94
95static const char *keyfile = "keyring";
96
97/*----- Useful shared functions -------------------------------------------*/
98
99/* --- @doopen@ --- *
100 *
101 * Arguments: @key_file *f@ = pointer to key file block
102 * @unsigned how@ = method to open file with
103 *
104 * Returns: ---
105 *
106 * Use: Opens a key file and handles errors by panicking
107 * appropriately.
108 */
109
110static void doopen(key_file *f, unsigned how)
111{
204607bd
MW
112 if (key_open(f, keyfile, how, key_moan, 0)){
113 die(EXIT_FAILURE, "couldn't open keyring `%s': %s",
114 keyfile, strerror(errno));
115 }
d03ab969 116}
117
118/* --- @doclose@ --- *
119 *
120 * Arguments: @key_file *f@ = pointer to key file block
121 *
122 * Returns: ---
123 *
124 * Use: Closes a key file and handles errors by panicking
125 * appropriately.
126 */
127
128static void doclose(key_file *f)
129{
130 switch (key_close(f)) {
131 case KWRITE_FAIL:
132 die(EXIT_FAILURE, "couldn't write file `%s': %s",
133 keyfile, strerror(errno));
134 case KWRITE_BROKEN:
135 die(EXIT_FAILURE, "keyring file `%s' broken: %s (repair manually)",
136 keyfile, strerror(errno));
137 }
138}
139
140/* --- @setattr@ --- *
141 *
142 * Arguments: @key_file *f@ = pointer to key file block
143 * @key *k@ = pointer to key block
144 * @char *v[]@ = array of assignments (overwritten!)
145 *
146 * Returns: ---
147 *
148 * Use: Applies the attribute assignments to the key.
149 */
150
151static void setattr(key_file *f, key *k, char *v[])
152{
153 while (*v) {
252c122d 154 int err;
d03ab969 155 char *p = *v;
156 size_t eq = strcspn(p, "=");
72f13799 157 if (!p[eq]) {
158 moan("invalid assignment: `%s' (ignored)", p);
159 v++;
160 continue;
161 }
d03ab969 162 p[eq] = 0;
163 p += eq + 1;
252c122d 164 if ((err = key_putattr(f, k, *v, *p ? p : 0)) != 0)
165 die(EXIT_FAILURE, "couldn't set attributes: %s", key_strerror(err));
d03ab969 166 v++;
167 }
168}
169
34e4f738 170/*----- Seeding -----------------------------------------------------------*/
171
172const struct seedalg { const char *p; grand *(*gen)(const void *, size_t); }
173seedtab[] = {
45c0fd36
MW
174 { "dsarand", dsarand_create },
175 { "rmd128-mgf", rmd128_mgfrand },
176 { "rmd160-mgf", rmd160_mgfrand },
177 { "rmd256-mgf", rmd256_mgfrand },
178 { "rmd320-mgf", rmd320_mgfrand },
179 { "sha-mgf", sha_mgfrand },
180 { "sha224-mgf", sha224_mgfrand },
181 { "sha256-mgf", sha256_mgfrand },
182 { "sha384-mgf", sha384_mgfrand },
183 { "sha512-mgf", sha512_mgfrand },
184 { "tiger-mgf", tiger_mgfrand },
34e4f738 185 { 0, 0 }
186};
187
188#define SEEDALG_DEFAULT (seedtab + 2)
189
252c122d 190/*----- Key generation ----------------------------------------------------*/
191
192/* --- Key generation parameters --- */
193
194typedef struct keyopts {
195 key_file *kf; /* Pointer to key file */
196 key *k; /* Pointer to the actual key */
197 dstr tag; /* Full tag name for the key */
198 unsigned f; /* Flags for the new key */
199 unsigned bits, qbits; /* Bit length for the new key */
1ba83484 200 const char *curve; /* Elliptic curve name/info */
34e4f738 201 grand *r; /* Random number source */
8de0fc89 202 mp *e; /* Public exponent */
252c122d 203 key *p; /* Parameters key-data */
204} keyopts;
205
16efd15b 206#define f_bogus 1u /* Error in parsing */
207#define f_lock 2u /* Passphrase-lock private key */
208#define f_quiet 4u /* Don't show a progress indicator */
209#define f_limlee 8u /* Generate Lim-Lee primes */
210#define f_subgroup 16u /* Generate a subgroup */
ce70ec47 211#define f_retag 32u /* Remove any existing tag */
4e67e30b 212#define f_kcdsa 64u /* Generate KCDSA primes */
252c122d 213
214/* --- @dolock@ --- *
215 *
216 * Arguments: @keyopts *k@ = key generation options
ef13e9a4 217 * @key_data **kd@ = pointer to key data to lock
252c122d 218 * @const char *t@ = tag suffix or null
219 *
220 * Returns: ---
221 *
222 * Use: Does passphrase locking on new keys.
223 */
224
ef13e9a4 225static void dolock(keyopts *k, key_data **kd, const char *t)
252c122d 226{
227 if (!(k->f & f_lock))
228 return;
229 if (t)
230 dstr_putf(&k->tag, ".%s", t);
ef13e9a4 231 if (key_plock(kd, 0, k->tag.buf))
252c122d 232 die(EXIT_FAILURE, "couldn't lock key");
233}
234
252c122d 235/* --- @copyparam@ --- *
236 *
237 * Arguments: @keyopts *k@ = pointer to key options
7532e25e 238 * @const char **pp@ = checklist of parameters, or null
252c122d 239 *
240 * Returns: Nonzero if parameters copied; zero if you have to generate
241 * them.
242 *
243 * Use: Copies parameters from a source key to the current one.
244 */
245
246static int copyparam(keyopts *k, const char **pp)
247{
248 key_filter kf;
4739c68a 249 key_attriter i;
9eef0c14 250 key_data *kd;
4739c68a 251 const char *n, *v;
f49fc4a0 252 dstr t = DSTR_INIT;
252c122d 253
9eef0c14
MW
254 kf.f = KCAT_SHARE;
255 kf.m = KF_CATMASK;
256
252c122d 257 /* --- Quick check if no parameters supplied --- */
258
259 if (!k->p)
260 return (0);
261
7532e25e 262 /* --- Copy the key data if there's anything we want --- */
252c122d 263
7532e25e
MW
264 if (pp) {
265
266 /* --- Run through the checklist --- */
267
268 key_fulltag(k->p, &t);
269 if ((k->p->k->e & KF_ENCMASK) != KENC_STRUCT)
270 die(EXIT_FAILURE, "parameter key `%s' is not structured", t.buf);
271 while (*pp) {
272 key_data *kd = key_structfind(k->p->k, *pp);
273 if (!kd) {
274 die(EXIT_FAILURE,
275 "bad parameter key `%s': parameter `%s' not found", t.buf, *pp);
276 }
277 if (!KEY_MATCH(kd, &kf)) {
278 die(EXIT_FAILURE,
279 "bad parameter key `%s': subkey `%s' is not shared", t.buf, *pp);
280 }
281 pp++;
f49fc4a0 282 }
252c122d 283
7532e25e 284 /* --- Copy over the parameters --- */
252c122d 285
7532e25e
MW
286 kd = key_copydata(k->p->k, &kf);
287 assert(kd);
288 key_setkeydata(k->kf, k->k, kd);
289 key_drop(kd);
290 }
4739c68a 291
292 /* --- Copy over attributes --- */
293
294 for (key_mkattriter(&i, k->p); key_nextattr(&i, &n, &v); )
295 key_putattr(k->kf, k->k, n, v);
296
297 /* --- Done --- */
298
f49fc4a0 299 dstr_destroy(&t);
252c122d 300 return (1);
301}
302
303/* --- @getmp@ --- *
304 *
305 * Arguments: @key_data *k@ = pointer to key data block
306 * @const char *tag@ = tag string to use
307 *
308 * Returns: Pointer to multiprecision integer key item.
309 *
310 * Use: Fetches an MP key component.
311 */
312
313static mp *getmp(key_data *k, const char *tag)
314{
315 k = key_structfind(k, tag);
316 if (!k)
317 die(EXIT_FAILURE, "unexpected failure looking up subkey `%s'", tag);
318 if ((k->e & KF_ENCMASK) != KENC_MP)
9b1663a5 319 die(EXIT_FAILURE, "subkey `%s' has an incompatible type", tag);
252c122d 320 return (k->u.m);
321}
322
052b36d0 323/* --- @keyrand@ --- *
324 *
325 * Arguments: @key_file *kf@ = pointer to key file
326 * @const char *id@ = pointer to key id (or null)
327 *
328 * Returns: ---
329 *
330 * Use: Keys the random number generator.
331 */
332
333static void keyrand(key_file *kf, const char *id)
334{
335 key *k;
336
337 /* --- Find the key --- */
338
339 if (id) {
340 if ((k = key_bytag(kf, id)) == 0)
341 die(EXIT_FAILURE, "key `%s' not found", id);
342 } else
343 k = key_bytype(kf, "catacomb-rand");
344
345 if (k) {
ef13e9a4 346 key_data *kd = k->k, *kkd;
347 key_incref(kd);
052b36d0 348
349 again:
350 switch (kd->e & KF_ENCMASK) {
351 case KENC_BINARY:
352 break;
353 case KENC_ENCRYPT: {
354 dstr d = DSTR_INIT;
355 key_fulltag(k, &d);
ef13e9a4 356 if (key_punlock(&kkd, kd, d.buf))
052b36d0 357 die(EXIT_FAILURE, "error unlocking key `%s'", d.buf);
358 dstr_destroy(&d);
ef13e9a4 359 key_drop(kd);
360 kd = kkd;
052b36d0 361 } goto again;
362 default: {
363 dstr d = DSTR_INIT;
364 key_fulltag(k, &d);
365 die(EXIT_FAILURE, "bad encoding type for key `%s'", d.buf);
366 } break;
367 }
368
369 /* --- Key the generator --- */
370
371 rand_key(RAND_GLOBAL, kd->u.k.k, kd->u.k.sz);
ef13e9a4 372 key_drop(kd);
052b36d0 373 }
374}
375
252c122d 376/* --- Key generation algorithms --- */
377
7532e25e
MW
378static void alg_empty(keyopts *k)
379{
380 copyparam(k, 0);
381 key_setkeydata(k->kf, k->k,
382 key_newstring(KCAT_SHARE, k->curve ? k->curve : "."));
383}
384
252c122d 385static void alg_binary(keyopts *k)
386{
387 unsigned sz;
388 unsigned m;
ef13e9a4 389 key_data *kd;
252c122d 390 octet *p;
391
392 if (!k->bits)
393 k->bits = 128;
7532e25e 394 copyparam(k, 0);
252c122d 395
396 sz = (k->bits + 7) >> 3;
397 p = sub_alloc(sz);
398 m = (1 << (((k->bits - 1) & 7) + 1)) - 1;
34e4f738 399 k->r->ops->fill(k->r, p, sz);
252c122d 400 *p &= m;
ef13e9a4 401 kd = key_newbinary(KCAT_SYMM | KF_BURN, p, sz);
252c122d 402 memset(p, 0, sz);
ef13e9a4 403 dolock(k, &kd, 0);
404 key_setkeydata(k->kf, k->k, kd);
405 key_drop(kd);
252c122d 406 sub_free(p, sz);
252c122d 407}
408
409static void alg_des(keyopts *k)
410{
411 unsigned sz;
412 octet *p;
ef13e9a4 413 key_data *kd;
252c122d 414 int i;
415
416 if (!k->bits)
1ba83484 417 k->bits = 168;
7532e25e 418 copyparam(k, 0);
252c122d 419 if (k->bits % 56 || k->bits > 168)
420 die(EXIT_FAILURE, "DES keys must be 56, 112 or 168 bits long");
421
422 sz = k->bits / 7;
423 p = sub_alloc(sz);
34e4f738 424 k->r->ops->fill(k->r, p, sz);
252c122d 425 for (i = 0; i < sz; i++) {
052b36d0 426 octet x = p[i] | 0x01;
252c122d 427 x = x ^ (x >> 4);
428 x = x ^ (x >> 2);
052b36d0 429 x = x ^ (x >> 1);
252c122d 430 p[i] = (p[i] & 0xfe) | (x & 0x01);
431 }
ef13e9a4 432 kd = key_newbinary(KCAT_SYMM | KF_BURN, p, sz);
252c122d 433 memset(p, 0, sz);
ef13e9a4 434 dolock(k, &kd, 0);
435 key_setkeydata(k->kf, k->k, kd);
436 key_drop(kd);
252c122d 437 sub_free(p, sz);
252c122d 438}
439
440static void alg_rsa(keyopts *k)
441{
ab0ca95f 442 rsa_priv rp;
ef13e9a4 443 key_data *kd, *kkd;
252c122d 444
445 /* --- Sanity checking --- */
446
7532e25e 447 copyparam(k, 0);
252c122d 448 if (!k->bits)
449 k->bits = 1024;
8de0fc89
MW
450 if (k->bits < 64)
451 die(EXIT_FAILURE, "RSA key too tiny");
452 if (!k->e)
453 k->e = mp_fromulong(MP_NEW, 65537);
252c122d 454
455 /* --- Generate the RSA parameters --- */
456
8de0fc89
MW
457 if (rsa_gen_e(&rp, k->bits, k->e, k->r, 0,
458 (k->f & f_quiet) ? 0 : pgen_ev, 0))
252c122d 459 die(EXIT_FAILURE, "RSA key generation failed");
460
461 /* --- Run a test encryption --- */
462
463 {
34e4f738 464 grand *g = fibrand_create(k->r->ops->word(k->r));
ab0ca95f 465 rsa_pub rpp;
252c122d 466 mp *m = mprand_range(MP_NEW, rp.n, g, 0);
467 mp *c;
468
ab0ca95f 469 rpp.n = rp.n;
470 rpp.e = rp.e;
471 c = rsa_qpubop(&rpp, MP_NEW, m);
472 c = rsa_qprivop(&rp, c, c, g);
252c122d 473
4b536f42 474 if (!MP_EQ(c, m))
252c122d 475 die(EXIT_FAILURE, "test encryption failed");
476 mp_drop(c);
477 mp_drop(m);
478 g->ops->destroy(g);
479 }
480
481 /* --- Allrighty then --- */
482
ef13e9a4 483 kd = key_newstruct();
484 key_structsteal(kd, "n", key_newmp(KCAT_PUB, rp.n));
485 key_structsteal(kd, "e", key_newmp(KCAT_PUB, rp.e));
486
487 kkd = key_newstruct();
488 key_structsteal(kkd, "d", key_newmp(KCAT_PRIV | KF_BURN, rp.d));
489 key_structsteal(kkd, "p", key_newmp(KCAT_PRIV | KF_BURN, rp.p));
490 key_structsteal(kkd, "q", key_newmp(KCAT_PRIV | KF_BURN, rp.q));
491 key_structsteal(kkd, "q-inv", key_newmp(KCAT_PRIV | KF_BURN, rp.q_inv));
492 key_structsteal(kkd, "d-mod-p", key_newmp(KCAT_PRIV | KF_BURN, rp.dp));
493 key_structsteal(kkd, "d-mod-q", key_newmp(KCAT_PRIV | KF_BURN, rp.dq));
494 dolock(k, &kkd, "private");
495 key_structsteal(kd, "private", kkd);
496 key_setkeydata(k->kf, k->k, kd);
497 key_drop(kd);
ab0ca95f 498 rsa_privfree(&rp);
252c122d 499}
500
501static void alg_dsaparam(keyopts *k)
502{
503 static const char *pl[] = { "q", "p", "g", 0 };
504 if (!copyparam(k, pl)) {
505 dsa_param dp;
506 octet *p;
507 size_t sz;
508 dstr d = DSTR_INIT;
2b4be81b 509 codec *c;
ef13e9a4 510 key_data *kd;
f4f8e305 511 dsa_seed ds;
252c122d 512
513 /* --- Choose appropriate bit lengths if necessary --- */
514
515 if (!k->qbits)
516 k->qbits = 160;
517 if (!k->bits)
ef13e9a4 518 k->bits = 1024;
252c122d 519
520 /* --- Allocate a seed block --- */
521
522 sz = (k->qbits + 7) >> 3;
523 p = sub_alloc(sz);
34e4f738 524 k->r->ops->fill(k->r, p, sz);
252c122d 525
526 /* --- Allocate the parameters --- */
527
f4f8e305 528 if (dsa_gen(&dp, k->qbits, k->bits, 0, p, sz, &ds,
40d5a112 529 (k->f & f_quiet) ? 0 : pgen_ev, 0))
252c122d 530 die(EXIT_FAILURE, "DSA parameter generation failed");
531
532 /* --- Store the parameters --- */
533
ef13e9a4 534 kd = key_newstruct();
535 key_structsteal(kd, "q", key_newmp(KCAT_SHARE, dp.q));
536 key_structsteal(kd, "p", key_newmp(KCAT_SHARE, dp.p));
537 key_structsteal(kd, "g", key_newmp(KCAT_SHARE, dp.g));
252c122d 538 mp_drop(dp.q);
539 mp_drop(dp.p);
540 mp_drop(dp.g);
ef13e9a4 541 key_setkeydata(k->kf, k->k, kd);
542 key_drop(kd);
252c122d 543
544 /* --- Store the seed for future verification --- */
545
2b4be81b
MW
546 c = base64_class.encoder(0, "", 0);
547 c->ops->code(c, ds.p, ds.sz, &d); c->ops->code(c, 0, 0, &d);
548 c->ops->destroy(c);
ef13e9a4 549 DPUTZ(&d);
252c122d 550 key_putattr(k->kf, k->k, "seed", d.buf);
f4f8e305 551 DRESET(&d);
552 dstr_putf(&d, "%u", ds.count);
553 key_putattr(k->kf, k->k, "count", d.buf);
554 xfree(ds.p);
252c122d 555 sub_free(p, sz);
556 dstr_destroy(&d);
557 }
558}
559
560static void alg_dsa(keyopts *k)
561{
562 mp *q, *p, *g;
563 mp *x, *y;
564 mpmont mm;
ef13e9a4 565 key_data *kd, *kkd;
252c122d 566
567 /* --- Get the shared parameters --- */
568
569 alg_dsaparam(k);
ef13e9a4 570 key_split(&k->k->k); kd = k->k->k;
252c122d 571 q = getmp(kd, "q");
572 p = getmp(kd, "p");
573 g = getmp(kd, "g");
574
575 /* --- Choose a private key --- */
576
34e4f738 577 x = mprand_range(MP_NEWSEC, q, k->r, 0);
252c122d 578 mpmont_create(&mm, p);
579 y = mpmont_exp(&mm, MP_NEW, g, x);
580
581 /* --- Store everything away --- */
582
ef13e9a4 583 key_structsteal(kd, "y", key_newmp(KCAT_PUB, y));
252c122d 584
ef13e9a4 585 kkd = key_newstruct();
586 key_structsteal(kkd, "x", key_newmp(KCAT_PRIV | KF_BURN, x));
587 dolock(k, &kkd, "private");
588 key_structsteal(kd, "private", kkd);
052b36d0 589
590 mp_drop(x); mp_drop(y);
252c122d 591}
592
593static void alg_dhparam(keyopts *k)
594{
052b36d0 595 static const char *pl[] = { "p", "q", "g", 0 };
ef13e9a4 596 key_data *kd;
252c122d 597 if (!copyparam(k, pl)) {
052b36d0 598 dh_param dp;
40d5a112 599 int rc;
252c122d 600
3563e365 601 if (k->curve) {
602 qd_parse qd;
3688eb75 603 group *g;
604 const char *e;
45c0fd36 605
141c1284 606 if (STRCMP(k->curve, ==, "list")) {
c65df279 607 unsigned i, w;
3688eb75 608 LIST("Built-in prime fields", stdout, ptab[i].name, ptab[i].name);
3563e365 609 exit(0);
610 }
611 qd.p = k->curve;
612 if (dh_parse(&qd, &dp))
3688eb75 613 die(EXIT_FAILURE, "error in field spec: %s", qd.e);
614 if (!qd_eofp(&qd))
615 die(EXIT_FAILURE, "junk at end of field spec");
616 if ((g = group_prime(&dp)) == 0)
617 die(EXIT_FAILURE, "invalid prime field");
618 if (!(k->f & f_quiet) && (e = G_CHECK(g, &rand_global)) != 0)
45c0fd36 619 moan("WARNING! group check failed: %s", e);
3688eb75 620 G_DESTROYGROUP(g);
3563e365 621 goto done;
622 }
45c0fd36 623
252c122d 624 if (!k->bits)
625 k->bits = 1024;
626
627 /* --- Choose a large safe prime number --- */
628
40d5a112 629 if (k->f & f_limlee) {
630 mp **f;
631 size_t nf;
632 if (!k->qbits)
633 k->qbits = 256;
634 rc = dh_limlee(&dp, k->qbits, k->bits,
635 (k->f & f_subgroup) ? DH_SUBGROUP : 0,
34e4f738 636 0, k->r, (k->f & f_quiet) ? 0 : pgen_ev, 0,
40d5a112 637 (k->f & f_quiet) ? 0 : pgen_evspin, 0, &nf, &f);
638 if (!rc) {
639 dstr d = DSTR_INIT;
640 size_t i;
641 for (i = 0; i < nf; i++) {
642 if (i)
643 dstr_puts(&d, ", ");
644 mp_writedstr(f[i], &d, 10);
645 mp_drop(f[i]);
646 }
647 key_putattr(k->kf, k->k, "factors", d.buf);
648 dstr_destroy(&d);
649 }
4e67e30b
MW
650 } else if (k->f & f_kcdsa) {
651 if (!k->qbits)
652 k->qbits = 256;
653 rc = dh_kcdsagen(&dp, k->qbits, k->bits, 0,
654 0, k->r, (k->f & f_quiet) ? 0 : pgen_ev, 0);
655 if (!rc) {
656 dstr d = DSTR_INIT;
657 mp *v = MP_NEW;
658
659 mp_writedstr(dp.q, &d, 10);
660 mp_div(&v, 0, dp.p, dp.q);
661 v = mp_lsr(v, v, 1);
662 dstr_puts(&d, ", ");
663 mp_writedstr(v, &d, 10);
664 mp_drop(v);
665 key_putattr(k->kf, k->k, "factors", d.buf);
666 dstr_destroy(&d);
667 }
40d5a112 668 } else
34e4f738 669 rc = dh_gen(&dp, k->qbits, k->bits, 0, k->r,
40d5a112 670 (k->f & f_quiet) ? 0 : pgen_ev, 0);
671
672 if (rc)
252c122d 673 die(EXIT_FAILURE, "Diffie-Hellman parameter generation failed");
674
3563e365 675 done:
ef13e9a4 676 kd = key_newstruct();
677 key_structsteal(kd, "p", key_newmp(KCAT_SHARE, dp.p));
678 key_structsteal(kd, "q", key_newmp(KCAT_SHARE, dp.q));
679 key_structsteal(kd, "g", key_newmp(KCAT_SHARE, dp.g));
052b36d0 680 mp_drop(dp.q);
681 mp_drop(dp.p);
682 mp_drop(dp.g);
ef13e9a4 683 key_setkeydata(k->kf, k->k, kd);
684 key_drop(kd);
34e4f738 685 }
252c122d 686}
687
688static void alg_dh(keyopts *k)
689{
690 mp *x, *y;
052b36d0 691 mp *p, *q, *g;
252c122d 692 mpmont mm;
ef13e9a4 693 key_data *kd, *kkd;
252c122d 694
695 /* --- Get the shared parameters --- */
696
697 alg_dhparam(k);
ef13e9a4 698 key_split(&k->k->k); kd = k->k->k;
252c122d 699 p = getmp(kd, "p");
052b36d0 700 q = getmp(kd, "q");
252c122d 701 g = getmp(kd, "g");
702
703 /* --- Choose a suitable private key --- *
704 *
705 * Since %$g$% has order %$q$%, choose %$x < q$%.
706 */
707
34e4f738 708 x = mprand_range(MP_NEWSEC, q, k->r, 0);
252c122d 709
710 /* --- Compute the public key %$y = g^x \bmod p$% --- */
711
712 mpmont_create(&mm, p);
052b36d0 713 y = mpmont_exp(&mm, MP_NEW, g, x);
252c122d 714 mpmont_destroy(&mm);
715
716 /* --- Store everything away --- */
717
ef13e9a4 718 key_structsteal(kd, "y", key_newmp(KCAT_PUB, y));
252c122d 719
ef13e9a4 720 kkd = key_newstruct();
721 key_structsteal(kkd, "x", key_newmp(KCAT_PRIV | KF_BURN, x));
722 dolock(k, &kkd, "private");
723 key_structsteal(kd, "private", kkd);
052b36d0 724
725 mp_drop(x); mp_drop(y);
252c122d 726}
727
728static void alg_bbs(keyopts *k)
729{
ab0ca95f 730 bbs_priv bp;
ef13e9a4 731 key_data *kd, *kkd;
252c122d 732
733 /* --- Sanity checking --- */
734
7532e25e 735 copyparam(k, 0);
252c122d 736 if (!k->bits)
737 k->bits = 1024;
738
739 /* --- Generate the BBS parameters --- */
740
34e4f738 741 if (bbs_gen(&bp, k->bits, k->r, 0,
052b36d0 742 (k->f & f_quiet) ? 0 : pgen_ev, 0))
252c122d 743 die(EXIT_FAILURE, "Blum-Blum-Shub key generation failed");
252c122d 744
745 /* --- Allrighty then --- */
746
ef13e9a4 747 kd = key_newstruct();
748 key_structsteal(kd, "n", key_newmp(KCAT_PUB, bp.n));
252c122d 749
ef13e9a4 750 kkd = key_newstruct();
751 key_structsteal(kkd, "p", key_newmp(KCAT_PRIV | KF_BURN, bp.p));
752 key_structsteal(kkd, "q", key_newmp(KCAT_PRIV | KF_BURN, bp.q));
753 dolock(k, &kkd, "private");
754 key_structsteal(kd, "private", kkd);
755 key_setkeydata(k->kf, k->k, kd);
756 key_drop(kd);
252c122d 757
ab0ca95f 758 bbs_privfree(&bp);
252c122d 759}
760
3688eb75 761static void alg_binparam(keyopts *k)
762{
763 static const char *pl[] = { "p", "q", "g", 0 };
764 if (!copyparam(k, pl)) {
765 gbin_param gb;
766 qd_parse qd;
767 group *g;
768 const char *e;
ef13e9a4 769 key_data *kd;
3688eb75 770
771 /* --- Decide on a field --- */
772
773 if (!k->bits) k->bits = 128;
141c1284 774 if (k->curve && STRCMP(k->curve, ==, "list")) {
3688eb75 775 unsigned i, w;
776 LIST("Built-in binary fields", stdout,
777 bintab[i].name, bintab[i].name);
778 exit(0);
779 }
780 if (!k->curve) {
781 if (k->bits <= 40) k->curve = "p1363-40";
782 else if (k->bits <= 56) k->curve = "p1363-56";
783 else if (k->bits <= 64) k->curve = "p1363-64";
784 else if (k->bits <= 80) k->curve = "p1363-80";
785 else if (k->bits <= 112) k->curve = "p1363-112";
786 else if (k->bits <= 128) k->curve = "p1363-128";
787 else {
788 die(EXIT_FAILURE,
789 "no built-in binary fields provide %u-bit security",
790 k->bits);
791 }
792 }
793
794 /* --- Check it --- */
795
796 qd.e = 0;
797 qd.p = k->curve;
798 if (dhbin_parse(&qd, &gb))
799 die(EXIT_FAILURE, "error in field spec: %s", qd.e);
800 if (!qd_eofp(&qd))
801 die(EXIT_FAILURE, "junk at end of field spec");
802 if ((g = group_binary(&gb)) == 0)
803 die(EXIT_FAILURE, "invalid binary field");
804 if (!(k->f & f_quiet) && (e = G_CHECK(g, &rand_global)) != 0)
805 moan("WARNING! group check failed: %s", e);
806 G_DESTROYGROUP(g);
807
808 /* --- Write out the answer --- */
809
ef13e9a4 810 kd = key_newstruct();
811 key_structsteal(kd, "p", key_newmp(KCAT_SHARE, gb.p));
812 key_structsteal(kd, "q", key_newmp(KCAT_SHARE, gb.q));
813 key_structsteal(kd, "g", key_newmp(KCAT_SHARE, gb.g));
3688eb75 814 mp_drop(gb.q);
815 mp_drop(gb.p);
816 mp_drop(gb.g);
ef13e9a4 817 key_setkeydata(k->kf, k->k, kd);
818 key_drop(kd);
3688eb75 819 }
820}
821
822static void alg_bin(keyopts *k)
823{
824 mp *x, *y;
825 mp *p, *q, *g;
826 gfreduce r;
ef13e9a4 827 key_data *kd, *kkd;
3688eb75 828
829 /* --- Get the shared parameters --- */
830
831 alg_binparam(k);
ef13e9a4 832 key_split(&k->k->k); kd = k->k->k;
3688eb75 833 p = getmp(kd, "p");
834 q = getmp(kd, "q");
835 g = getmp(kd, "g");
836
837 /* --- Choose a suitable private key --- *
838 *
839 * Since %$g$% has order %$q$%, choose %$x < q$%.
840 */
841
842 x = mprand_range(MP_NEWSEC, q, k->r, 0);
843
844 /* --- Compute the public key %$y = g^x \bmod p$% --- */
845
846 gfreduce_create(&r, p);
847 y = gfreduce_exp(&r, MP_NEW, g, x);
848 gfreduce_destroy(&r);
849
850 /* --- Store everything away --- */
851
ef13e9a4 852 key_structsteal(kd, "y", key_newmp(KCAT_PUB, y));
3688eb75 853
ef13e9a4 854 kkd = key_newstruct();
855 key_structsteal(kkd, "x", key_newmp(KCAT_PRIV | KF_BURN, x));
856 dolock(k, &kkd, "private");
857 key_structsteal(kd, "private", kkd);
3688eb75 858
859 mp_drop(x); mp_drop(y);
860}
861
1ba83484 862static void alg_ecparam(keyopts *k)
863{
864 static const char *pl[] = { "curve", 0 };
865 if (!copyparam(k, pl)) {
866 ec_info ei;
867 const char *e;
ef13e9a4 868 key_data *kd;
1ba83484 869
870 /* --- Decide on a curve --- */
871
872 if (!k->bits) k->bits = 256;
141c1284 873 if (k->curve && STRCMP(k->curve, ==, "list")) {
c65df279 874 unsigned i, w;
875 LIST("Built-in elliptic curves", stdout,
876 ectab[i].name, ectab[i].name);
3563e365 877 exit(0);
878 }
1ba83484 879 if (!k->curve) {
880 if (k->bits <= 56) k->curve = "secp112r1";
881 else if (k->bits <= 64) k->curve = "secp128r1";
882 else if (k->bits <= 80) k->curve = "secp160r1";
883 else if (k->bits <= 96) k->curve = "secp192r1";
884 else if (k->bits <= 112) k->curve = "secp224r1";
885 else if (k->bits <= 128) k->curve = "secp256r1";
886 else if (k->bits <= 192) k->curve = "secp384r1";
887 else if (k->bits <= 256) k->curve = "secp521r1";
888 else
889 die(EXIT_FAILURE, "no built-in curves provide %u-bit security",
890 k->bits);
891 }
892
893 /* --- Check it --- */
894
895 if ((e = ec_getinfo(&ei, k->curve)) != 0)
896 die(EXIT_FAILURE, "error in curve spec: %s", e);
34e4f738 897 if (!(k->f & f_quiet) && (e = ec_checkinfo(&ei, k->r)) != 0)
1ba83484 898 moan("WARNING! curve check failed: %s", e);
899 ec_freeinfo(&ei);
900
901 /* --- Write out the answer --- */
902
ef13e9a4 903 kd = key_newstruct();
904 key_structsteal(kd, "curve", key_newstring(KCAT_SHARE, k->curve));
905 key_setkeydata(k->kf, k->k, kd);
906 key_drop(kd);
1ba83484 907 }
908}
909
910static void alg_ec(keyopts *k)
911{
ef13e9a4 912 key_data *kd;
1ba83484 913 key_data *kkd;
914 mp *x = MP_NEW;
915 ec p = EC_INIT;
916 const char *e;
917 ec_info ei;
918
919 /* --- Get the curve --- */
920
921 alg_ecparam(k);
ef13e9a4 922 key_split(&k->k->k); kd = k->k->k;
1ba83484 923 if ((kkd = key_structfind(kd, "curve")) == 0)
924 die(EXIT_FAILURE, "unexpected failure looking up subkey `curve')");
925 if ((kkd->e & KF_ENCMASK) != KENC_STRING)
926 die(EXIT_FAILURE, "subkey `curve' is not a string");
927 if ((e = ec_getinfo(&ei, kkd->u.p)) != 0)
928 die(EXIT_FAILURE, "error in curve spec: %s", e);
929
930 /* --- Invent a private exponent and compute the public key --- */
931
34e4f738 932 x = mprand_range(MP_NEWSEC, ei.r, k->r, 0);
1ba83484 933 ec_mul(ei.c, &p, &ei.g, x);
934
935 /* --- Store everything away --- */
936
ef13e9a4 937 key_structsteal(kd, "p", key_newec(KCAT_PUB, &p));
938
939 kkd = key_newstruct();
940 key_structsteal(kkd, "x", key_newmp(KCAT_PRIV | KF_BURN, x));
941 dolock(k, &kkd, "private");
942 key_structsteal(kd, "private", kkd);
1ba83484 943
944 /* --- Done --- */
945
946 ec_freeinfo(&ei);
947 mp_drop(x);
948}
949
593f7bd3
MW
950#define XDHS(_) \
951 _(x25519, X25519, "X25519") \
952 _(x448, X448, "X448")
953
954#define XDHALG(xdh, XDH, name) \
955 \
956 static void alg_##xdh(keyopts *k) \
957 { \
958 key_data *kd, *kkd; \
959 octet priv[XDH##_KEYSZ], pub[XDH##_PUBSZ]; \
960 \
961 copyparam(k, 0); \
962 k->r->ops->fill(k->r, priv, sizeof(priv)); \
963 xdh(pub, priv, xdh##_base); \
964 kkd = key_newstruct(); \
965 key_structsteal(kkd, "priv", \
966 key_newbinary(KCAT_PRIV | KF_BURN, \
967 priv, sizeof(priv))); \
968 kd = key_newstruct(); \
969 key_structsteal(kd, "private", kkd); \
970 key_structsteal(kd, "pub", \
971 key_newbinary(KCAT_PUB, pub, sizeof(pub))); \
972 \
973 key_setkeydata(k->kf, k->k, kd); \
974 }
d56fd9d1 975
593f7bd3
MW
976XDHS(XDHALG)
977#undef XDHALG
978
979#define EDDSAS(_) \
c578d5d8
MW
980 _(ed25519, ED25519, "Ed25519") \
981 _(ed448, ED448, "Ed448")
593f7bd3
MW
982
983#define EDDSAALG(ed, ED, name) \
984 \
985 static void alg_##ed(keyopts *k) \
986 { \
987 key_data *kd, *kkd; \
988 octet priv[ED##_KEYSZ], pub[ED##_PUBSZ]; \
989 \
990 copyparam(k, 0); \
991 k->r->ops->fill(k->r, priv, sizeof(priv)); \
992 ed##_pubkey(pub, priv, sizeof(priv)); \
993 kkd = key_newstruct(); \
994 key_structsteal(kkd, "priv", \
995 key_newbinary(KCAT_PRIV | KF_BURN, \
996 priv, sizeof(priv))); \
997 kd = key_newstruct(); \
998 key_structsteal(kd, "private", kkd); \
999 key_structsteal(kd, "pub", \
1000 key_newbinary(KCAT_PUB, pub, sizeof(pub))); \
1001 \
1002 key_setkeydata(k->kf, k->k, kd); \
1003 }
d56fd9d1 1004
593f7bd3
MW
1005EDDSAS(EDDSAALG)
1006#undef EDDSAALG
d56fd9d1 1007
252c122d 1008/* --- The algorithm tables --- */
1009
1010typedef struct keyalg {
1011 const char *name;
1012 void (*proc)(keyopts *o);
1013 const char *help;
1014} keyalg;
1015
1016static keyalg algtab[] = {
1017 { "binary", alg_binary, "Plain binary data" },
1018 { "des", alg_des, "Binary with DES-style parity" },
1019 { "rsa", alg_rsa, "RSA public-key encryption" },
3688eb75 1020 { "bbs", alg_bbs, "Blum-Blum-Shub generator" },
252c122d 1021 { "dsa", alg_dsa, "DSA digital signatures" },
1022 { "dsa-param", alg_dsaparam, "DSA shared parameters" },
1023 { "dh", alg_dh, "Diffie-Hellman key exchange" },
1024 { "dh-param", alg_dhparam, "Diffie-Hellman parameters" },
3688eb75 1025 { "bindh", alg_bin, "DH over a binary field" },
1026 { "bindh-param", alg_binparam, "Binary-field DH parameters" },
1ba83484 1027 { "ec-param", alg_ecparam, "Elliptic curve parameters" },
1028 { "ec", alg_ec, "Elliptic curve crypto" },
593f7bd3
MW
1029#define XDHTAB(xdh, XDH, name) \
1030 { #xdh, alg_##xdh, "" name " key exchange" },
1031 XDHS(XDHTAB)
1032#undef XDHTAB
1033#define EDDSATAB(ed, ED, name) \
1034 { #ed, alg_##ed, "" name " digital signatures" },
1035 EDDSAS(EDDSATAB)
1036#undef EDDSATAB
7532e25e 1037 { "empty", alg_empty, "Empty parametrs-only key" },
252c122d 1038 { 0, 0 }
1039};
d03ab969 1040
1041/* --- @cmd_add@ --- */
1042
1043static int cmd_add(int argc, char *argv[])
1044{
1045 key_file f;
d03ab969 1046 time_t exp = KEXP_EXPIRE;
90a88ae3 1047 uint32 kid = rand_global.ops->word(&rand_global);
252c122d 1048 const char *tag = 0, *ptag = 0;
d03ab969 1049 const char *c = 0;
252c122d 1050 keyalg *alg = algtab;
052b36d0 1051 const char *rtag = 0;
34e4f738 1052 const struct seedalg *sa = SEEDALG_DEFAULT;
8de0fc89 1053 keyopts k = { 0, 0, DSTR_INIT, 0, 0, 0, 0, 0, 0 };
34e4f738 1054 const char *seed = 0;
1055 k.r = &rand_global;
d03ab969 1056
1057 /* --- Parse options for the subcommand --- */
1058
1059 for (;;) {
1060 static struct option opt[] = {
252c122d 1061 { "algorithm", OPTF_ARGREQ, 0, 'a' },
d03ab969 1062 { "bits", OPTF_ARGREQ, 0, 'b' },
252c122d 1063 { "qbits", OPTF_ARGREQ, 0, 'B' },
1064 { "parameters", OPTF_ARGREQ, 0, 'p' },
d03ab969 1065 { "expire", OPTF_ARGREQ, 0, 'e' },
1066 { "comment", OPTF_ARGREQ, 0, 'c' },
252c122d 1067 { "tag", OPTF_ARGREQ, 0, 't' },
ce70ec47 1068 { "rand-id", OPTF_ARGREQ, 0, 'R' },
90a88ae3 1069 { "key-id", OPTF_ARGREQ, 0, 'I' },
1ba83484 1070 { "curve", OPTF_ARGREQ, 0, 'C' },
34e4f738 1071 { "seedalg", OPTF_ARGREQ, 0, 'A' },
1072 { "seed", OPTF_ARGREQ, 0, 's' },
1073 { "newseed", OPTF_ARGREQ, 0, 'n' },
8de0fc89 1074 { "public-exponent", OPTF_ARGREQ, 0, 'E' },
252c122d 1075 { "lock", 0, 0, 'l' },
1076 { "quiet", 0, 0, 'q' },
40d5a112 1077 { "lim-lee", 0, 0, 'L' },
1078 { "subgroup", 0, 0, 'S' },
4e67e30b 1079 { "kcdsa", 0, 0, 'K' },
d03ab969 1080 { 0, 0, 0, 0 }
1081 };
8de0fc89 1082 int i = mdwopt(argc, argv, "+a:b:B:p:e:c:t:R:I:C:A:s:n:E:lqrLKS",
a9fcea0e 1083 opt, 0, 0, 0);
d03ab969 1084 if (i < 0)
1085 break;
1086
1087 /* --- Handle the various options --- */
1088
1089 switch (i) {
1090
252c122d 1091 /* --- Read an algorithm name --- */
1092
1093 case 'a': {
1094 keyalg *a;
1095 size_t sz = strlen(optarg);
1096
141c1284 1097 if (STRCMP(optarg, ==, "list")) {
252c122d 1098 for (a = algtab; a->name; a++)
1099 printf("%-10s %s\n", a->name, a->help);
1100 return (0);
1101 }
1102
1103 alg = 0;
1104 for (a = algtab; a->name; a++) {
141c1284 1105 if (STRNCMP(optarg, ==, a->name, sz)) {
252c122d 1106 if (a->name[sz] == 0) {
1107 alg = a;
1108 break;
1109 } else if (alg)
1110 die(EXIT_FAILURE, "ambiguous algorithm name `%s'", optarg);
1111 else
1112 alg = a;
1113 }
1114 }
1115 if (!alg)
1116 die(EXIT_FAILURE, "unknown algorithm name `%s'", optarg);
1117 } break;
1118
d03ab969 1119 /* --- Bits must be nonzero and a multiple of 8 --- */
1120
252c122d 1121 case 'b': {
1122 char *p;
1123 k.bits = strtoul(optarg, &p, 0);
1124 if (k.bits == 0 || *p != 0)
1125 die(EXIT_FAILURE, "bad bitlength `%s'", optarg);
1126 } break;
1127
1128 case 'B': {
1129 char *p;
1130 k.qbits = strtoul(optarg, &p, 0);
1131 if (k.qbits == 0 || *p != 0)
1132 die(EXIT_FAILURE, "bad bitlength `%s'", optarg);
1133 } break;
1134
1135 /* --- Parameter selection --- */
1136
1137 case 'p':
1138 ptag = optarg;
d03ab969 1139 break;
1140
1141 /* --- Expiry dates get passed to @get_date@ for parsing --- */
1142
1143 case 'e':
141c1284 1144 if (STRCMP(optarg, ==, "forever"))
d03ab969 1145 exp = KEXP_FOREVER;
1146 else {
1147 exp = get_date(optarg, 0);
1148 if (exp == -1)
252c122d 1149 die(EXIT_FAILURE, "bad expiry date `%s'", optarg);
d03ab969 1150 }
1151 break;
1152
1153 /* --- Store comments without interpretation --- */
1154
1155 case 'c':
252c122d 1156 if (key_chkcomment(optarg))
1157 die(EXIT_FAILURE, "bad comment string `%s'", optarg);
d03ab969 1158 c = optarg;
1159 break;
1160
1ba83484 1161 /* --- Elliptic curve parameters --- */
1162
1163 case 'C':
1ba83484 1164 k.curve = optarg;
1165 break;
1166
252c122d 1167 /* --- Store tags --- */
1168
1169 case 't':
1170 if (key_chkident(optarg))
1171 die(EXIT_FAILURE, "bad tag string `%s'", optarg);
1172 tag = optarg;
1173 break;
ce70ec47 1174 case 'r':
1175 k.f |= f_retag;
1176 break;
252c122d 1177
34e4f738 1178 /* --- Seeding --- */
1179
1180 case 'A': {
1181 const struct seedalg *ss;
141c1284 1182 if (STRCMP(optarg, ==, "list")) {
34e4f738 1183 printf("Seed algorithms:\n");
1184 for (ss = seedtab; ss->p; ss++)
1185 printf(" %s\n", ss->p);
1186 exit(0);
1187 }
1188 if (seed) die(EXIT_FAILURE, "seed already set -- put -A first");
1189 sa = 0;
1190 for (ss = seedtab; ss->p; ss++) {
141c1284 1191 if (STRCMP(optarg, ==, ss->p))
34e4f738 1192 sa = ss;
1193 }
1194 if (!sa)
1195 die(EXIT_FAILURE, "seed algorithm `%s' not known", optarg);
1196 } break;
1197
1198 case 's': {
2b4be81b
MW
1199 codec *c;
1200 int rc;
34e4f738 1201 dstr d = DSTR_INIT;
45c0fd36 1202 if (seed) die(EXIT_FAILURE, "seed already set");
2b4be81b
MW
1203 c = base64_class.decoder(CDCF_IGNEQPAD);
1204 if ((rc = c->ops->code(c, optarg, strlen(optarg), &d)) != 0 ||
1205 (rc = c->ops->code(c, 0, 0, &d)) != 0)
1206 die(EXIT_FAILURE, "invalid seed base64: %s", codec_strerror(rc));
1207 c->ops->destroy(c);
34e4f738 1208 k.r = sa->gen(d.buf, d.len);
1209 seed = optarg;
1210 dstr_destroy(&d);
1211 } break;
45c0fd36 1212
34e4f738 1213 case 'n': {
2b4be81b 1214 codec *c;
34e4f738 1215 dstr d = DSTR_INIT;
1216 char *p;
1217 unsigned n = strtoul(optarg, &p, 0);
1218 if (n == 0 || *p != 0 || n % 8 != 0)
1219 die(EXIT_FAILURE, "bad seed length `%s'", optarg);
45c0fd36 1220 if (seed) die(EXIT_FAILURE, "seed already set");
34e4f738 1221 n /= 8;
1222 p = xmalloc(n);
1223 rand_get(RAND_GLOBAL, p, n);
2b4be81b
MW
1224 c = base64_class.encoder(0, "", 0);
1225 c->ops->code(c, p, n, &d); c->ops->code(c, 0, 0, &d);
1226 c->ops->destroy(c);
34e4f738 1227 seed = d.buf;
1228 k.r = sa->gen(p, n);
1229 } break;
90a88ae3
MW
1230
1231 /* --- Key id --- */
1232
1233 case 'I': {
1234 char *p;
1235 unsigned long id;
1236
1237 errno = 0;
1238 id = strtoul(optarg, &p, 16);
1239 if (errno || *p || id > MASK32)
1240 die(EXIT_FAILURE, "bad key-id `%s'", optarg);
1241 kid = id;
1242 } break;
45c0fd36 1243
8de0fc89
MW
1244 /* --- Public exponent --- */
1245
1246 case 'E': {
1247 char *p;
1248 k.e = mp_readstring(k.e, optarg, &p, 0);
1249 if (!k.e || *p || MP_CMP(k.e, <, MP_THREE) || MP_EVENP(k.e))
1250 die(EXIT_FAILURE, "bad exponent `%s'", optarg);
1251 } break;
1252
252c122d 1253 /* --- Other flags --- */
1254
ce70ec47 1255 case 'R':
052b36d0 1256 rtag = optarg;
1257 break;
252c122d 1258 case 'l':
1259 k.f |= f_lock;
1260 break;
1261 case 'q':
1262 k.f |= f_quiet;
1263 break;
40d5a112 1264 case 'L':
1265 k.f |= f_limlee;
1266 break;
4e67e30b
MW
1267 case 'K':
1268 k.f |= f_kcdsa;
1269 break;
40d5a112 1270 case 'S':
1271 k.f |= f_subgroup;
1272 break;
252c122d 1273
d03ab969 1274 /* --- Other things are bogus --- */
1275
1276 default:
252c122d 1277 k.f |= f_bogus;
d03ab969 1278 break;
1279 }
1280 }
1281
252c122d 1282 /* --- Various sorts of bogosity --- */
d03ab969 1283
252c122d 1284 if ((k.f & f_bogus) || optind + 1 > argc) {
d03ab969 1285 die(EXIT_FAILURE,
c65df279 1286 "Usage: add [OPTIONS] TYPE [ATTR...]");
d03ab969 1287 }
252c122d 1288 if (key_chkident(argv[optind]))
1289 die(EXIT_FAILURE, "bad key type `%s'", argv[optind]);
1290
1291 /* --- Set up various bits of the state --- */
1292
d03ab969 1293 if (exp == KEXP_EXPIRE)
1294 exp = time(0) + 14 * 24 * 60 * 60;
1295
252c122d 1296 /* --- Open the file and create the basic key block --- *
1297 *
1298 * Keep on generating keyids until one of them doesn't collide.
1299 */
d03ab969 1300
252c122d 1301 doopen(&f, KOPEN_WRITE);
1302 k.kf = &f;
1303
052b36d0 1304 /* --- Key the generator --- */
1305
1306 keyrand(&f, rtag);
1307
252c122d 1308 for (;;) {
252c122d 1309 int err;
90a88ae3 1310 if ((err = key_new(&f, kid, argv[optind], exp, &k.k)) == 0)
252c122d 1311 break;
ef13e9a4 1312 else if (err != KERR_DUPID)
252c122d 1313 die(EXIT_FAILURE, "error adding new key: %s", key_strerror(err));
1314 }
d03ab969 1315
252c122d 1316 /* --- Set various simple attributes --- */
d03ab969 1317
252c122d 1318 if (tag) {
ce70ec47 1319 int err;
1320 key *kk;
1321 if (k.f & f_retag) {
694fc3a8 1322 if ((kk = key_bytag(&f, tag)) != 0 &&
1323 kk->tag &&
141c1284 1324 STRCMP(kk->tag, ==, tag))
ce70ec47 1325 key_settag(&f, kk, 0);
1326 }
1327 if ((err = key_settag(&f, k.k, tag)) != 0)
252c122d 1328 die(EXIT_FAILURE, "error setting key tag: %s", key_strerror(err));
1329 }
d03ab969 1330
252c122d 1331 if (c) {
1332 int err = key_setcomment(&f, k.k, c);
1333 if (err)
1334 die(EXIT_FAILURE, "error setting key comment: %s", key_strerror(err));
1335 }
1336
1337 setattr(&f, k.k, argv + optind + 1);
34e4f738 1338 if (seed) {
1339 key_putattr(&f, k.k, "genseed", seed);
1340 key_putattr(&f, k.k, "seedalg", sa->p);
1341 }
252c122d 1342
1343 key_fulltag(k.k, &k.tag);
1344
1345 /* --- Find the parameter key --- */
1346
131babe4
MW
1347 if (ptag && (k.p = key_bytag(&f, ptag)) == 0)
1348 die(EXIT_FAILURE, "parameter key `%s' not found", ptag);
252c122d 1349
1350 /* --- Now generate the actual key data --- */
1351
1352 alg->proc(&k);
1353
1354 /* --- Done --- */
d03ab969 1355
ef13e9a4 1356 dstr_destroy(&k.tag);
d03ab969 1357 doclose(&f);
1358 return (0);
1359}
1360
252c122d 1361/*----- Key listing -------------------------------------------------------*/
1362
1363/* --- Listing options --- */
1364
1365typedef struct listopts {
1366 const char *tfmt; /* Date format (@strftime@-style) */
1367 int v; /* Verbosity level */
1368 unsigned f; /* Various flags */
1369 time_t t; /* Time now (for key expiry) */
1370 key_filter kf; /* Filter for matching keys */
1371} listopts;
1372
1373/* --- Listing flags --- */
1374
16efd15b 1375#define f_newline 2u /* Write newline before next entry */
1376#define f_attr 4u /* Written at least one attribute */
1377#define f_utc 8u /* Emit UTC time, not local time */
252c122d 1378
1379/* --- @showkeydata@ --- *
1380 *
1381 * Arguments: @key_data *k@ = pointer to key to write
1382 * @int ind@ = indentation level
1383 * @listopts *o@ = listing options
1384 * @dstr *d@ = tag string for this subkey
1385 *
1386 * Returns: ---
1387 *
1388 * Use: Emits a piece of key data in a human-readable format.
1389 */
1390
1391static void showkeydata(key_data *k, int ind, listopts *o, dstr *d)
1392{
1393#define INDENT(i) do { \
1394 int _i; \
1395 for (_i = 0; _i < (i); _i++) { \
1396 putchar(' '); \
1397 } \
1398} while (0)
1399
1400 switch (k->e & KF_ENCMASK) {
1401
1402 /* --- Binary key data --- *
1403 *
1404 * Emit as a simple hex dump.
1405 */
1406
1407 case KENC_BINARY: {
1408 const octet *p = k->u.k.k;
1409 const octet *l = p + k->u.k.sz;
1410 size_t sz = 0;
1411
1412 fputs(" {", stdout);
1413 while (p < l) {
1414 if (sz % 16 == 0) {
1415 putchar('\n');
1416 INDENT(ind + 2);
1417 } else if (sz % 8 == 0)
1418 fputs(" ", stdout);
1419 else
1420 putc(' ', stdout);
1421 printf("%02x", *p++);
1422 sz++;
1423 }
1424 putchar('\n');
1425 INDENT(ind);
1426 fputs("}\n", stdout);
1427 } break;
1428
1429 /* --- Encrypted data --- *
1430 *
1431 * If the user is sufficiently keen, ask for a passphrase and decrypt the
1432 * key. Otherwise just say that it's encrypted and move on.
1433 */
1434
1435 case KENC_ENCRYPT:
1436 if (o->v <= 3)
1437 fputs(" encrypted\n", stdout);
1438 else {
ef13e9a4 1439 key_data *kd;
1440 if (key_punlock(&kd, k, d->buf))
252c122d 1441 printf(" <failed to unlock %s>\n", d->buf);
1442 else {
1443 fputs(" encrypted", stdout);
ef13e9a4 1444 showkeydata(kd, ind, o, d);
1445 key_drop(kd);
252c122d 1446 }
1447 }
1448 break;
1449
1450 /* --- Integer keys --- *
1451 *
1452 * Emit as a large integer in decimal. This makes using the key in
1453 * `calc' or whatever easier.
1454 */
1455
1456 case KENC_MP:
1457 putchar(' ');
1458 mp_writefile(k->u.m, stdout, 10);
1459 putchar('\n');
1460 break;
1461
1ba83484 1462 /* --- Strings --- */
1463
1464 case KENC_STRING:
1465 printf(" `%s'\n", k->u.p);
1466 break;
1467
1468 /* --- Elliptic curve points --- */
1469
1470 case KENC_EC:
d1ee65aa 1471 if (EC_ATINF(&k->u.e))
a9fcea0e 1472 fputs(" inf\n", stdout);
d1ee65aa 1473 else {
1474 fputs(" 0x", stdout); mp_writefile(k->u.e.x, stdout, 16);
1475 fputs(", 0x", stdout); mp_writefile(k->u.e.y, stdout, 16);
1476 putchar('\n');
1477 }
45c0fd36 1478 break;
1ba83484 1479
252c122d 1480 /* --- Structured keys --- *
1481 *
1482 * Just iterate over the subkeys.
1483 */
1484
1485 case KENC_STRUCT: {
ef13e9a4 1486 key_subkeyiter i;
1487 const char *tag;
252c122d 1488 size_t n = d->len;
1489
1490 fputs(" {\n", stdout);
ef13e9a4 1491 for (key_mksubkeyiter(&i, k); key_nextsubkey(&i, &tag, &k); ) {
1492 if (!key_match(k, &o->kf))
252c122d 1493 continue;
1494 INDENT(ind + 2);
ef13e9a4 1495 printf("%s =", tag);
252c122d 1496 d->len = n;
ef13e9a4 1497 dstr_putf(d, ".%s", tag);
1498 showkeydata(k, ind + 2, o, d);
252c122d 1499 }
1500 INDENT(ind);
1501 fputs("}\n", stdout);
45c0fd36 1502 } break;
252c122d 1503 }
1504
1505#undef INDENT
1506}
1507
1508/* --- @showkey@ --- *
1509 *
1510 * Arguments: @key *k@ = pointer to key to show
1511 * @listopts *o@ = pointer to listing options
1512 *
1513 * Returns: ---
1514 *
1515 * Use: Emits a listing of a particular key.
1516 */
1517
1518static void showkey(key *k, listopts *o)
1519{
1520 char ebuf[24], dbuf[24];
1521 struct tm *tm;
1522
1523 /* --- Skip the key if the filter doesn't match --- */
1524
ef13e9a4 1525 if (!key_match(k->k, &o->kf))
252c122d 1526 return;
1527
1528 /* --- Sort out the expiry and deletion times --- */
1529
1530 if (KEY_EXPIRED(o->t, k->exp))
1531 strcpy(ebuf, "expired");
1532 else if (k->exp == KEXP_FOREVER)
1533 strcpy(ebuf, "forever");
1534 else {
1535 tm = (o->f & f_utc) ? gmtime(&k->exp) : localtime(&k->exp);
1536 strftime(ebuf, sizeof(ebuf), o->tfmt, tm);
1537 }
1538
1539 if (KEY_EXPIRED(o->t, k->del))
1540 strcpy(dbuf, "deleted");
1541 else if (k->del == KEXP_FOREVER)
1542 strcpy(dbuf, "forever");
1543 else {
1544 tm = (o->f & f_utc) ? gmtime(&k->del) : localtime(&k->del);
1545 strftime(dbuf, sizeof(dbuf), o->tfmt, tm);
1546 }
1547
1548 /* --- If in compact format, just display and quit --- */
1549
1550 if (!o->v) {
1551 if (!(o->f & f_newline)) {
8cd9f01d 1552 printf("%8s %-20s %-20s %-10s %s\n",
252c122d 1553 "Id", "Tag", "Type", "Expire", "Delete");
1554 }
8cd9f01d 1555 printf("%08lx %-20s %-20s %-10s %s\n",
252c122d 1556 (unsigned long)k->id, k->tag ? k->tag : "<none>",
1557 k->type, ebuf, dbuf);
1558 o->f |= f_newline;
1559 return;
1560 }
1561
1562 /* --- Display the standard header --- */
1563
1564 if (o->f & f_newline)
1565 fputc('\n', stdout);
1566 printf("keyid: %08lx\n", (unsigned long)k->id);
1567 printf("tag: %s\n", k->tag ? k->tag : "<none>");
1568 printf("type: %s\n", k->type);
1569 printf("expiry: %s\n", ebuf);
1570 printf("delete: %s\n", dbuf);
1571 printf("comment: %s\n", k->c ? k->c : "<none>");
1572
1573 /* --- Display the attributes --- */
1574
1575 if (o->v > 1) {
1576 key_attriter i;
1577 const char *av, *an;
1578
1579 o->f &= ~f_attr;
1580 printf("attributes:");
1581 for (key_mkattriter(&i, k); key_nextattr(&i, &an, &av); ) {
dce3fb0d 1582 printf("\n %s = %s", an, av);
252c122d 1583 o->f |= f_attr;
1584 }
1585 if (o->f & f_attr)
1586 fputc('\n', stdout);
1587 else
1588 puts(" <none>");
1589 }
1590
1591 /* --- If dumping requested, dump the raw key data --- */
1592
1593 if (o->v > 2) {
1594 dstr d = DSTR_INIT;
1595 fputs("key:", stdout);
1596 key_fulltag(k, &d);
ef13e9a4 1597 showkeydata(k->k, 0, o, &d);
252c122d 1598 dstr_destroy(&d);
1599 }
45c0fd36 1600
252c122d 1601 o->f |= f_newline;
1602}
1603
1604/* --- @cmd_list@ --- */
1605
1606static int cmd_list(int argc, char *argv[])
1607{
1608 key_file f;
1609 key *k;
1610 listopts o = { 0, 0, 0, 0, { 0, 0 } };
1611
1612 /* --- Parse subcommand options --- */
1613
1614 for (;;) {
1615 static struct option opt[] = {
1616 { "quiet", 0, 0, 'q' },
1617 { "verbose", 0, 0, 'v' },
1618 { "utc", 0, 0, 'u' },
1619 { "filter", OPTF_ARGREQ, 0, 'f' },
1620 { 0, 0, 0, 0 }
1621 };
1622 int i = mdwopt(argc, argv, "+uqvf:", opt, 0, 0, 0);
1623 if (i < 0)
1624 break;
1625
1626 switch (i) {
1627 case 'u':
1628 o.f |= f_utc;
1629 break;
1630 case 'q':
1631 if (o.v)
1632 o.v--;
1633 break;
1634 case 'v':
1635 o.v++;
1636 break;
1637 case 'f': {
1638 char *p;
1639 int e = key_readflags(optarg, &p, &o.kf.f, &o.kf.m);
1640 if (e || *p)
1641 die(EXIT_FAILURE, "bad filter string `%s'", optarg);
45c0fd36 1642 } break;
252c122d 1643 default:
1644 o.f |= f_bogus;
1645 break;
1646 }
1647 }
1648
1649 if (o.f & f_bogus)
c65df279 1650 die(EXIT_FAILURE, "Usage: list [-uqv] [-f FILTER] [TAG...]");
252c122d 1651
1652 /* --- Open the key file --- */
1653
1654 doopen(&f, KOPEN_READ);
1655 o.t = time(0);
1656
1657 /* --- Set up the time format --- */
1658
1659 if (!o.v)
1660 o.tfmt = "%Y-%m-%d";
1661 else if (o.f & f_utc)
1662 o.tfmt = "%Y-%m-%d %H:%M:%S UTC";
1663 else
1664 o.tfmt = "%Y-%m-%d %H:%M:%S %Z";
1665
1666 /* --- If specific keys were requested use them, otherwise do all --- *
1667 *
1668 * Some day, this might turn into a wildcard match.
1669 */
1670
1671 if (optind < argc) {
1672 do {
1673 if ((k = key_bytag(&f, argv[optind])) != 0)
1674 showkey(k, &o);
1675 else {
1676 moan("key `%s' not found", argv[optind]);
1677 o.f |= f_bogus;
1678 }
1679 optind++;
1680 } while (optind < argc);
1681 } else {
1682 key_iter i;
1683 for (key_mkiter(&i, &f); (k = key_next(&i)) != 0; )
1684 showkey(k, &o);
1685 }
1686
1687 /* --- Done --- */
1688
1689 doclose(&f);
1690 if (o.f & f_bogus)
1691 return (EXIT_FAILURE);
1692 else
1693 return (0);
1694}
1695
1696/*----- Command implementation --------------------------------------------*/
1697
d03ab969 1698/* --- @cmd_expire@ --- */
1699
1700static int cmd_expire(int argc, char *argv[])
1701{
1702 key_file f;
1703 key *k;
d03ab969 1704 int i;
1705 int rc = 0;
1706
1707 if (argc < 2)
c65df279 1708 die(EXIT_FAILURE, "Usage: expire TAG...");
d03ab969 1709 doopen(&f, KOPEN_WRITE);
1710 for (i = 1; i < argc; i++) {
252c122d 1711 if ((k = key_bytag(&f, argv[i])) != 0)
d03ab969 1712 key_expire(&f, k);
1713 else {
252c122d 1714 moan("key `%s' not found", argv[i]);
d03ab969 1715 rc = 1;
1716 }
1717 }
1718 doclose(&f);
1719 return (rc);
1720}
1721
1722/* --- @cmd_delete@ --- */
1723
1724static int cmd_delete(int argc, char *argv[])
1725{
1726 key_file f;
1727 key *k;
d03ab969 1728 int i;
1729 int rc = 0;
1730
1731 if (argc < 2)
c65df279 1732 die(EXIT_FAILURE, "Usage: delete TAG...");
d03ab969 1733 doopen(&f, KOPEN_WRITE);
1734 for (i = 1; i < argc; i++) {
252c122d 1735 if ((k = key_bytag(&f, argv[i])) != 0)
d03ab969 1736 key_delete(&f, k);
1737 else {
252c122d 1738 moan("key `%s' not found", argv[i]);
d03ab969 1739 rc = 1;
1740 }
1741 }
1742 doclose(&f);
1743 return (rc);
1744}
1745
1746/* --- @cmd_setattr@ --- */
1747
1748static int cmd_setattr(int argc, char *argv[])
1749{
1750 key_file f;
1751 key *k;
d03ab969 1752
1753 if (argc < 3)
c65df279 1754 die(EXIT_FAILURE, "Usage: setattr TAG ATTR...");
d03ab969 1755 doopen(&f, KOPEN_WRITE);
252c122d 1756 if ((k = key_bytag(&f, argv[1])) == 0)
1757 die(EXIT_FAILURE, "key `%s' not found", argv[1]);
d03ab969 1758 setattr(&f, k, argv + 2);
1759 doclose(&f);
1760 return (0);
1761}
1762
e9be047b 1763/* --- @cmd_getattr@ --- */
1764
1765static int cmd_getattr(int argc, char *argv[])
1766{
1767 key_file f;
1768 key *k;
1769 dstr d = DSTR_INIT;
1770 const char *p;
1771
1772 if (argc != 3)
1773 die(EXIT_FAILURE, "Usage: getattr TAG ATTR");
1774 doopen(&f, KOPEN_READ);
1775 if ((k = key_bytag(&f, argv[1])) == 0)
1776 die(EXIT_FAILURE, "key `%s' not found", argv[1]);
1777 key_fulltag(k, &d);
1778 if ((p = key_getattr(&f, k, argv[2])) == 0)
1779 die(EXIT_FAILURE, "no attribute `%s' for key `%s'", argv[2], d.buf);
1780 puts(p);
1781 dstr_destroy(&d);
1782 doclose(&f);
1783 return (0);
1784}
1785
252c122d 1786/* --- @cmd_finger@ --- */
d03ab969 1787
16810bbd
MW
1788static const struct fpres {
1789 const char *name;
1790 const codec_class *cdc;
1791 unsigned short ival;
1792 const char *sep;
1793} fprestab[] = {
1794 { "hex", &hex_class, 8, "-:" },
1795 { "base32", &base32_class, 6, ":" },
1796 { 0, 0 }
1797};
1798
1799static void fingerprint(key *k, const struct fpres *fpres,
1800 const gchash *ch, const key_filter *kf)
d03ab969 1801{
981bf127 1802 ghash *h;
16810bbd 1803 dstr d = DSTR_INIT, dd = DSTR_INIT;
981bf127 1804 const octet *p;
1805 size_t i;
16810bbd 1806 codec *c;
d03ab969 1807
981bf127 1808 h = GH_INIT(ch);
1809 if (key_fingerprint(k, h, kf)) {
1810 p = GH_DONE(h, 0);
16810bbd
MW
1811 c = fpres->cdc->encoder(CDCF_LOWERC | CDCF_NOEQPAD, "", 0);
1812 c->ops->code(c, p, ch->hashsz, &dd); c->ops->code(c, 0, 0, &dd);
1813 c->ops->destroy(c);
1814 for (i = 0; i < dd.len; i++) {
1815 if (i && i%fpres->ival == 0) dstr_putc(&d, fpres->sep[0]);
1816 dstr_putc(&d, dd.buf[i]);
981bf127 1817 }
16810bbd
MW
1818 dstr_putc(&d, ' '); key_fulltag(k, &d); dstr_putc(&d, '\n');
1819 dstr_write(&d, stdout);
252c122d 1820 }
16810bbd 1821 dstr_destroy(&d); dstr_destroy(&dd);
981bf127 1822 GH_DESTROY(h);
252c122d 1823}
d03ab969 1824
16810bbd
MW
1825static const struct fpres *lookup_fpres(const char *name)
1826{
1827 const struct fpres *fpres;
1828 for (fpres = fprestab; fpres->name; fpres++)
141c1284 1829 if (STRCMP(fpres->name, ==, name)) return (fpres);
16810bbd
MW
1830 die(EXIT_FAILURE, "unknown presentation syle `%s'", name);
1831}
1832
252c122d 1833static int cmd_finger(int argc, char *argv[])
1834{
1835 key_file f;
1836 int rc = 0;
16810bbd 1837 const struct fpres *fpres = fprestab;
981bf127 1838 const gchash *ch = &rmd160;
252c122d 1839 key_filter kf = { KF_NONSECRET, KF_NONSECRET };
d03ab969 1840
1841 for (;;) {
1842 static struct option opt[] = {
252c122d 1843 { "filter", OPTF_ARGREQ, 0, 'f' },
16810bbd 1844 { "presentation", OPTF_ARGREQ, 0, 'p' },
981bf127 1845 { "algorithm", OPTF_ARGREQ, 0, 'a' },
252c122d 1846 { 0, 0, 0, 0 }
d03ab969 1847 };
16810bbd 1848 int i = mdwopt(argc, argv, "+f:a:p:", opt, 0, 0, 0);
d03ab969 1849 if (i < 0)
1850 break;
d03ab969 1851 switch (i) {
252c122d 1852 case 'f': {
1853 char *p;
1854 int err = key_readflags(optarg, &p, &kf.f, &kf.m);
1855 if (err || *p)
1856 die(EXIT_FAILURE, "bad filter string `%s'", optarg);
1857 } break;
16810bbd
MW
1858 case 'p':
1859 fpres = lookup_fpres(optarg);
1860 break;
981bf127 1861 case 'a':
1862 if ((ch = ghash_byname(optarg)) == 0)
1863 die(EXIT_FAILURE, "unknown hash algorithm `%s'", optarg);
1864 break;
d03ab969 1865 default:
252c122d 1866 rc = 1;
d03ab969 1867 break;
1868 }
1869 }
1870
252c122d 1871 argv += optind; argc -= optind;
16810bbd
MW
1872 if (rc) {
1873 die(EXIT_FAILURE,
c81b29e0 1874 "Usage: fingerprint [-a HASH] [-p STYLE] [-f FILTER] [TAG...]");
16810bbd 1875 }
d03ab969 1876
1877 doopen(&f, KOPEN_READ);
d03ab969 1878
252c122d 1879 if (argc) {
1880 int i;
1881 for (i = 0; i < argc; i++) {
1882 key *k = key_bytag(&f, argv[i]);
1883 if (k)
16810bbd 1884 fingerprint(k, fpres, ch, &kf);
252c122d 1885 else {
1886 rc = 1;
1887 moan("key `%s' not found", argv[i]);
1888 }
1889 }
1890 } else {
1891 key_iter i;
1892 key *k;
1893 for (key_mkiter(&i, &f); (k = key_next(&i)) != 0; )
16810bbd 1894 fingerprint(k, fpres, ch, &kf);
252c122d 1895 }
1896 return (rc);
1897}
d03ab969 1898
58507325 1899/* --- @cmd_verify@ --- */
1900
58507325 1901static int cmd_verify(int argc, char *argv[])
1902{
1903 key_file f;
1904 int rc = 0;
1905 const gchash *ch = &rmd160;
1906 ghash *h;
1907 key *k;
58507325 1908 const octet *fpr;
16810bbd
MW
1909 dstr d = DSTR_INIT, dd = DSTR_INIT;
1910 codec *c;
1911 const char *p;
1912 const struct fpres *fpres = fprestab;
58507325 1913 key_filter kf = { KF_NONSECRET, KF_NONSECRET };
1914
1915 for (;;) {
1916 static struct option opt[] = {
1917 { "filter", OPTF_ARGREQ, 0, 'f' },
16810bbd 1918 { "presentation", OPTF_ARGREQ, 0, 'p' },
58507325 1919 { "algorithm", OPTF_ARGREQ, 0, 'a' },
1920 { 0, 0, 0, 0 }
1921 };
16810bbd 1922 int i = mdwopt(argc, argv, "+f:a:p:", opt, 0, 0, 0);
58507325 1923 if (i < 0)
1924 break;
1925 switch (i) {
1926 case 'f': {
1927 char *p;
1928 int err = key_readflags(optarg, &p, &kf.f, &kf.m);
1929 if (err || *p)
1930 die(EXIT_FAILURE, "bad filter string `%s'", optarg);
1931 } break;
16810bbd
MW
1932 case 'p':
1933 fpres = lookup_fpres(optarg);
1934 break;
58507325 1935 case 'a':
1936 if ((ch = ghash_byname(optarg)) == 0)
1937 die(EXIT_FAILURE, "unknown hash algorithm `%s'", optarg);
1938 break;
1939 default:
1940 rc = 1;
1941 break;
1942 }
1943 }
1944
1945 argv += optind; argc -= optind;
16810bbd
MW
1946 if (rc || argc != 2) {
1947 die(EXIT_FAILURE,
c81b29e0 1948 "Usage: verify [-a HASH] [-p STYLE] [-f FILTER] TAG FINGERPRINT");
16810bbd 1949 }
58507325 1950
1951 doopen(&f, KOPEN_READ);
1952
1953 if ((k = key_bytag(&f, argv[0])) == 0)
1954 die(EXIT_FAILURE, "key `%s' not found", argv[0]);
16810bbd
MW
1955 for (p = argv[1]; *p; p++) {
1956 if (strchr(fpres->sep, *p)) continue;
1957 dstr_putc(&dd, *p);
1958 }
1959 c = fpres->cdc->decoder(CDCF_IGNCASE | CDCF_IGNEQPAD |
1960 CDCF_IGNSPC | CDCF_IGNNEWL);
1961 if ((rc = c->ops->code(c, dd.buf, dd.len, &d)) != 0 ||
1962 (rc = c->ops->code(c, 0, 0, &d)) != 0)
1963 die(EXIT_FAILURE, "invalid fingerprint: %s", codec_strerror(rc));
1964 c->ops->destroy(c);
1965 if (d.len != ch->hashsz) {
1966 die(EXIT_FAILURE, "incorrect fingerprint length (%lu != %lu)",
1967 (unsigned long)d.len, (unsigned long)ch->hashsz);
1968 }
58507325 1969 h = GH_INIT(ch);
1970 if (!key_fingerprint(k, h, &kf))
1971 die(EXIT_FAILURE, "key has no fingerprintable components (as filtered)");
1972 fpr = GH_DONE(h, 0);
141c1284 1973 if (MEMCMP(fpr, !=, d.buf, ch->hashsz))
58507325 1974 die(EXIT_FAILURE, "key fingerprint mismatch");
16810bbd 1975 dstr_destroy(&d); dstr_destroy(&dd);
e9be047b 1976 doclose(&f);
58507325 1977 return (0);
1978}
45c0fd36 1979
252c122d 1980/* --- @cmd_comment@ --- */
d03ab969 1981
252c122d 1982static int cmd_comment(int argc, char *argv[])
1983{
1984 key_file f;
1985 key *k;
1986 int err;
d03ab969 1987
252c122d 1988 if (argc < 2 || argc > 3)
c65df279 1989 die(EXIT_FAILURE, "Usage: comment TAG [COMMENT]");
252c122d 1990 doopen(&f, KOPEN_WRITE);
1991 if ((k = key_bytag(&f, argv[1])) == 0)
1992 die(EXIT_FAILURE, "key `%s' not found", argv[1]);
1993 if ((err = key_setcomment(&f, k, argv[2])) != 0)
1994 die(EXIT_FAILURE, "bad comment `%s': %s", argv[2], key_strerror(err));
1995 doclose(&f);
1996 return (0);
1997}
d03ab969 1998
252c122d 1999/* --- @cmd_tag@ --- */
d03ab969 2000
252c122d 2001static int cmd_tag(int argc, char *argv[])
2002{
2003 key_file f;
2004 key *k;
2005 int err;
ce70ec47 2006 unsigned flags = 0;
2007 int rc = 0;
d03ab969 2008
ce70ec47 2009 for (;;) {
2010 static struct option opt[] = {
2011 { "retag", 0, 0, 'r' },
2012 { 0, 0, 0, 0 }
2013 };
2014 int i = mdwopt(argc, argv, "+r", opt, 0, 0, 0);
2015 if (i < 0)
2016 break;
2017 switch (i) {
2018 case 'r':
2019 flags |= f_retag;
2020 break;
2021 default:
2022 rc = 1;
2023 break;
2024 }
2025 }
2026
2027 argv += optind; argc -= optind;
2028 if (argc < 1 || argc > 2 || rc)
c65df279 2029 die(EXIT_FAILURE, "Usage: tag [-r] TAG [NEW-TAG]");
252c122d 2030 doopen(&f, KOPEN_WRITE);
ce70ec47 2031 if (flags & f_retag) {
141c1284 2032 if ((k = key_bytag(&f, argv[1])) != 0 && STRCMP(k->tag, ==, argv[1]))
ce70ec47 2033 key_settag(&f, k, 0);
2034 }
2035 if ((k = key_bytag(&f, argv[0])) == 0)
2036 die(EXIT_FAILURE, "key `%s' not found", argv[0]);
2037 if ((err = key_settag(&f, k, argv[1])) != 0)
2038 die(EXIT_FAILURE, "bad tag `%s': %s", argv[1], key_strerror(err));
252c122d 2039 doclose(&f);
2040 return (0);
2041}
d03ab969 2042
252c122d 2043/* --- @cmd_lock@ --- */
d03ab969 2044
252c122d 2045static int cmd_lock(int argc, char *argv[])
2046{
2047 key_file f;
2048 key *k;
ef13e9a4 2049 key_data **kd;
252c122d 2050 dstr d = DSTR_INIT;
d03ab969 2051
252c122d 2052 if (argc != 2)
c65df279 2053 die(EXIT_FAILURE, "Usage: lock QTAG");
252c122d 2054 doopen(&f, KOPEN_WRITE);
2055 if (key_qtag(&f, argv[1], &d, &k, &kd))
2056 die(EXIT_FAILURE, "key `%s' not found", argv[1]);
ef13e9a4 2057 if ((*kd)->e == KENC_ENCRYPT && key_punlock(kd, 0, d.buf))
252c122d 2058 die(EXIT_FAILURE, "couldn't unlock key `%s'", d.buf);
ef13e9a4 2059 if (key_plock(kd, 0, d.buf))
252c122d 2060 die(EXIT_FAILURE, "failed to lock key `%s'", d.buf);
2061 f.f |= KF_MODIFIED;
2062 doclose(&f);
2063 return (0);
2064}
d03ab969 2065
252c122d 2066/* --- @cmd_unlock@ --- */
d03ab969 2067
252c122d 2068static int cmd_unlock(int argc, char *argv[])
2069{
2070 key_file f;
2071 key *k;
ef13e9a4 2072 key_data **kd;
252c122d 2073 dstr d = DSTR_INIT;
d03ab969 2074
252c122d 2075 if (argc != 2)
c65df279 2076 die(EXIT_FAILURE, "Usage: unlock QTAG");
252c122d 2077 doopen(&f, KOPEN_WRITE);
2078 if (key_qtag(&f, argv[1], &d, &k, &kd))
2079 die(EXIT_FAILURE, "key `%s' not found", argv[1]);
ef13e9a4 2080 if ((*kd)->e != KENC_ENCRYPT)
252c122d 2081 die(EXIT_FAILURE, "key `%s' is not encrypted", d.buf);
ef13e9a4 2082 if (key_punlock(kd, 0, d.buf))
252c122d 2083 die(EXIT_FAILURE, "couldn't unlock key `%s'", d.buf);
2084 f.f |= KF_MODIFIED;
d03ab969 2085 doclose(&f);
2086 return (0);
2087}
2088
2089/* --- @cmd_extract@ --- */
2090
2091static int cmd_extract(int argc, char *argv[])
2092{
2093 key_file f;
2094 key *k;
d03ab969 2095 int i;
2096 int rc = 0;
252c122d 2097 key_filter kf = { 0, 0 };
694fc3a8 2098 dstr d = DSTR_INIT;
2099 const char *outfile = 0;
d03ab969 2100 FILE *fp;
2101
252c122d 2102 for (;;) {
2103 static struct option opt[] = {
2104 { "filter", OPTF_ARGREQ, 0, 'f' },
2105 { 0, 0, 0, 0 }
2106 };
2107 int i = mdwopt(argc, argv, "f:", opt, 0, 0, 0);
2108 if (i < 0)
2109 break;
2110 switch (i) {
2111 case 'f': {
2112 char *p;
2113 int err = key_readflags(optarg, &p, &kf.f, &kf.m);
2114 if (err || *p)
2115 die(EXIT_FAILURE, "bad filter string `%s'", optarg);
2116 } break;
2117 default:
2118 rc = 1;
2119 break;
2120 }
2121 }
2122
2123 argv += optind; argc -= optind;
2124 if (rc || argc < 1)
c65df279 2125 die(EXIT_FAILURE, "Usage: extract [-f FILTER] FILE [TAG...]");
141c1284 2126 if (STRCMP(*argv, ==, "-"))
d03ab969 2127 fp = stdout;
694fc3a8 2128 else {
2129 outfile = *argv;
2130 dstr_putf(&d, "%s.new", outfile);
2131 if (!(fp = fopen(d.buf, "w"))) {
2132 die(EXIT_FAILURE, "couldn't open `%s' for writing: %s",
2133 d.buf, strerror(errno));
2134 }
d03ab969 2135 }
2136
252c122d 2137 doopen(&f, KOPEN_READ);
2138 if (argc < 2) {
2139 key_iter i;
2140 key *k;
2141 for (key_mkiter(&i, &f); (k = key_next(&i)) != 0; )
2142 key_extract(&f, k, fp, &kf);
45c0fd36 2143 } else {
252c122d 2144 for (i = 1; i < argc; i++) {
2145 if ((k = key_bytag(&f, argv[i])) != 0)
2146 key_extract(&f, k, fp, &kf);
2147 else {
2148 moan("key `%s' not found", argv[i]);
2149 rc = 1;
2150 }
d03ab969 2151 }
2152 }
694fc3a8 2153 if (fclose(fp) || (outfile && rename(d.buf, outfile)))
252c122d 2154 die(EXIT_FAILURE, "error writing file: %s", strerror(errno));
694fc3a8 2155 dstr_destroy(&d);
d03ab969 2156 doclose(&f);
2157 return (rc);
2158}
2159
2160/* --- @cmd_tidy@ --- */
2161
2162static int cmd_tidy(int argc, char *argv[])
2163{
2164 key_file f;
2165 if (argc != 1)
c65df279 2166 die(EXIT_FAILURE, "Usage: tidy");
d03ab969 2167 doopen(&f, KOPEN_WRITE);
2168 f.f |= KF_MODIFIED; /* Nasty hack */
2169 doclose(&f);
2170 return (0);
2171}
2172
2173/* --- @cmd_merge@ --- */
2174
2175static int cmd_merge(int argc, char *argv[])
2176{
2177 key_file f;
2178 FILE *fp;
2179
2180 if (argc != 2)
c65df279 2181 die(EXIT_FAILURE, "Usage: merge FILE");
141c1284 2182 if (STRCMP(argv[1], ==, "-"))
d03ab969 2183 fp = stdin;
2184 else if (!(fp = fopen(argv[1], "r"))) {
d3296500 2185 die(EXIT_FAILURE, "couldn't open `%s' for reading: %s",
d03ab969 2186 argv[1], strerror(errno));
2187 }
2188
2189 doopen(&f, KOPEN_WRITE);
252c122d 2190 key_merge(&f, argv[1], fp, key_moan, 0);
d03ab969 2191 doclose(&f);
2192 return (0);
2193}
2194
c65df279 2195/* --- @cmd_show@ --- */
2196
2197#define LISTS(LI) \
2198 LI("Lists", list, \
2199 listtab[i].name, listtab[i].name) \
2200 LI("Hash functions", hash, \
2201 ghashtab[i], ghashtab[i]->name) \
2202 LI("Elliptic curves", ec, \
2203 ectab[i].name, ectab[i].name) \
3688eb75 2204 LI("Prime Diffie-Hellman groups", dh, \
c65df279 2205 ptab[i].name, ptab[i].name) \
3688eb75 2206 LI("Binary Diffie-Hellman groups", bindh, \
2207 bintab[i].name, bintab[i].name) \
c65df279 2208 LI("Key-generation algorithms", keygen, \
2209 algtab[i].name, algtab[i].name) \
2210 LI("Random seeding algorithms", seed, \
16810bbd
MW
2211 seedtab[i].p, seedtab[i].p) \
2212 LI("Fingerprint presentation styles", fpres, \
2213 fprestab[i].name, fprestab[i].name)
c65df279 2214
2215MAKELISTTAB(listtab, LISTS)
2216
2217static int cmd_show(int argc, char *argv[])
2218{
2219 return (displaylists(listtab, argv + 1));
2220}
2221
d03ab969 2222/*----- Main command table ------------------------------------------------*/
2223
c65df279 2224static int cmd_help(int argc, char *argv[]);
2225
2226static cmd cmds[] = {
2227 { "help", cmd_help, "help [COMMAND...]" },
2228 { "show", cmd_show, "show [ITEM...]" },
2229 { "list", cmd_list, "list [-uqv] [-f FILTER] [TAG...]", "\
2230Options:\n\
2231\n\
2232-u, --utc Display expiry times etc. in UTC, not local time.\n\
2233-q, --quiet Show less information.\n\
2234-v, --verbose Show more information.\n\
2235" },
16810bbd 2236 { "fingerprint", cmd_finger,
c81b29e0 2237 "fingerprint [-a HASH] [-p STYLE] [-f FILTER] [TAG...]", "\
c65df279 2238Options:\n\
2239\n\
2240-f, --filter=FILT Only hash key components matching FILT.\n\
16810bbd 2241-p, --presentation=STYLE Use STYLE for presenting fingerprints.\n\
c65df279 2242-a, --algorithm=HASH Use the named HASH algorithm.\n\
2243 ($ show hash for list.)\n\
2244" },
16810bbd
MW
2245 { "verify", cmd_verify,
2246 "verify [-a HASH] [-p STYLE] [-f FILTER] TAG FINGERPRINT", "\
58507325 2247Options:\n\
2248\n\
2249-f, --filter=FILT Only hash key components matching FILT.\n\
16810bbd 2250-p, --presentation=STYLE Expect FINGERPRINT in the given STYLE.\n\
58507325 2251-a, --algorithm=HASH Use the named HASH algorithm.\n\
2252 ($ show hash for list.)\n\
2253" },
c65df279 2254 { "extract", cmd_extract, "extract [-f FILTER] FILE [TAG...]", "\
2255Options:\n\
2256\n\
2257-f, --filter=FILT Only extract key components matching FILT.\n\
2258" },
2259 { "merge", cmd_merge, "merge FILE" },
2260 { "expire", cmd_expire, "expire TAG..." },
2261 { "delete", cmd_delete, "delete TAG..." },
2262 { "setattr", cmd_setattr, "setattr TAG ATTR..." },
e9be047b 2263 { "getattr", cmd_getattr, "getattr TAG ATTR" },
c65df279 2264 { "comment", cmd_comment, "comment TAG [COMMENT]" },
2265 { "lock", cmd_lock, "lock QTAG" },
2266 { "unlock", cmd_unlock, "unlock QTAG" },
2267 { "tag", cmd_tag, "tag [-r] TAG [NEW-TAG]", "\
2268Options:\n\
2269\n\
2270-r, --retag Untag any key currently called new-tag.\n\
2271" },
2272 { "tidy", cmd_tidy, "tidy" },
d03ab969 2273 { "add", cmd_add,
c65df279 2274 "add [-OPTIONS] TYPE [ATTR...]\n\
4e67e30b 2275 Options: [-lqrLKS] [-a ALG] [-bB BITS] [-p PARAM] [-R TAG]\n\
45c0fd36
MW
2276 [-A SEEDALG] [-s SEED] [-n BITS] [-I KEYID]\n\
2277 [-e EXPIRE] [-t TAG] [-c COMMENT]", "\
ce70ec47 2278Options:\n\
2279\n\
2280-a, --algorithm=ALG Generate keys suitable for ALG.\n\
c65df279 2281 ($ show keygen for list.)\n\
ce70ec47 2282-b, --bits=N Generate an N-bit key.\n\
2283-B, --qbits=N Use an N-bit subgroup or factors.\n\
2284-p, --parameters=TAG Get group parameters from TAG.\n\
c65df279 2285-C, --curve=NAME Use elliptic curve or DH group NAME.\n\
2286 ($ show ec or $ show dh for list.)\n\
2287-A, --seedalg=ALG Use pseudorandom generator ALG to generate key.\n\
2288 ($ show seed for list.)\n\
2289-s, --seed=BASE64 Use Base64-encoded string BASE64 as seed.\n\
2290-n, --newseed=COUNT Generate new COUNT-bit seed.\n\
ce70ec47 2291-e, --expire=TIME Make the key expire after TIME.\n\
2292-c, --comment=STRING Attach the command STRING to the key.\n\
2293-t, --tag=TAG Tag the key with the name TAG.\n\
2294-r, --retag Untag any key currently with that tag.\n\
2295-R, --rand-id=TAG Use key named TAG for the random number generator.\n\
90a88ae3 2296-I, --key-id=ID Force the key-id for the new key.\n\
ce70ec47 2297-l, --lock Lock the generated key with a passphrase.\n\
2298-q, --quiet Don't give progress indicators while working.\n\
2299-L, --lim-lee Generate Lim-Lee primes for Diffie-Hellman groups.\n\
4e67e30b 2300-K, --kcdsa Generate KCDSA-style Lim-Lee primes for DH groups.\n\
ce70ec47 2301-S, --subgroup Use a prime-order subgroup for Diffie-Hellman.\n\
2302" },
d03ab969 2303 { 0, 0, 0 }
2304};
2305
c65df279 2306static int cmd_help(int argc, char *argv[])
ce70ec47 2307{
c65df279 2308 sc_help(cmds, stdout, argv + 1);
2309 return (0);
ce70ec47 2310}
2311
c65df279 2312/*----- Main code ---------------------------------------------------------*/
2313
d03ab969 2314/* --- Helpful GNUy functions --- */
2315
c65df279 2316static void usage(FILE *fp)
d03ab969 2317{
c65df279 2318 pquis(fp, "Usage: $ [-k KEYRING] COMMAND [ARGS]\n");
d03ab969 2319}
2320
2321void version(FILE *fp)
2322{
052b36d0 2323 pquis(fp, "$, Catacomb version " VERSION "\n");
d03ab969 2324}
2325
c65df279 2326void help_global(FILE *fp)
d03ab969 2327{
c65df279 2328 usage(fp);
2329 fputs("\n\
2330Performs various simple key management operations.\n\
2331\n\
2332Global command line options:\n\
d03ab969 2333\n\
c65df279 2334-h, --help [COMMAND...] Display this help text (or help for COMMANDs).\n\
d03ab969 2335-v, --version Display version number.\n\
2336-u, --usage Display short usage summary.\n\
2337\n\
c65df279 2338-k, --keyring=FILE Read and write keys in FILE.\n",
2339 fp);
d03ab969 2340}
2341
2342/* --- @main@ --- *
2343 *
2344 * Arguments: @int argc@ = number of command line arguments
2345 * @char *argv[]@ = array of command line arguments
2346 *
2347 * Returns: Nonzero on failure.
2348 *
2349 * Use: Main program. Performs simple key management functions.
2350 */
2351
2352int main(int argc, char *argv[])
2353{
2354 unsigned f = 0;
2355
16efd15b 2356#define f_bogus 1u
d03ab969 2357
2358 /* --- Initialization --- */
2359
2360 ego(argv[0]);
2361 sub_init();
2362
2363 /* --- Parse command line options --- */
2364
2365 for (;;) {
2366 static struct option opt[] = {
2367
2368 /* --- Standard GNUy help options --- */
2369
2370 { "help", 0, 0, 'h' },
2371 { "version", 0, 0, 'v' },
2372 { "usage", 0, 0, 'u' },
2373
2374 /* --- Real live useful options --- */
2375
2376 { "keyring", OPTF_ARGREQ, 0, 'k' },
2377
2378 /* --- Magic terminator --- */
2379
2380 { 0, 0, 0, 0 }
2381 };
99dde2f4 2382 int i = mdwopt(argc, argv, "+hvu k:", opt, 0, 0, 0);
d03ab969 2383
2384 if (i < 0)
2385 break;
2386 switch (i) {
2387
2388 /* --- GNU help options --- */
ce70ec47 2389
d03ab969 2390 case 'h':
c65df279 2391 sc_help(cmds, stdout, argv + optind);
d03ab969 2392 exit(0);
2393 case 'v':
2394 version(stdout);
2395 exit(0);
2396 case 'u':
2397 usage(stdout);
2398 exit(0);
2399
2400 /* --- Real useful options --- */
2401
2402 case 'k':
2403 keyfile = optarg;
2404 break;
2405
2406 /* --- Bogosity --- */
2407
2408 default:
2409 f |= f_bogus;
2410 break;
2411 }
2412 }
2413
2414 /* --- Complain about excessive bogons --- */
2415
2416 if (f & f_bogus || optind == argc) {
2417 usage(stderr);
2418 exit(1);
2419 }
2420
052b36d0 2421 /* --- Initialize the Catacomb random number generator --- */
2422
052b36d0 2423 rand_noisesrc(RAND_GLOBAL, &noise_source);
9219a5d6 2424 rand_seed(RAND_GLOBAL, 160);
052b36d0 2425
d03ab969 2426 /* --- Dispatch to appropriate command handler --- */
2427
2428 argc -= optind;
2429 argv += optind;
2430 optind = 0;
c65df279 2431 return (findcmd(cmds, argv[0])->cmd(argc, argv));
d03ab969 2432}
2433
2434/*----- That's all, folks -------------------------------------------------*/